Skip to content

Commit 93b4843

Browse files
authored
Use the library version of Microsoft.DotNet.MaestroConfiguration.Client (#5722)
1 parent d353ea7 commit 93b4843

33 files changed

+10
-1683
lines changed

Directory.Packages.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
<PackageVersion Include="Microsoft.DotNet.Internal.Testing.DependencyInjectionCodeGen" Version="$(MicrosoftDotNetInternalTestingDependencyInjectionCodeGenVersion)" />
4848
<PackageVersion Include="Microsoft.DotNet.Internal.Testing.Utility" Version="$(MicrosoftDotNetInternalTestingUtilityVersion)" />
4949
<PackageVersion Include="Microsoft.DotNet.Kusto" Version="$(MicrosoftDotNetKustoVersion)" />
50+
<PackageVersion Include="Microsoft.DotNet.MaestroConfiguration.Client" Version="$(MicrosoftDotNetMaestroConfigurationClientPackageVersion)" />
5051
<PackageVersion Include="Microsoft.DotNet.Services.Utility" Version="$(MicrosoftDotNetServicesUtilityVersion)" />
5152
<PackageVersion Include="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="$(MicrosoftDotNetSwaggerGeneratorMSBuildVersion)" />
5253
<PackageVersion Include="Microsoft.DotNet.VersionTools" Version="$(MicrosoftDotNetVersionToolsVersion)" />

arcade-services.slnx

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44
<Platform Name="x64" />
55
<Platform Name="x86" />
66
</Configurations>
7-
<Folder Name="/MaestroConfiguration/">
8-
<Project Path="src/MaestroConfiguration/src/Microsoft.DotNet.MaestroConfiguration.Client/Microsoft.DotNet.MaestroConfiguration.Client.csproj" />
9-
<Project Path="src/MaestroConfiguration/test/Microsoft.DotNet.MaestroConfiguration.Client.Tests/Microsoft.DotNet.MaestroConfiguration.Client.Tests.csproj" />
10-
</Folder>
117
<Folder Name="/Solution Items/">
128
<File Path=".editorconfig" />
139
<File Path="azure-pipelines.yml" />

eng/Version.Details.props

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ This file should be imported by eng/Versions.props
2828
<!-- dotnet/dnceng dependencies -->
2929
<MicrosoftDncEngConfigurationBootstrapPackageVersion>1.1.0-beta.25608.3</MicrosoftDncEngConfigurationBootstrapPackageVersion>
3030
<MicrosoftDncEngSecretManagerPackageVersion>1.1.0-beta.25608.3</MicrosoftDncEngSecretManagerPackageVersion>
31+
<!-- dotnet/arcade-services dependencies -->
32+
<MicrosoftDotNetMaestroConfigurationClientPackageVersion>1.1.0-beta.26058.4</MicrosoftDotNetMaestroConfigurationClientPackageVersion>
3133
</PropertyGroup>
3234
<!--Property group for alternate package version names-->
3335
<PropertyGroup>
@@ -54,5 +56,7 @@ This file should be imported by eng/Versions.props
5456
<!-- dotnet/dnceng dependencies -->
5557
<MicrosoftDncEngConfigurationBootstrapVersion>$(MicrosoftDncEngConfigurationBootstrapPackageVersion)</MicrosoftDncEngConfigurationBootstrapVersion>
5658
<MicrosoftDncEngSecretManagerVersion>$(MicrosoftDncEngSecretManagerPackageVersion)</MicrosoftDncEngSecretManagerVersion>
59+
<!-- dotnet/arcade-services dependencies -->
60+
<MicrosoftDotNetMaestroConfigurationClientVersion>$(MicrosoftDotNetMaestroConfigurationClientPackageVersion)</MicrosoftDotNetMaestroConfigurationClientVersion>
5761
</PropertyGroup>
5862
</Project>

eng/Version.Details.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,5 +83,9 @@
8383
<Uri>https://github.com/dotnet/dnceng</Uri>
8484
<Sha>6b49135c494c814a01232e423244f14241cf09b4</Sha>
8585
</Dependency>
86+
<Dependency Name="Microsoft.DotNet.MaestroConfiguration.Client" Version="1.1.0-beta.26058.4">
87+
<Uri>https://github.com/dotnet/arcade-services</Uri>
88+
<Sha>f081e2839795a3f7b87cc8c510b4614b30fba402</Sha>
89+
</Dependency>
8690
</ToolsetDependencies>
8791
</Dependencies>

src/MaestroConfiguration/src/Microsoft.DotNet.MaestroConfiguration.Client/ConfigFilePathResolver.cs

Lines changed: 0 additions & 86 deletions
This file was deleted.

src/MaestroConfiguration/src/Microsoft.DotNet.MaestroConfiguration.Client/ConfigurationObjectNotFoundException.cs

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)