Skip to content

Commit 018b09a

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/dotnet build 289869 (#1459)
Updated Dependencies: Microsoft.Build, Microsoft.Build.Utilities.Core (Version 18.1.0-preview-25555-103 -> 18.1.0-preview-25556-111) Microsoft.DotNet.Arcade.Sdk (Version 11.0.0-beta.25555.103 -> 11.0.0-beta.25556.111) Microsoft.DotNet.GenAPI.Task (Version 10.0.100-rc.2.25555.103 -> 10.0.100-rc.3.25556.111) Microsoft.NETCore.ILAsm, Microsoft.NETCore.ILDAsm (Version 10.0.0-rc.1.25555.103 -> 10.0.0-rc.3.25556.111) Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 38f3944 commit 018b09a

File tree

7 files changed

+40
-30
lines changed

7 files changed

+40
-30
lines changed

‎eng/Version.Details.props‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet/dotnet dependencies -->
9-
<MicrosoftBuildPackageVersion>18.1.0-preview-25555-103</MicrosoftBuildPackageVersion>
10-
<MicrosoftBuildUtilitiesCorePackageVersion>18.1.0-preview-25555-103</MicrosoftBuildUtilitiesCorePackageVersion>
11-
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25555.103</MicrosoftDotNetArcadeSdkPackageVersion>
12-
<MicrosoftDotNetGenAPITaskPackageVersion>10.0.100-rc.2.25555.103</MicrosoftDotNetGenAPITaskPackageVersion>
13-
<MicrosoftNETCoreILAsmPackageVersion>10.0.0-rc.1.25555.103</MicrosoftNETCoreILAsmPackageVersion>
14-
<MicrosoftNETCoreILDAsmPackageVersion>10.0.0-rc.1.25555.103</MicrosoftNETCoreILDAsmPackageVersion>
9+
<MicrosoftBuildPackageVersion>18.1.0-preview-25556-111</MicrosoftBuildPackageVersion>
10+
<MicrosoftBuildUtilitiesCorePackageVersion>18.1.0-preview-25556-111</MicrosoftBuildUtilitiesCorePackageVersion>
11+
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25556.111</MicrosoftDotNetArcadeSdkPackageVersion>
12+
<MicrosoftDotNetGenAPITaskPackageVersion>10.0.100-rc.3.25556.111</MicrosoftDotNetGenAPITaskPackageVersion>
13+
<MicrosoftNETCoreILAsmPackageVersion>10.0.0-rc.3.25556.111</MicrosoftNETCoreILAsmPackageVersion>
14+
<MicrosoftNETCoreILDAsmPackageVersion>10.0.0-rc.3.25556.111</MicrosoftNETCoreILDAsmPackageVersion>
1515
</PropertyGroup>
1616
<!--Property group for alternate package version names-->
1717
<PropertyGroup>

‎eng/Version.Details.xml‎

Lines changed: 13 additions & 13 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="54c879632fdf0197d517d80e4b90861e2bd5d03e" BarId="289655" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="source-build-reference-packages" Sha="77ee357638bcd8fa66a1c16fa588dcd5818068d2" BarId="289869" />
44
<ToolsetDependencies>
5-
<Dependency Name="Microsoft.Build" Version="18.1.0-preview-25555-103">
5+
<Dependency Name="Microsoft.Build" Version="18.1.0-preview-25556-111">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
7+
<Sha>77ee357638bcd8fa66a1c16fa588dcd5818068d2</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.Build.Utilities.Core" Version="18.1.0-preview-25555-103">
9+
<Dependency Name="Microsoft.Build.Utilities.Core" Version="18.1.0-preview-25556-111">
1010
<Uri>https://github.com/dotnet/dotnet</Uri>
11-
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
11+
<Sha>77ee357638bcd8fa66a1c16fa588dcd5818068d2</Sha>
1212
</Dependency>
13-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25555.103">
13+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25556.111">
1414
<Uri>https://github.com/dotnet/dotnet</Uri>
15-
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
15+
<Sha>77ee357638bcd8fa66a1c16fa588dcd5818068d2</Sha>
1616
</Dependency>
17-
<Dependency Name="Microsoft.DotNet.GenAPI.Task" Version="10.0.100-rc.2.25555.103">
17+
<Dependency Name="Microsoft.DotNet.GenAPI.Task" Version="10.0.100-rc.3.25556.111">
1818
<Uri>https://github.com/dotnet/dotnet</Uri>
19-
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
19+
<Sha>77ee357638bcd8fa66a1c16fa588dcd5818068d2</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.0-rc.1.25555.103">
21+
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.0-rc.3.25556.111">
2222
<Uri>https://github.com/dotnet/dotnet</Uri>
23-
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
23+
<Sha>77ee357638bcd8fa66a1c16fa588dcd5818068d2</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="10.0.0-rc.1.25555.103">
25+
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="10.0.0-rc.3.25556.111">
2626
<Uri>https://github.com/dotnet/dotnet</Uri>
27-
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
27+
<Sha>77ee357638bcd8fa66a1c16fa588dcd5818068d2</Sha>
2828
</Dependency>
2929
</ToolsetDependencies>
3030
</Dependencies>

‎eng/common/core-templates/job/publish-build-assets.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,11 @@ jobs:
189189
BARBuildId: ${{ parameters.BARBuildId }}
190190
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
191191
is1ESPipeline: ${{ parameters.is1ESPipeline }}
192+
193+
# Darc is targeting 8.0, so make sure it's installed
194+
- task: UseDotNet@2
195+
inputs:
196+
version: 8.0.x
192197

193198
- task: AzureCLI@2
194199
displayName: Publish Using Darc

‎eng/common/core-templates/post-build/post-build.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -313,6 +313,10 @@ stages:
313313

314314
- template: /eng/common/templates/steps/enable-internal-runtimes.yml
315315

316+
- task: UseDotNet@2
317+
inputs:
318+
version: 8.0.x
319+
316320
- task: AzureCLI@2
317321
displayName: Publish Using Darc
318322
inputs:

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ parameters:
2020
steps:
2121
- ${{ if eq(parameters.enablePreviewMicrobuild, 'true') }}:
2222
- task: MicroBuildSigningPluginPreview@4
23-
displayName: Install Preview MicroBuild plugin (Windows)
23+
displayName: Install Preview MicroBuild plugin
2424
inputs: ${{ parameters.microbuildTaskInputs }}
2525
env: ${{ parameters.microbuildEnv }}
2626
continueOnError: ${{ parameters.continueOnError }}
2727
condition: ${{ parameters.condition }}
2828
- ${{ else }}:
2929
- task: MicroBuildSigningPlugin@4
30-
displayName: Install MicroBuild plugin (Windows)
30+
displayName: Install MicroBuild plugin
3131
inputs: ${{ parameters.microbuildTaskInputs }}
3232
env: ${{ parameters.microbuildEnv }}
3333
continueOnError: ${{ parameters.continueOnError }}
34-
condition: ${{ parameters.condition }}
34+
condition: ${{ parameters.condition }}

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

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

@@ -21,16 +24,14 @@ parameters:
2124
steps:
2225
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
2326
- ${{ if eq(parameters.enableMicrobuildForMacAndLinux, 'true') }}:
24-
# Installing .NET 8 is required to use the MicroBuild signing plugin on non-Windows platforms
27+
# Needed to download the MicroBuild plugin nupkgs on Mac and Linux when nuget.exe is unavailable
2528
- task: UseDotNet@2
2629
displayName: Install .NET 8.0 SDK for MicroBuild Plugin
2730
inputs:
2831
packageType: sdk
2932
version: 8.0.x
30-
# Installing the SDK in a '.dotnet-microbuild' directory is required for signing.
31-
# See target FindDotNetPathForMicroBuild in arcade/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj
32-
# Do not remove '.dotnet-microbuild' from the path without changing the corresponding logic.
33-
installationPath: $(Agent.TempDirectory)/.dotnet-microbuild
33+
installationPath: ${{ parameters.microBuildOutputFolder }}/.dotnet
34+
workingDirectory: ${{ parameters.microBuildOutputFolder }}
3435
condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'))
3536

3637
- script: |
@@ -70,7 +71,7 @@ steps:
7071
ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
7172
microbuildEnv:
7273
TeamName: $(_TeamName)
73-
MicroBuildOutputFolderOverride: $(Agent.TempDirectory)/MicroBuild
74+
MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }}
7475
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
7576
continueOnError: ${{ parameters.continueOnError }}
7677
condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT'), in(variables['_SignType'], 'real', 'test'))
@@ -92,7 +93,7 @@ steps:
9293
ConnectedPMEServiceName: c24de2a5-cc7a-493d-95e4-8e5ff5cad2bc
9394
microbuildEnv:
9495
TeamName: $(_TeamName)
95-
MicroBuildOutputFolderOverride: $(Agent.TempDirectory)/MicroBuild
96+
MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }}
9697
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
9798
continueOnError: ${{ parameters.continueOnError }}
9899
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": "11.0.0-beta.25555.103"
18+
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25556.111"
1919
}
2020
}

0 commit comments

Comments
 (0)