Skip to content

Commit

Permalink
Merge branch 'release/8.0.3xx' of https://github.com/dotnet/sdk into …
Browse files Browse the repository at this point in the history
…darc-release/8.0.3xx-fdf71729-4a53-4ada-a5ec-81decd4bc6c1
  • Loading branch information
v-wuzhai committed Feb 7, 2025
2 parents bc7c977 + 5272b53 commit 86e9aeb
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 14 deletions.
8 changes: 8 additions & 0 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,14 @@
<add key="darc-pub-dotnet-templating-ee4a55e-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-2/nuget/v3/index.json" />
<add key="darc-pub-dotnet-templating-ee4a55e-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-1/nuget/v3/index.json" />
<add key="darc-pub-dotnet-templating-6ede63a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-6ede63a6/nuget/v3/index.json" />
<add key="darc-pub-dotnet-templating-ee4a55e-8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-8/nuget/v3/index.json" />
<add key="darc-pub-dotnet-templating-ee4a55e-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-7/nuget/v3/index.json" />
<add key="darc-pub-dotnet-templating-ee4a55e-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-6/nuget/v3/index.json" />
<add key="darc-pub-dotnet-templating-ee4a55e-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-5/nuget/v3/index.json" />
<add key="darc-pub-dotnet-templating-ee4a55e-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-4/nuget/v3/index.json" />
<add key="darc-pub-dotnet-templating-ee4a55e-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-3/nuget/v3/index.json" />
<add key="darc-pub-dotnet-templating-ee4a55e-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-2/nuget/v3/index.json" />
<add key="darc-pub-dotnet-templating-ee4a55e-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ee4a55ee-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-0dad47b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4/nuget/v3/index.json" />
Expand Down
20 changes: 10 additions & 10 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -354,9 +354,9 @@
<Sha>c7cb4da26e74ef645e3e98fcb4534a7d66247a82</Sha>
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25060.2">
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25081.5">
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
<Sha>f9542c50beaefc38dd9d7ec9ea38d54fd154f21a</Sha>
<Sha>d73fc552386797322e84fa9b2ef5eaa5369de83c</Sha>
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Deployment.DotNet.Releases" Version="2.0.0-rtm.1.25064.1">
Expand Down Expand Up @@ -491,22 +491,22 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25066.6">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25105.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>4db725213dccb0d1102427bce1c39ba3117da7f7</Sha>
<Sha>f9e274e2269d2cda748e78344afe681411748157</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25066.6">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25105.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>4db725213dccb0d1102427bce1c39ba3117da7f7</Sha>
<Sha>f9e274e2269d2cda748e78344afe681411748157</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25066.6">
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25105.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>4db725213dccb0d1102427bce1c39ba3117da7f7</Sha>
<Sha>f9e274e2269d2cda748e78344afe681411748157</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25066.6">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25105.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>4db725213dccb0d1102427bce1c39ba3117da7f7</Sha>
<Sha>f9e274e2269d2cda748e78344afe681411748157</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
Expand Down
4 changes: 2 additions & 2 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<SystemCollectionsImmutablePackageVersion>7.0.0</SystemCollectionsImmutablePackageVersion>
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
<SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion>
<MicrosoftDotNetSignToolVersion>8.0.0-beta.25066.6</MicrosoftDotNetSignToolVersion>
<MicrosoftDotNetSignToolVersion>8.0.0-beta.25105.2</MicrosoftDotNetSignToolVersion>
<MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
Expand Down Expand Up @@ -213,7 +213,7 @@
<PropertyGroup>
<FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
<FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25066.6</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25105.2</MicrosoftDotNetXUnitExtensionsVersion>
<MoqPackageVersion>4.18.4</MoqPackageVersion>
<XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>
Expand Down
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25066.6",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25066.6"
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25105.2",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25105.2"
}
}

0 comments on commit 86e9aeb

Please sign in to comment.