Skip to content

Commit

Permalink
Merged PR 42877: [internal/release/6.0.1xx] Merge from public
Browse files Browse the repository at this point in the history
Merge from public release/6.0.1xx to internal/release/6.0.1xx and resolve conflicts if necessary

----
#### AI description  (iteration 1)
#### PR Classification
Code cleanup and dependency update.

#### PR Summary
This pull request merges changes from the public repository, focusing on script updates and dependency adjustments.
- Added `nuget-verification.ps1` to verify Microsoft NuGet packages.
- Removed `post-build-utils.ps1`, `trigger-subscriptions.ps1`, and `add-build-to-channel.ps1` scripts.
- Updated `NuGet.config` with new package sources.
- Updated dependencies in `Version.Details.xml`.
- Modified `publish-build-assets.yml` to use `AzureCLI@2` instead of `PowerShell@2`.
  • Loading branch information
vseanreesermsft committed Sep 16, 2024
2 parents 01eda4d + bdb19eb commit 954f381
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
16 changes: 8 additions & 8 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -300,22 +300,22 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24413.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24459.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
<Sha>685008547318b269dbbb82cfc9ca968126301bbe</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24413.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24459.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
<Sha>685008547318b269dbbb82cfc9ca968126301bbe</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SignTool" Version="6.0.0-beta.24413.1">
<Dependency Name="Microsoft.DotNet.SignTool" Version="6.0.0-beta.24459.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
<Sha>685008547318b269dbbb82cfc9ca968126301bbe</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.24413.1">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.24459.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
<Sha>685008547318b269dbbb82cfc9ca968126301bbe</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="6.0.0">
<Uri>https://github.com/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 @@ -27,7 +27,7 @@
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
<SystemReflectionMetadataVersion>5.0.0</SystemReflectionMetadataVersion>
<SystemSecurityCryptographyPkcsPackageVersion>6.0.4</SystemSecurityCryptographyPkcsPackageVersion>
<MicrosoftDotNetSignToolVersion>6.0.0-beta.24413.1</MicrosoftDotNetSignToolVersion>
<MicrosoftDotNetSignToolVersion>6.0.0-beta.24459.5</MicrosoftDotNetSignToolVersion>
<MicrosoftWebXdtPackageVersion>3.1.0</MicrosoftWebXdtPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>6.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
Expand Down Expand Up @@ -167,7 +167,7 @@
<PropertyGroup>
<FluentAssertionsVersion>4.19.2</FluentAssertionsVersion>
<FluentAssertionsJsonVersion>4.19.0</FluentAssertionsJsonVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.24413.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.24459.5</MicrosoftDotNetXUnitExtensionsVersion>
<MoqPackageVersion>4.8.2</MoqPackageVersion>
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>6.0.0-beta.21376.2</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24413.1",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.24413.1"
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24459.5",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.24459.5"
}
}

0 comments on commit 954f381

Please sign in to comment.