Skip to content

Commit 107f070

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/dotnet build 289051 (#1450)
Updated Dependencies: Microsoft.Build, Microsoft.Build.Utilities.Core (Version 18.0.2 -> 18.0.3) Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25528.106 -> 10.0.0-beta.25530.104) Microsoft.DotNet.GenAPI.Task (Version 10.0.100-rtm.25528.106 -> 10.0.100-rtm.25530.104) Microsoft.NETCore.ILAsm, Microsoft.NETCore.ILDAsm (Version 10.0.0 -> 10.0.0) Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 08d2a86 commit 107f070

File tree

5 files changed

+24
-25
lines changed

5 files changed

+24
-25
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-bbafab7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-bbafab7b/nuget/v3/index.json" />
10+
<add key="darc-pub-dotnet-dotnet-e50f95b" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-e50f95bd/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.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet/dotnet dependencies -->
9-
<MicrosoftBuildPackageVersion>18.0.2</MicrosoftBuildPackageVersion>
10-
<MicrosoftBuildUtilitiesCorePackageVersion>18.0.2</MicrosoftBuildUtilitiesCorePackageVersion>
11-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25528.106</MicrosoftDotNetArcadeSdkPackageVersion>
12-
<MicrosoftDotNetGenAPITaskPackageVersion>10.0.100-rtm.25528.106</MicrosoftDotNetGenAPITaskPackageVersion>
9+
<MicrosoftBuildPackageVersion>18.0.3</MicrosoftBuildPackageVersion>
10+
<MicrosoftBuildUtilitiesCorePackageVersion>18.0.3</MicrosoftBuildUtilitiesCorePackageVersion>
11+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25530.104</MicrosoftDotNetArcadeSdkPackageVersion>
12+
<MicrosoftDotNetGenAPITaskPackageVersion>10.0.100-rtm.25530.104</MicrosoftDotNetGenAPITaskPackageVersion>
1313
<MicrosoftNETCoreILAsmPackageVersion>10.0.0</MicrosoftNETCoreILAsmPackageVersion>
1414
<MicrosoftNETCoreILDAsmPackageVersion>10.0.0</MicrosoftNETCoreILDAsmPackageVersion>
1515
</PropertyGroup>

‎eng/Version.Details.xml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="source-build-reference-packages" Sha="bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05" BarId="288919" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="source-build-reference-packages" Sha="e50f95bd9940ada4c74fee327bb3e7146523db1c" BarId="289051" />
44
<ToolsetDependencies>
5-
<Dependency Name="Microsoft.Build" Version="18.0.2">
5+
<Dependency Name="Microsoft.Build" Version="18.0.3">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
7+
<Sha>e50f95bd9940ada4c74fee327bb3e7146523db1c</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.Build.Utilities.Core" Version="18.0.2">
9+
<Dependency Name="Microsoft.Build.Utilities.Core" Version="18.0.3">
1010
<Uri>https://github.com/dotnet/dotnet</Uri>
11-
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
11+
<Sha>e50f95bd9940ada4c74fee327bb3e7146523db1c</Sha>
1212
</Dependency>
13-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25528.106">
13+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25530.104">
1414
<Uri>https://github.com/dotnet/dotnet</Uri>
15-
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
15+
<Sha>e50f95bd9940ada4c74fee327bb3e7146523db1c</Sha>
1616
</Dependency>
17-
<Dependency Name="Microsoft.DotNet.GenAPI.Task" Version="10.0.100-rtm.25528.106">
17+
<Dependency Name="Microsoft.DotNet.GenAPI.Task" Version="10.0.100-rtm.25530.104">
1818
<Uri>https://github.com/dotnet/dotnet</Uri>
19-
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
19+
<Sha>e50f95bd9940ada4c74fee327bb3e7146523db1c</Sha>
2020
</Dependency>
2121
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.0">
2222
<Uri>https://github.com/dotnet/dotnet</Uri>
23-
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
23+
<Sha>e50f95bd9940ada4c74fee327bb3e7146523db1c</Sha>
2424
</Dependency>
2525
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="10.0.0">
2626
<Uri>https://github.com/dotnet/dotnet</Uri>
27-
<Sha>bbafab7b91a3596cc48c8a29cf1c8b8f9cb06c05</Sha>
27+
<Sha>e50f95bd9940ada4c74fee327bb3e7146523db1c</Sha>
2828
</Dependency>
2929
</ToolsetDependencies>
3030
</Dependencies>

‎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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
"msbuild-sdks": {
1616
"Microsoft.Build.NoTargets": "3.7.0",
1717
"Microsoft.Build.Traversal": "3.4.0",
18-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25528.106"
18+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25530.104"
1919
}
2020
}

0 commit comments

Comments
 (0)