Skip to content

Commit 8d94dfc

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
committed
Update dependencies from https://github.com/dotnet/dotnet build 289869
Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.25555.103 -> 11.0.0-beta.25556.111) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.1.25555.103 -> 10.0.0-rc.3.25556.111) Microsoft.DotNet.Wpf.DncEng (Version 10.0.0-rc.1.25552.1 -> 10.0.0-rc.1.25513.8)
1 parent c9fe388 commit 8d94dfc

File tree

7 files changed

+92
-82
lines changed

7 files changed

+92
-82
lines changed

‎eng/Version.Details.props‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -8,32 +8,32 @@ This file should be imported by eng/Versions.props
88
<!-- dotnet/dotnet dependencies -->
99
<MicrosoftBuildFrameworkPackageVersion>15.9.20</MicrosoftBuildFrameworkPackageVersion>
1010
<MicrosoftBuildUtilitiesCorePackageVersion>15.9.20</MicrosoftBuildUtilitiesCorePackageVersion>
11-
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25555.103</MicrosoftDotNetArcadeSdkPackageVersion>
12-
<MicrosoftDotNetCodeAnalysisPackageVersion>11.0.0-beta.25555.103</MicrosoftDotNetCodeAnalysisPackageVersion>
13-
<MicrosoftDotNetGenAPIPackageVersion>11.0.0-beta.25555.103</MicrosoftDotNetGenAPIPackageVersion>
14-
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25555.103</MicrosoftDotNetHelixSdkPackageVersion>
15-
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-rc.1.25555.103</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
16-
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.1.25555.103</MicrosoftNETCoreAppRefPackageVersion>
17-
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.1.25555.103</MicrosoftNETCorePlatformsPackageVersion>
18-
<MicrosoftPrivateWinformsPackageVersion>10.0.0-rc.1.25555.103</MicrosoftPrivateWinformsPackageVersion>
11+
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25556.111</MicrosoftDotNetArcadeSdkPackageVersion>
12+
<MicrosoftDotNetCodeAnalysisPackageVersion>11.0.0-beta.25556.111</MicrosoftDotNetCodeAnalysisPackageVersion>
13+
<MicrosoftDotNetGenAPIPackageVersion>11.0.0-beta.25556.111</MicrosoftDotNetGenAPIPackageVersion>
14+
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25556.111</MicrosoftDotNetHelixSdkPackageVersion>
15+
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-rc.3.25556.111</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
16+
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.3.25556.111</MicrosoftNETCoreAppRefPackageVersion>
17+
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.3.25556.111</MicrosoftNETCorePlatformsPackageVersion>
18+
<MicrosoftPrivateWinformsPackageVersion>10.0.0-rc.3.25556.111</MicrosoftPrivateWinformsPackageVersion>
1919
<MicrosoftSourceLinkAzureReposGitPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkAzureReposGitPackageVersion>
2020
<MicrosoftSourceLinkGitHubPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkGitHubPackageVersion>
21-
<SystemCodeDomPackageVersion>10.0.0-rc.1.25555.103</SystemCodeDomPackageVersion>
22-
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-rc.1.25555.103</SystemConfigurationConfigurationManagerPackageVersion>
23-
<SystemDiagnosticsEventLogPackageVersion>10.0.0-rc.1.25555.103</SystemDiagnosticsEventLogPackageVersion>
24-
<SystemDirectoryServicesPackageVersion>10.0.0-rc.1.25555.103</SystemDirectoryServicesPackageVersion>
25-
<SystemDrawingCommonPackageVersion>10.0.0-rc.1.25555.103</SystemDrawingCommonPackageVersion>
26-
<SystemFormatsNrbfPackageVersion>10.0.0-rc.1.25555.103</SystemFormatsNrbfPackageVersion>
27-
<SystemIOPackagingPackageVersion>10.0.0-rc.1.25555.103</SystemIOPackagingPackageVersion>
28-
<SystemPrivateWindowsCoreTestUtilitiesPackageVersion>10.0.0-rc.1.25555.103</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
29-
<SystemReflectionMetadataLoadContextPackageVersion>10.0.0-rc.1.25555.103</SystemReflectionMetadataLoadContextPackageVersion>
30-
<SystemResourcesExtensionsPackageVersion>10.0.0-rc.1.25555.103</SystemResourcesExtensionsPackageVersion>
31-
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-rc.1.25555.103</SystemRuntimeSerializationFormattersPackageVersion>
32-
<SystemSecurityCryptographyXmlPackageVersion>10.0.0-rc.1.25555.103</SystemSecurityCryptographyXmlPackageVersion>
33-
<SystemSecurityPermissionsPackageVersion>10.0.0-rc.1.25555.103</SystemSecurityPermissionsPackageVersion>
34-
<SystemWindowsExtensionsPackageVersion>10.0.0-rc.1.25555.103</SystemWindowsExtensionsPackageVersion>
21+
<SystemCodeDomPackageVersion>10.0.0-rc.3.25556.111</SystemCodeDomPackageVersion>
22+
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-rc.3.25556.111</SystemConfigurationConfigurationManagerPackageVersion>
23+
<SystemDiagnosticsEventLogPackageVersion>10.0.0-rc.3.25556.111</SystemDiagnosticsEventLogPackageVersion>
24+
<SystemDirectoryServicesPackageVersion>10.0.0-rc.3.25556.111</SystemDirectoryServicesPackageVersion>
25+
<SystemDrawingCommonPackageVersion>10.0.0-rc.3.25556.111</SystemDrawingCommonPackageVersion>
26+
<SystemFormatsNrbfPackageVersion>10.0.0-rc.3.25556.111</SystemFormatsNrbfPackageVersion>
27+
<SystemIOPackagingPackageVersion>10.0.0-rc.3.25556.111</SystemIOPackagingPackageVersion>
28+
<SystemPrivateWindowsCoreTestUtilitiesPackageVersion>10.0.0-rc.3.25556.111</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
29+
<SystemReflectionMetadataLoadContextPackageVersion>10.0.0-rc.3.25556.111</SystemReflectionMetadataLoadContextPackageVersion>
30+
<SystemResourcesExtensionsPackageVersion>10.0.0-rc.3.25556.111</SystemResourcesExtensionsPackageVersion>
31+
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-rc.3.25556.111</SystemRuntimeSerializationFormattersPackageVersion>
32+
<SystemSecurityCryptographyXmlPackageVersion>10.0.0-rc.3.25556.111</SystemSecurityCryptographyXmlPackageVersion>
33+
<SystemSecurityPermissionsPackageVersion>10.0.0-rc.3.25556.111</SystemSecurityPermissionsPackageVersion>
34+
<SystemWindowsExtensionsPackageVersion>10.0.0-rc.3.25556.111</SystemWindowsExtensionsPackageVersion>
3535
<!-- _git/dotnet-wpf-int dependencies -->
36-
<MicrosoftDotNetWpfDncEngPackageVersion>10.0.0-rc.1.25552.1</MicrosoftDotNetWpfDncEngPackageVersion>
36+
<MicrosoftDotNetWpfDncEngPackageVersion>10.0.0-rc.1.25513.8</MicrosoftDotNetWpfDncEngPackageVersion>
3737
</PropertyGroup>
3838
<!--Property group for alternate package version names-->
3939
<PropertyGroup>

