Skip to content

Commit b33edbc

Browse files
[main] Source code updates from dotnet/dotnet (#14077)
[main] Source code updates from dotnet/dotnet
1 parent 09c759b commit b33edbc

File tree

4 files changed

+104
-85
lines changed

4 files changed

+104
-85
lines changed

eng/Version.Details.props

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6,31 +6,31 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet/dotnet dependencies -->
9-
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25571.109</MicrosoftDotNetArcadeSdkPackageVersion>
10-
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.25571.109</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
11-
<MicrosoftDotNetCMakeSdkPackageVersion>11.0.0-beta.25571.109</MicrosoftDotNetCMakeSdkPackageVersion>
12-
<MicrosoftDotNetGenFacadesPackageVersion>11.0.0-beta.25571.109</MicrosoftDotNetGenFacadesPackageVersion>
13-
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25571.109</MicrosoftDotNetHelixSdkPackageVersion>
14-
<MicrosoftDotNetRemoteExecutorPackageVersion>11.0.0-beta.25571.109</MicrosoftDotNetRemoteExecutorPackageVersion>
15-
<MicrosoftDotNetXUnitV3ExtensionsPackageVersion>11.0.0-beta.25571.109</MicrosoftDotNetXUnitV3ExtensionsPackageVersion>
16-
<MicrosoftNETSdkILPackageVersion>10.0.0-rc.3.25571.109</MicrosoftNETSdkILPackageVersion>
17-
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.3.25571.109</MicrosoftNETCoreAppRefPackageVersion>
18-
<MicrosoftNETCoreILAsmPackageVersion>10.0.0-rc.3.25571.109</MicrosoftNETCoreILAsmPackageVersion>
19-
<MicrosoftNETCoreILDAsmPackageVersion>10.0.0-rc.3.25571.109</MicrosoftNETCoreILDAsmPackageVersion>
20-
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.3.25571.109</MicrosoftNETCorePlatformsPackageVersion>
21-
<MicrosoftWin32SystemEventsPackageVersion>10.0.0-rc.3.25571.109</MicrosoftWin32SystemEventsPackageVersion>
22-
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>10.0.0-rc.3.25571.109</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
23-
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>10.0.0-rc.3.25571.109</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
24-
<SystemCodeDomPackageVersion>10.0.0-rc.3.25571.109</SystemCodeDomPackageVersion>
25-
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-rc.3.25571.109</SystemConfigurationConfigurationManagerPackageVersion>
26-
<SystemFormatsNrbfPackageVersion>10.0.0-rc.3.25571.109</SystemFormatsNrbfPackageVersion>
27-
<SystemIOHashingPackageVersion>10.0.0-rc.3.25571.109</SystemIOHashingPackageVersion>
28-
<SystemReflectionMetadataLoadContextPackageVersion>10.0.0-rc.3.25571.109</SystemReflectionMetadataLoadContextPackageVersion>
29-
<SystemResourcesExtensionsPackageVersion>10.0.0-rc.3.25571.109</SystemResourcesExtensionsPackageVersion>
30-
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-rc.3.25571.109</SystemRuntimeSerializationFormattersPackageVersion>
31-
<SystemTextEncodingsWebPackageVersion>10.0.0-rc.3.25571.109</SystemTextEncodingsWebPackageVersion>
32-
<SystemTextJsonPackageVersion>10.0.0-rc.3.25571.109</SystemTextJsonPackageVersion>
33-
<SystemWindowsExtensionsPackageVersion>10.0.0-rc.3.25571.109</SystemWindowsExtensionsPackageVersion>
9+
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25574.108</MicrosoftDotNetArcadeSdkPackageVersion>
10+
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.25574.108</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
11+
<MicrosoftDotNetCMakeSdkPackageVersion>11.0.0-beta.25574.108</MicrosoftDotNetCMakeSdkPackageVersion>
12+
<MicrosoftDotNetGenFacadesPackageVersion>11.0.0-beta.25574.108</MicrosoftDotNetGenFacadesPackageVersion>
13+
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25574.108</MicrosoftDotNetHelixSdkPackageVersion>
14+
<MicrosoftDotNetRemoteExecutorPackageVersion>11.0.0-beta.25574.108</MicrosoftDotNetRemoteExecutorPackageVersion>
15+
<MicrosoftDotNetXUnitV3ExtensionsPackageVersion>11.0.0-beta.25574.108</MicrosoftDotNetXUnitV3ExtensionsPackageVersion>
16+
<MicrosoftNETSdkILPackageVersion>10.0.0-rc.3.25574.108</MicrosoftNETSdkILPackageVersion>
17+
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.3.25574.108</MicrosoftNETCoreAppRefPackageVersion>
18+
<MicrosoftNETCoreILAsmPackageVersion>10.0.0-rc.3.25574.108</MicrosoftNETCoreILAsmPackageVersion>
19+
<MicrosoftNETCoreILDAsmPackageVersion>10.0.0-rc.3.25574.108</MicrosoftNETCoreILDAsmPackageVersion>
20+
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.3.25574.108</MicrosoftNETCorePlatformsPackageVersion>
21+
<MicrosoftWin32SystemEventsPackageVersion>10.0.0-rc.3.25574.108</MicrosoftWin32SystemEventsPackageVersion>
22+
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>10.0.0-rc.3.25574.108</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
23+
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>10.0.0-rc.3.25574.108</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
24+
<SystemCodeDomPackageVersion>10.0.0-rc.3.25574.108</SystemCodeDomPackageVersion>
25+
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-rc.3.25574.108</SystemConfigurationConfigurationManagerPackageVersion>
26+
<SystemFormatsNrbfPackageVersion>10.0.0-rc.3.25574.108</SystemFormatsNrbfPackageVersion>
27+
<SystemIOHashingPackageVersion>10.0.0-rc.3.25574.108</SystemIOHashingPackageVersion>
28+
<SystemReflectionMetadataLoadContextPackageVersion>10.0.0-rc.3.25574.108</SystemReflectionMetadataLoadContextPackageVersion>
29+
<SystemResourcesExtensionsPackageVersion>10.0.0-rc.3.25574.108</SystemResourcesExtensionsPackageVersion>
30+
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-rc.3.25574.108</SystemRuntimeSerializationFormattersPackageVersion>
31+
<SystemTextEncodingsWebPackageVersion>10.0.0-rc.3.25574.108</SystemTextEncodingsWebPackageVersion>
32+
<SystemTextJsonPackageVersion>10.0.0-rc.3.25574.108</SystemTextJsonPackageVersion>
33+
<SystemWindowsExtensionsPackageVersion>10.0.0-rc.3.25574.108</SystemWindowsExtensionsPackageVersion>
3434
</PropertyGroup>
3535
<!--Property group for alternate package version names-->
3636
<PropertyGroup>

eng/Version.Details.xml

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -6,110 +6,110 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
66
And you can check these with "darc get-dependencies <dash dash>target-repo "winforms"
77
-->
88
<Dependencies>
9-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="winforms" Sha="cc7f6e84d8dae36ad9ea51a5112627b8235982cc" BarId="291900" />
9+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="winforms" Sha="d119b40e8ff3b88f87ad60b04c807233a159b197" BarId="292184" />
1010
<ProductDependencies>
11-
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.3.25571.109">
11+
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.3.25574.108">
1212
<Uri>https://github.com/dotnet/dotnet</Uri>
13-
<Sha>cc7f6e84d8dae36ad9ea51a5112627b8235982cc</Sha>
13+
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
1414
</Dependency>
15-
<Dependency Name="System.Resources.Extensions" Version="10.0.0-rc.3.25571.109">
15+
<Dependency Name="System.Resources.Extensions" Version="10.0.0-rc.3.25574.108">
1616
<Uri>https://github.com/dotnet/dotnet</Uri>
17-
<Sha>cc7f6e84d8dae36ad9ea51a5112627b8235982cc</Sha>
17+
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
1818
</Dependency>
19-
<Dependency Name="System.Windows.Extensions" Version="10.0.0-rc.3.25571.109">
19+
<Dependency Name="System.Windows.Extensions" Version="10.0.0-rc.3.25574.108">
2020
<Uri>https://github.com/dotnet/dotnet</Uri>
21-
<Sha>cc7f6e84d8dae36ad9ea51a5112627b8235982cc</Sha>
21+
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
2222
</Dependency>
23-
<Dependency Name="Microsoft.NET.Sdk.IL" Version="10.0.0-rc.3.25571.109">
23+
<Dependency Name="Microsoft.NET.Sdk.IL" Version="10.0.0-rc.3.25574.108">
2424
<Uri>https://github.com/dotnet/dotnet</Uri>
25-
<Sha>cc7f6e84d8dae36ad9ea51a5112627b8235982cc</Sha>
25+
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
2626
</Dependency>
27-
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.0-rc.3.25571.109">
27+
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.0-rc.3.25574.108">
2828
<Uri>https://github.com/dotnet/dotnet</Uri>
29-
<Sha>cc7f6e84d8dae36ad9ea51a5112627b8235982cc</Sha>
29+
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
3030
</Dependency>
31-
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="10.0.0-rc.3.25571.109">
31+
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="10.0.0-rc.3.25574.108">
3232
<Uri>https://github.com/dotnet/dotnet</Uri>
33-
<Sha>cc7f6e84d8dae36ad9ea51a5112627b8235982cc</Sha>
33+
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
3434
</Dependency>
35-
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="10.0.0-rc.3.25571.109">
35+
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="10.0.0-rc.3.25574.108">
3636
<Uri>https://github.com/dotnet/dotnet</Uri>
37-
<Sha>cc7f6e84d8dae36ad9ea51a5112627b8235982cc</Sha>
37+
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
3838
</Dependency>
39-
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-rc.3.25571.109">
39+
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-rc.3.25574.108">
4040
<Uri>https://github.com/dotnet/dotnet</Uri>
41-
<Sha>cc7f6e84d8dae36ad9ea51a5112627b8235982cc</Sha>
41+
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
4242
</Dependency>
43-
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="10.0.0-rc.3.25571.109">
43+
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="10.0.0-rc.3.25574.108">
4444
<Uri>https://github.com/dotnet/dotnet</Uri>
45-
<Sha>cc7f6e84d8dae36ad9ea51a5112627b8235982cc</Sha>
45+
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
4646
</Dependency>
47-
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-rc.3.25571.109">
47+
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-rc.3.25574.108">
4848
<Uri>https://github.com/dotnet/dotnet</Uri>
49-
<Sha>cc7f6e84d8dae36ad9ea51a5112627b8235982cc</Sha>
49+
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
5050
</Dependency>
51-
<Dependency Name="System.Text.Json" Version="10.0.0-rc.3.25571.109">
51+
<Dependency Name="System.Text.Json" Version="10.0.0-rc.3.25574.108">
5252
<Uri>https://github.com/dotnet/dotnet</Uri>
53-
<Sha>cc7f6e84d8dae36ad9ea51a5112627b8235982cc</Sha>
53+
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
5454
</Dependency>
55-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.3.25571.109">
55+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.3.25574.108">
5656
<Uri>https://github.com/dotnet/dotnet</Uri>
57-
<Sha>cc7f6e84d8dae36ad9ea51a5112627b8235982cc</Sha>
57+
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
5858
</Dependency>
59-
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-rc.3.25571.109">
59+
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-rc.3.25574.108">
6060
<Uri>https://github.com/dotnet/dotnet</Uri>
61-
<Sha>cc7f6e84d8dae36ad9ea51a5112627b8235982cc</Sha>
61+
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
6262
</Dependency>
63-
<Dependency Name="Microsoft.Win32.SystemEvents" Version="10.0.0-rc.3.25571.109">
63+
<Dependency Name="Microsoft.Win32.SystemEvents" Version="10.0.0-rc.3.25574.108">
6464
<Uri>https://github.com/dotnet/dotnet</Uri>
65-
<Sha>cc7f6e84d8dae36ad9ea51a5112627b8235982cc</Sha>
65+
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
6666
</Dependency>
67-
<Dependency Name="System.CodeDom" Version="10.0.0-rc.3.25571.109">
67+
<Dependency Name="System.CodeDom" Version="10.0.0-rc.3.25574.108">
6868
<Uri>https://github.com/dotnet/dotnet</Uri>
69-
<Sha>cc7f6e84d8dae36ad9ea51a5112627b8235982cc</Sha>
69+
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
7070
</Dependency>
71-
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-rc.3.25571.109">
71+
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-rc.3.25574.108">
7272
<Uri>https://github.com/dotnet/dotnet</Uri>
73-
<Sha>cc7f6e84d8dae36ad9ea51a5112627b8235982cc</Sha>
73+
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
7474
</Dependency>
75-
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-rc.3.25571.109">
75+
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-rc.3.25574.108">
7676
<Uri>https://github.com/dotnet/dotnet</Uri>
77-
<Sha>cc7f6e84d8dae36ad9ea51a5112627b8235982cc</Sha>
77+
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
7878
</Dependency>
79-
<Dependency Name="System.IO.Hashing" Version="10.0.0-rc.3.25571.109">
79+
<Dependency Name="System.IO.Hashing" Version="10.0.0-rc.3.25574.108">
8080
<Uri>https://github.com/dotnet/dotnet</Uri>
81-
<Sha>cc7f6e84d8dae36ad9ea51a5112627b8235982cc</Sha>
81+
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
8282
</Dependency>
8383
</ProductDependencies>
8484
<ToolsetDependencies>
8585
<!-- Arcade -->
86-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25571.109">
86+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25574.108">
8787
<Uri>https://github.com/dotnet/dotnet</Uri>
88-
<Sha>cc7f6e84d8dae36ad9ea51a5112627b8235982cc</Sha>
88+
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
8989
</Dependency>
90-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="11.0.0-beta.25571.109">
90+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="11.0.0-beta.25574.108">
9191
<Uri>https://github.com/dotnet/dotnet</Uri>
92-
<Sha>cc7f6e84d8dae36ad9ea51a5112627b8235982cc</Sha>
92+
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
9393
</Dependency>
94-
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="11.0.0-beta.25571.109">
94+
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="11.0.0-beta.25574.108">
9595
<Uri>https://github.com/dotnet/dotnet</Uri>
96-
<Sha>cc7f6e84d8dae36ad9ea51a5112627b8235982cc</Sha>
96+
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
9797
</Dependency>
98-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25571.109">
98+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25574.108">
9999
<Uri>https://github.com/dotnet/dotnet</Uri>
100-
<Sha>cc7f6e84d8dae36ad9ea51a5112627b8235982cc</Sha>
100+
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
101101
</Dependency>
102-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="11.0.0-beta.25571.109">
102+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="11.0.0-beta.25574.108">
103103
<Uri>https://github.com/dotnet/dotnet</Uri>
104-
<Sha>cc7f6e84d8dae36ad9ea51a5112627b8235982cc</Sha>
104+
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
105105
</Dependency>
106-
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="11.0.0-beta.25571.109">
106+
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="11.0.0-beta.25574.108">
107107
<Uri>https://github.com/dotnet/dotnet</Uri>
108-
<Sha>cc7f6e84d8dae36ad9ea51a5112627b8235982cc</Sha>
108+
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
109109
</Dependency>
110-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.25571.109">
110+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.25574.108">
111111
<Uri>https://github.com/dotnet/dotnet</Uri>
112-
<Sha>cc7f6e84d8dae36ad9ea51a5112627b8235982cc</Sha>
112+
<Sha>d119b40e8ff3b88f87ad60b04c807233a159b197</Sha>
113113
</Dependency>
114114
</ToolsetDependencies>
115115
</Dependencies>

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

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@ 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)'
16+
# Microbuild installation directory
17+
microBuildOutputFolder: $(Agent.TempDirectory)/MicroBuild
1918
# Microbuild version
2019
microbuildPluginVersion: 'latest'
2120

