Skip to content

Commit 93ee2e8

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/dotnet build 20251031.2 (#690)
On relative base path root Microsoft.NET.Runtime.Emscripten.3.1.56.Cache.linux-x64 , Microsoft.NET.Runtime.Emscripten.3.1.56.Node.linux-x64 , Microsoft.NET.Runtime.Emscripten.3.1.56.Sdk.linux-x64 From Version 10.0.0 -> To Version 10.0.0 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Helix.Sdk From Version 10.0.0-beta.25521.107 -> To Version 10.0.0-beta.25531.102 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 6ceca61 commit 93ee2e8

File tree

5 files changed

+20
-21
lines changed

5 files changed

+20
-21
lines changed

‎NuGet.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<clear />
88
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
99
<!-- Begin: Package sources from dotnet-dotnet -->
10-
<add key="darc-pub-dotnet-dotnet-44c449a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-44c449ac/nuget/v3/index.json" />
10+
<add key="darc-pub-dotnet-dotnet-ba86126" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-ba861262/nuget/v3/index.json" />
1111
<!-- End: Package sources from dotnet-dotnet -->
1212
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1313
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />

‎eng/Version.Details.xml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,29 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25521.107">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25531.102">
77
<Uri>https://github.com/dotnet/dotnet</Uri>
8-
<Sha>44c449accc808f07c97eeb29652cfa1870de9352</Sha>
8+
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
99
</Dependency>
10-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25521.107">
10+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25531.102">
1111
<Uri>https://github.com/dotnet/dotnet</Uri>
12-
<Sha>44c449accc808f07c97eeb29652cfa1870de9352</Sha>
12+
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
1313
</Dependency>
14-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.25521.107">
14+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.25531.102">
1515
<Uri>https://github.com/dotnet/dotnet</Uri>
16-
<Sha>44c449accc808f07c97eeb29652cfa1870de9352</Sha>
16+
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
1717
</Dependency>
1818
<Dependency Name="Microsoft.NET.Runtime.Emscripten.3.1.56.Node.linux-x64" Version="10.0.0">
1919
<Uri>https://github.com/dotnet/dotnet</Uri>
20-
<Sha>44c449accc808f07c97eeb29652cfa1870de9352</Sha>
20+
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
2121
</Dependency>
2222
<Dependency Name="Microsoft.NET.Runtime.Emscripten.3.1.56.Sdk.linux-x64" Version="10.0.0">
2323
<Uri>https://github.com/dotnet/dotnet</Uri>
24-
<Sha>44c449accc808f07c97eeb29652cfa1870de9352</Sha>
24+
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
2525
</Dependency>
2626
<Dependency Name="Microsoft.NET.Runtime.Emscripten.3.1.56.Cache.linux-x64" Version="10.0.0">
2727
<Uri>https://github.com/dotnet/dotnet</Uri>
28-
<Sha>44c449accc808f07c97eeb29652cfa1870de9352</Sha>
28+
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
2929
</Dependency>
3030
</ToolsetDependencies>
3131
</Dependencies>

‎eng/Versions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<MicrosoftNETRuntimeEmscripten3156Sdklinuxx64Version>10.0.0</MicrosoftNETRuntimeEmscripten3156Sdklinuxx64Version>
1313
<MicrosoftNETRuntimeEmscripten3156Cachelinuxx64Version>10.0.0</MicrosoftNETRuntimeEmscripten3156Cachelinuxx64Version>
1414
<!-- arcade -->
15-
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.25521.107</MicrosoftDotNetBuildTasksPackagingVersion>
15+
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.25531.102</MicrosoftDotNetBuildTasksPackagingVersion>
1616
</PropertyGroup>
1717
<PropertyGroup>
1818
<WasiSdkVersion>16</WasiSdkVersion>

‎eng/common/core-templates/steps/install-microbuild.yml‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,22 @@ parameters:
1111
# Unfortunately, _SignType can't be used to exclude the use of the service connection in non-real sign scenarios. The
1212
# variable is not available in template expression. _SignType has a very large proliferation across .NET, so replacing it is tough.
1313
microbuildUseESRP: true
14-
# Location of the MicroBuild output folder
15-
# NOTE: There's something that relies on this being in the "default" source directory for tasks such as Signing to work properly.
16-
microBuildOutputFolder: '$(Build.SourcesDirectory)'
1714

1815
continueOnError: false
1916

2017
steps:
2118
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
2219
- ${{ if eq(parameters.enableMicrobuildForMacAndLinux, 'true') }}:
23-
# Needed to download the MicroBuild plugin nupkgs on Mac and Linux when nuget.exe is unavailable
20+
# Installing .NET 8 is required to use the MicroBuild signing plugin on non-Windows platforms
2421
- task: UseDotNet@2
2522
displayName: Install .NET 8.0 SDK for MicroBuild Plugin
2623
inputs:
2724
packageType: sdk
2825
version: 8.0.x
29-
installationPath: ${{ parameters.microBuildOutputFolder }}/.dotnet
30-
workingDirectory: ${{ parameters.microBuildOutputFolder }}
26+
# Installing the SDK in a '.dotnet-microbuild' directory is required for signing.
27+
# See target FindDotNetPathForMicroBuild in arcade/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj
28+
# Do not remove '.dotnet-microbuild' from the path without changing the corresponding logic.
29+
installationPath: $(Agent.TempDirectory)/.dotnet-microbuild
3130
condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'))
3231

3332
- script: |
@@ -65,7 +64,7 @@ steps:
6564
ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
6665
env:
6766
TeamName: $(_TeamName)
68-
MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }}
67+
MicroBuildOutputFolderOverride: $(Agent.TempDirectory)/MicroBuild
6968
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
7069
continueOnError: ${{ parameters.continueOnError }}
7170
condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT'), in(variables['_SignType'], 'real', 'test'))
@@ -85,7 +84,7 @@ steps:
8584
ConnectedPMEServiceName: c24de2a5-cc7a-493d-95e4-8e5ff5cad2bc
8685
env:
8786
TeamName: $(_TeamName)
88-
MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }}
87+
MicroBuildOutputFolderOverride: $(Agent.TempDirectory)/MicroBuild
8988
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
9089
continueOnError: ${{ parameters.continueOnError }}
9190
condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'), eq(variables['_SignType'], 'real'))

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
},
1515
"msbuild-sdks": {
1616
"Microsoft.Build.Traversal": "3.4.0",
17-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25521.107",
18-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25521.107"
17+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25531.102",
18+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25531.102"
1919
}
2020
}

0 commit comments

Comments
 (0)