‎eng/Version.Details.xml‎

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,78 +1,78 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="54c879632fdf0197d517d80e4b90861e2bd5d03e" BarId="289655" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="77ee357638bcd8fa66a1c16fa588dcd5818068d2" BarId="289869" />
44
<ProductDependencies>
5-
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.0-rc.1.25555.103">
5+
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.0-rc.3.25556.111">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
7+
<Sha>77ee357638bcd8fa66a1c16fa588dcd5818068d2</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-rc.1.25555.103">
9+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-rc.3.25556.111">
1010
<Uri>https://github.com/dotnet/dotnet</Uri>
11-
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
11+
<Sha>77ee357638bcd8fa66a1c16fa588dcd5818068d2</Sha>
1212
</Dependency>
13-
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-rc.1.25555.103">
13+
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-rc.3.25556.111">
1414
<Uri>https://github.com/dotnet/dotnet</Uri>
15-
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
15+
<Sha>77ee357638bcd8fa66a1c16fa588dcd5818068d2</Sha>
1616
</Dependency>
17-
<Dependency Name="System.Windows.Extensions" Version="10.0.0-rc.1.25555.103">
17+
<Dependency Name="System.Windows.Extensions" Version="10.0.0-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.Platforms" Version="10.0.0-rc.1.25555.103">
21+
<Dependency Name="Microsoft.NETCore.Platforms" 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.DotNet.Wpf.DncEng" Version="10.0.0-rc.1.25552.1">
25+
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="10.0.0-rc.1.25513.8">
2626
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
27-
<Sha>fbf3653d46ee940938937f6d8ad095e7aacbd921</Sha>
27+
<Sha>6ae9d774864ecf3dde943c58647257f250505fd9</Sha>
2828
</Dependency>
29-
<Dependency Name="System.Resources.Extensions" Version="10.0.0-rc.1.25555.103">
29+
<Dependency Name="System.Resources.Extensions" Version="10.0.0-rc.3.25556.111">
3030
<Uri>https://github.com/dotnet/dotnet</Uri>
31-
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
31+
<Sha>77ee357638bcd8fa66a1c16fa588dcd5818068d2</Sha>
3232
</Dependency>
33-
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-rc.1.25555.103">
33+
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-rc.3.25556.111">
3434
<Uri>https://github.com/dotnet/dotnet</Uri>
35-
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
35+
<Sha>77ee357638bcd8fa66a1c16fa588dcd5818068d2</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.1.25555.103">
37+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.3.25556.111">
3838
<Uri>https://github.com/dotnet/dotnet</Uri>
39-
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
39+
<Sha>77ee357638bcd8fa66a1c16fa588dcd5818068d2</Sha>
4040
</Dependency>
41-
<Dependency Name="System.CodeDom" Version="10.0.0-rc.1.25555.103">
41+
<Dependency Name="System.CodeDom" Version="10.0.0-rc.3.25556.111">
4242
<Uri>https://github.com/dotnet/dotnet</Uri>
43-
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
43+
<Sha>77ee357638bcd8fa66a1c16fa588dcd5818068d2</Sha>
4444
</Dependency>
45-
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-rc.1.25555.103">
45+
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-rc.3.25556.111">
4646
<Uri>https://github.com/dotnet/dotnet</Uri>
47-
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
47+
<Sha>77ee357638bcd8fa66a1c16fa588dcd5818068d2</Sha>
4848
</Dependency>
49-
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.0-rc.1.25555.103">
49+
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.0-rc.3.25556.111">
5050
<Uri>https://github.com/dotnet/dotnet</Uri>
51-
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
51+
<Sha>77ee357638bcd8fa66a1c16fa588dcd5818068d2</Sha>
5252
</Dependency>
53-
<Dependency Name="System.DirectoryServices" Version="10.0.0-rc.1.25555.103">
53+
<Dependency Name="System.DirectoryServices" Version="10.0.0-rc.3.25556.111">
5454
<Uri>https://github.com/dotnet/dotnet</Uri>
55-
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
55+
<Sha>77ee357638bcd8fa66a1c16fa588dcd5818068d2</Sha>
5656
</Dependency>
57-
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-rc.1.25555.103">
57+
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-rc.3.25556.111">
5858
<Uri>https://github.com/dotnet/dotnet</Uri>
59-
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
59+
<Sha>77ee357638bcd8fa66a1c16fa588dcd5818068d2</Sha>
6060
</Dependency>
61-
<Dependency Name="System.IO.Packaging" Version="10.0.0-rc.1.25555.103">
61+
<Dependency Name="System.IO.Packaging" Version="10.0.0-rc.3.25556.111">
6262
<Uri>https://github.com/dotnet/dotnet</Uri>
63-
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
63+
<Sha>77ee357638bcd8fa66a1c16fa588dcd5818068d2</Sha>
6464
</Dependency>
65-
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0-rc.1.25555.103">
65+
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0-rc.3.25556.111">
6666
<Uri>https://github.com/dotnet/dotnet</Uri>
67-
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
67+
<Sha>77ee357638bcd8fa66a1c16fa588dcd5818068d2</Sha>
6868
</Dependency>
69-
<Dependency Name="System.Security.Permissions" Version="10.0.0-rc.1.25555.103">
69+
<Dependency Name="System.Security.Permissions" Version="10.0.0-rc.3.25556.111">
7070
<Uri>https://github.com/dotnet/dotnet</Uri>
71-
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
71+
<Sha>77ee357638bcd8fa66a1c16fa588dcd5818068d2</Sha>
7272
</Dependency>
73-
<Dependency Name="System.Drawing.Common" Version="10.0.0-rc.1.25555.103">
73+
<Dependency Name="System.Drawing.Common" Version="10.0.0-rc.3.25556.111">
7474
<Uri>https://github.com/dotnet/dotnet</Uri>
75-
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
75+
<Sha>77ee357638bcd8fa66a1c16fa588dcd5818068d2</Sha>
7676
</Dependency>
7777
<Dependency Name="Microsoft.Build.Framework" Version="15.9.20">
7878
<Uri>https://github.com/dotnet/dotnet</Uri>
@@ -84,21 +84,21 @@
8484
</Dependency>
8585
</ProductDependencies>
8686
<ToolsetDependencies>
87-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25555.103">
87+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25556.111">
8888
<Uri>https://github.com/dotnet/dotnet</Uri>
89-
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
89+
<Sha>77ee357638bcd8fa66a1c16fa588dcd5818068d2</Sha>
9090
</Dependency>
91-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="11.0.0-beta.25555.103">
91+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="11.0.0-beta.25556.111">
9292
<Uri>https://github.com/dotnet/dotnet</Uri>
93-
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
93+
<Sha>77ee357638bcd8fa66a1c16fa588dcd5818068d2</Sha>
9494
</Dependency>
95-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25555.103">
95+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25556.111">
9696
<Uri>https://github.com/dotnet/dotnet</Uri>
97-
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
97+
<Sha>77ee357638bcd8fa66a1c16fa588dcd5818068d2</Sha>
9898
</Dependency>
99-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="11.0.0-beta.25555.103">
99+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="11.0.0-beta.25556.111">
100100
<Uri>https://github.com/dotnet/dotnet</Uri>
101-
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
101+
<Sha>77ee357638bcd8fa66a1c16fa588dcd5818068d2</Sha>
102102
</Dependency>
103103
<!-- TODO: Unpin sourcelink dependencies: https://github.com/dotnet/wpf/issues/11042 -->
104104
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0-beta.23409.2" Pinned="true">
@@ -109,9 +109,9 @@
109109
<Uri>https://github.com/dotnet/dotnet</Uri>
110110
<Sha>e9f665e52848a3615736c099e5631af531b66a5c</Sha>
111111
</Dependency>
112-
<Dependency Name="System.Private.Windows.Core.TestUtilities" Version="10.0.0-rc.1.25555.103">
112+
<Dependency Name="System.Private.Windows.Core.TestUtilities" Version="10.0.0-rc.3.25556.111">
113113
<Uri>https://github.com/dotnet/dotnet</Uri>
114-
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
114+
<Sha>77ee357638bcd8fa66a1c16fa588dcd5818068d2</Sha>
115115
</Dependency>
116116
</ToolsetDependencies>
117117
</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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
"runner": "Microsoft.Testing.Platform"
2828
},
2929
"msbuild-sdks": {
30-
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25555.103",
31-
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25555.103",
30+
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25556.111",
31+
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25556.111",
3232
"Microsoft.Build.NoTargets": "3.7.56"
3333
},
3434
"native-tools": {

0 commit comments

Comments
 (0)