@@ -30,8 +29,27 @@ steps:
3029
inputs:
3130
packageType: sdk
3231
version: 8.0.x
33-
installationPath: ${{ parameters.microBuildOutputFolder }}/.dotnet
34-
workingDirectory: ${{ parameters.microBuildOutputFolder }}
32+
installationPath: ${{ parameters.microBuildOutputFolder }}/.dotnet-microbuild
33+
condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'))
34+
35+
- script: |
36+
set -euo pipefail
37+
38+
# UseDotNet@2 prepends the dotnet executable path to the PATH variable, so we can call dotnet directly
39+
version=$(dotnet --version)
40+
cat << 'EOF' > ${{ parameters.microBuildOutputFolder }}/global.json
41+
{
42+
"sdk": {
43+
"version": "$version",
44+
"paths": [
45+
"${{ parameters.microBuildOutputFolder }}/.dotnet-microbuild"
46+
],
47+
"errorMessage": "The .NET SDK version $version is required to install the MicroBuild signing plugin."
48+
}
49+
}
50+
EOF
51+
displayName: 'Add global.json to MicroBuild Installation path'
52+
workingDirectory: ${{ parameters.microBuildOutputFolder }}
3553
condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'))
3654
3755
- script: |
@@ -85,6 +103,7 @@ steps:
85103
zipSources: false
86104
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
87105
version: ${{ parameters.microbuildPluginVersion }}
106+
workingDirectory: ${{ parameters.microBuildOutputFolder }}
88107
${{ if eq(parameters.microbuildUseESRP, true) }}:
89108
ConnectedServiceName: 'MicroBuild Signing Task (DevDiv)'
90109
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:

global.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
"runner": "Microsoft.Testing.Platform"
2525
},
2626
"msbuild-sdks": {
27-
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25571.109",
28-
"Microsoft.DotNet.CMake.Sdk": "11.0.0-beta.25571.109",
29-
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25571.109",
27+
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25574.108",
28+
"Microsoft.DotNet.CMake.Sdk": "11.0.0-beta.25574.108",
29+
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25574.108",
3030
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
31-
"Microsoft.NET.Sdk.IL": "10.0.0-rc.3.25571.109"
31+
"Microsoft.NET.Sdk.IL": "10.0.0-rc.3.25574.108"
3232
},
3333
"native-tools": {
3434
"cmake": "latest"

0 commit comments

Comments
 (0)