Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[automated] Merge branch 'release/8.0.3xx' => 'release/8.0.4xx' #45911

Merged
merged 8 commits into from
Jan 13, 2025
Merged

[automated] Merge branch 'release/8.0.3xx' => 'release/8.0.4xx' #45911

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ffd8f75
[release/8.0.3xx] Update dependencies from dotnet/source-build-extern…
dotnet-maestro[bot] Jan 11, 2025
d83d7e6
Update dependencies from https://github.com/dotnet/source-build-refer…
dotnet-maestro[bot] Jan 11, 2025
790769d
Update dependencies from https://github.com/dotnet/source-build-exter…
dotnet-maestro[bot] Jan 11, 2025
10c21e5
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Jan 11, 2025
6973e2b
[release/8.0.3xx] Update dependencies from dotnet/arcade (#45893)
v-wuzhai Jan 13, 2025
69ab1bf
[release/8.0.3xx] Update dependencies from dotnet/source-build-extern…
v-wuzhai Jan 13, 2025
cf91715
[release/8.0.3xx] Update dependencies from dotnet/source-build-refere…
v-wuzhai Jan 13, 2025
c6e02fd
Merge branch 'release/8.0.4xx' of https://github.com/dotnet/sdk into …
v-wuzhai Jan 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update dependencies from https://github.com/dotnet/arcade build 20250… 
…110.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.24623.2 -> To Version 8.0.0-beta.25060.1
  • Loading branch information
@dotnet-maestro
dotnet-maestro[bot] committed Jan 11, 2025
commit 10c21e5336d687dbd5834cbd8076e46eda794168
16 changes: 8 additions & 8 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,22 +491,22 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24623.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25060.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>278b1dda181ab18a9fbed73da998e50d128eae21</Sha>
<Sha>c255aae7f2b128fa20a4441f0e192c3c53561621</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24623.2">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25060.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>278b1dda181ab18a9fbed73da998e50d128eae21</Sha>
<Sha>c255aae7f2b128fa20a4441f0e192c3c53561621</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.24623.2">
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25060.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>278b1dda181ab18a9fbed73da998e50d128eae21</Sha>
<Sha>c255aae7f2b128fa20a4441f0e192c3c53561621</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.24623.2">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25060.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>278b1dda181ab18a9fbed73da998e50d128eae21</Sha>
<Sha>c255aae7f2b128fa20a4441f0e192c3c53561621</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
View file
Open in desktop
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.24623.2</MicrosoftDotNetSignToolVersion>
<MicrosoftDotNetSignToolVersion>8.0.0-beta.25060.1</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.24623.2</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25060.1</MicrosoftDotNetXUnitExtensionsVersion>
<MoqPackageVersion>4.18.4</MoqPackageVersion>
<XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>
Expand Down
2 changes: 1 addition & 1 deletion eng/common/templates-official/job/publish-build-assets.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ jobs:
arguments: >
-task PublishBuildAssets -restore -msbuildEngine dotnet
/p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests'
/p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com
/p:MaestroApiEndpoint=https://maestro.dot.net
/p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }}
/p:OfficialBuildId=$(Build.BuildNumber)
condition: ${{ parameters.condition }}
Expand Down
2 changes: 1 addition & 1 deletion eng/common/templates-official/post-build/common-variables.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ variables:

# Default Maestro++ API Endpoint and API Version
- name: MaestroApiEndPoint
value: "https://maestro-prod.westus2.cloudapp.azure.com"
value: "https://maestro.dot.net"
- name: MaestroApiAccessToken
value: $(MaestroAccessToken)
- name: MaestroApiVersion
Expand Down
2 changes: 1 addition & 1 deletion eng/common/templates/job/job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ jobs:

- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
- task: MicroBuildSigningPlugin@3
- task: MicroBuildSigningPlugin@4
displayName: Install MicroBuild plugin
inputs:
signType: $(_SignType)
Expand Down
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
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.24623.2",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24623.2"
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25060.1",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25060.1"
}
}