Skip to content

Commit ae5cd21

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Source code updates from dotnet/dotnet (#14106)
[main] Source code updates from dotnet/dotnet
1 parent b35178b commit ae5cd21

File tree

7 files changed

+80
-94
lines changed

7 files changed

+80
-94
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.25602.105</MicrosoftDotNetArcadeSdkPackageVersion>
10-
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.25602.105</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
11-
<MicrosoftDotNetCMakeSdkPackageVersion>11.0.0-beta.25602.105</MicrosoftDotNetCMakeSdkPackageVersion>
12-
<MicrosoftDotNetGenFacadesPackageVersion>11.0.0-beta.25602.105</MicrosoftDotNetGenFacadesPackageVersion>
13-
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25602.105</MicrosoftDotNetHelixSdkPackageVersion>
14-
<MicrosoftDotNetRemoteExecutorPackageVersion>11.0.0-beta.25602.105</MicrosoftDotNetRemoteExecutorPackageVersion>
15-
<MicrosoftDotNetXUnitV3ExtensionsPackageVersion>11.0.0-beta.25602.105</MicrosoftDotNetXUnitV3ExtensionsPackageVersion>
16-
<MicrosoftNETSdkILPackageVersion>10.0.0-rc.3.25602.105</MicrosoftNETSdkILPackageVersion>
17-
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.3.25602.105</MicrosoftNETCoreAppRefPackageVersion>
18-
<MicrosoftNETCoreILAsmPackageVersion>10.0.0-rc.3.25602.105</MicrosoftNETCoreILAsmPackageVersion>
19-
<MicrosoftNETCoreILDAsmPackageVersion>10.0.0-rc.3.25602.105</MicrosoftNETCoreILDAsmPackageVersion>
20-
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.3.25602.105</MicrosoftNETCorePlatformsPackageVersion>
21-
<MicrosoftWin32SystemEventsPackageVersion>10.0.0-rc.3.25602.105</MicrosoftWin32SystemEventsPackageVersion>
22-
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>10.0.0-rc.3.25602.105</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
23-
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>10.0.0-rc.3.25602.105</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
24-
<SystemCodeDomPackageVersion>10.0.0-rc.3.25602.105</SystemCodeDomPackageVersion>
25-
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-rc.3.25602.105</SystemConfigurationConfigurationManagerPackageVersion>
26-
<SystemFormatsNrbfPackageVersion>10.0.0-rc.3.25602.105</SystemFormatsNrbfPackageVersion>
27-
<SystemIOHashingPackageVersion>10.0.0-rc.3.25602.105</SystemIOHashingPackageVersion>
28-
<SystemReflectionMetadataLoadContextPackageVersion>10.0.0-rc.3.25602.105</SystemReflectionMetadataLoadContextPackageVersion>
29-
<SystemResourcesExtensionsPackageVersion>10.0.0-rc.3.25602.105</SystemResourcesExtensionsPackageVersion>
30-
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-rc.3.25602.105</SystemRuntimeSerializationFormattersPackageVersion>
31-
<SystemTextEncodingsWebPackageVersion>10.0.0-rc.3.25602.105</SystemTextEncodingsWebPackageVersion>
32-
<SystemTextJsonPackageVersion>10.0.0-rc.3.25602.105</SystemTextJsonPackageVersion>
33-
<SystemWindowsExtensionsPackageVersion>10.0.0-rc.3.25602.105</SystemWindowsExtensionsPackageVersion>
9+
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25603.102</MicrosoftDotNetArcadeSdkPackageVersion>
10+
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.25603.102</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
11+
<MicrosoftDotNetCMakeSdkPackageVersion>11.0.0-beta.25603.102</MicrosoftDotNetCMakeSdkPackageVersion>
12+
<MicrosoftDotNetGenFacadesPackageVersion>11.0.0-beta.25603.102</MicrosoftDotNetGenFacadesPackageVersion>
13+
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25603.102</MicrosoftDotNetHelixSdkPackageVersion>
14+
<MicrosoftDotNetRemoteExecutorPackageVersion>11.0.0-beta.25603.102</MicrosoftDotNetRemoteExecutorPackageVersion>
15+
<MicrosoftDotNetXUnitV3ExtensionsPackageVersion>11.0.0-beta.25603.102</MicrosoftDotNetXUnitV3ExtensionsPackageVersion>
16+
<MicrosoftNETSdkILPackageVersion>10.0.0-rc.3.25603.102</MicrosoftNETSdkILPackageVersion>
17+
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.3.25603.102</MicrosoftNETCoreAppRefPackageVersion>
18+
<MicrosoftNETCoreILAsmPackageVersion>10.0.0-rc.3.25603.102</MicrosoftNETCoreILAsmPackageVersion>
19+
<MicrosoftNETCoreILDAsmPackageVersion>10.0.0-rc.3.25603.102</MicrosoftNETCoreILDAsmPackageVersion>
20+
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.3.25603.102</MicrosoftNETCorePlatformsPackageVersion>
21+
<MicrosoftWin32SystemEventsPackageVersion>10.0.0-rc.3.25603.102</MicrosoftWin32SystemEventsPackageVersion>
22+
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>10.0.0-rc.3.25603.102</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
23+
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>10.0.0-rc.3.25603.102</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
24+
<SystemCodeDomPackageVersion>10.0.0-rc.3.25603.102</SystemCodeDomPackageVersion>
25+
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-rc.3.25603.102</SystemConfigurationConfigurationManagerPackageVersion>
26+
<SystemFormatsNrbfPackageVersion>10.0.0-rc.3.25603.102</SystemFormatsNrbfPackageVersion>
27+
<SystemIOHashingPackageVersion>10.0.0-rc.3.25603.102</SystemIOHashingPackageVersion>
28+
<SystemReflectionMetadataLoadContextPackageVersion>10.0.0-rc.3.25603.102</SystemReflectionMetadataLoadContextPackageVersion>
29+
<SystemResourcesExtensionsPackageVersion>10.0.0-rc.3.25603.102</SystemResourcesExtensionsPackageVersion>
30+
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-rc.3.25603.102</SystemRuntimeSerializationFormattersPackageVersion>
31+
<SystemTextEncodingsWebPackageVersion>10.0.0-rc.3.25603.102</SystemTextEncodingsWebPackageVersion>
32+
<SystemTextJsonPackageVersion>10.0.0-rc.3.25603.102</SystemTextJsonPackageVersion>
33+
<SystemWindowsExtensionsPackageVersion>10.0.0-rc.3.25603.102</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="78c39718bb6e8008ba9d2dbd00d550bee6be9f59" BarId="293020" />
9+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="winforms" Sha="29eefe27a350eb8b0bcbababa7863a0d1086295d" BarId="293166" />
1010
<ProductDependencies>
11-
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.3.25602.105">
11+
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.3.25603.102">
1212
<Uri>https://github.com/dotnet/dotnet</Uri>
13-
<Sha>78c39718bb6e8008ba9d2dbd00d550bee6be9f59</Sha>
13+
<Sha>29eefe27a350eb8b0bcbababa7863a0d1086295d</Sha>
1414
</Dependency>
15-
<Dependency Name="System.Resources.Extensions" Version="10.0.0-rc.3.25602.105">
15+
<Dependency Name="System.Resources.Extensions" Version="10.0.0-rc.3.25603.102">
1616
<Uri>https://github.com/dotnet/dotnet</Uri>
17-
<Sha>78c39718bb6e8008ba9d2dbd00d550bee6be9f59</Sha>
17+
<Sha>29eefe27a350eb8b0bcbababa7863a0d1086295d</Sha>
1818
</Dependency>
19-
<Dependency Name="System.Windows.Extensions" Version="10.0.0-rc.3.25602.105">
19+
<Dependency Name="System.Windows.Extensions" Version="10.0.0-rc.3.25603.102">
2020
<Uri>https://github.com/dotnet/dotnet</Uri>
21-
<Sha>78c39718bb6e8008ba9d2dbd00d550bee6be9f59</Sha>
21+
<Sha>29eefe27a350eb8b0bcbababa7863a0d1086295d</Sha>
2222
</Dependency>
23-
<Dependency Name="Microsoft.NET.Sdk.IL" Version="10.0.0-rc.3.25602.105">
23+
<Dependency Name="Microsoft.NET.Sdk.IL" Version="10.0.0-rc.3.25603.102">
2424
<Uri>https://github.com/dotnet/dotnet</Uri>
25-
<Sha>78c39718bb6e8008ba9d2dbd00d550bee6be9f59</Sha>
25+
<Sha>29eefe27a350eb8b0bcbababa7863a0d1086295d</Sha>
2626
</Dependency>
27-
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.0-rc.3.25602.105">
27+
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.0-rc.3.25603.102">
2828
<Uri>https://github.com/dotnet/dotnet</Uri>
29-
<Sha>78c39718bb6e8008ba9d2dbd00d550bee6be9f59</Sha>
29+
<Sha>29eefe27a350eb8b0bcbababa7863a0d1086295d</Sha>
3030
</Dependency>
31-
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="10.0.0-rc.3.25602.105">
31+
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="10.0.0-rc.3.25603.102">
3232
<Uri>https://github.com/dotnet/dotnet</Uri>
33-
<Sha>78c39718bb6e8008ba9d2dbd00d550bee6be9f59</Sha>
33+
<Sha>29eefe27a350eb8b0bcbababa7863a0d1086295d</Sha>
3434
</Dependency>
35-
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="10.0.0-rc.3.25602.105">
35+
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="10.0.0-rc.3.25603.102">
3636
<Uri>https://github.com/dotnet/dotnet</Uri>
37-
<Sha>78c39718bb6e8008ba9d2dbd00d550bee6be9f59</Sha>
37+
<Sha>29eefe27a350eb8b0bcbababa7863a0d1086295d</Sha>
3838
</Dependency>
39-
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-rc.3.25602.105">
39+
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-rc.3.25603.102">
4040
<Uri>https://github.com/dotnet/dotnet</Uri>
41-
<Sha>78c39718bb6e8008ba9d2dbd00d550bee6be9f59</Sha>
41+
<Sha>29eefe27a350eb8b0bcbababa7863a0d1086295d</Sha>
4242
</Dependency>
43-
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="10.0.0-rc.3.25602.105">
43+
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="10.0.0-rc.3.25603.102">
4444
<Uri>https://github.com/dotnet/dotnet</Uri>
45-
<Sha>78c39718bb6e8008ba9d2dbd00d550bee6be9f59</Sha>
45+
<Sha>29eefe27a350eb8b0bcbababa7863a0d1086295d</Sha>
4646
</Dependency>
47-
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-rc.3.25602.105">
47+
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-rc.3.25603.102">
4848
<Uri>https://github.com/dotnet/dotnet</Uri>
49-
<Sha>78c39718bb6e8008ba9d2dbd00d550bee6be9f59</Sha>
49+
<Sha>29eefe27a350eb8b0bcbababa7863a0d1086295d</Sha>
5050
</Dependency>
51-
<Dependency Name="System.Text.Json" Version="10.0.0-rc.3.25602.105">
51+
<Dependency Name="System.Text.Json" Version="10.0.0-rc.3.25603.102">
5252
<Uri>https://github.com/dotnet/dotnet</Uri>
53-
<Sha>78c39718bb6e8008ba9d2dbd00d550bee6be9f59</Sha>
53+
<Sha>29eefe27a350eb8b0bcbababa7863a0d1086295d</Sha>
5454
</Dependency>
55-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.3.25602.105">
55+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.3.25603.102">
5656
<Uri>https://github.com/dotnet/dotnet</Uri>
57-
<Sha>78c39718bb6e8008ba9d2dbd00d550bee6be9f59</Sha>
57+
<Sha>29eefe27a350eb8b0bcbababa7863a0d1086295d</Sha>
5858
</Dependency>
59-
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-rc.3.25602.105">
59+
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-rc.3.25603.102">
6060
<Uri>https://github.com/dotnet/dotnet</Uri>
61-
<Sha>78c39718bb6e8008ba9d2dbd00d550bee6be9f59</Sha>
61+
<Sha>29eefe27a350eb8b0bcbababa7863a0d1086295d</Sha>
6262
</Dependency>
63-
<Dependency Name="Microsoft.Win32.SystemEvents" Version="10.0.0-rc.3.25602.105">
63+
<Dependency Name="Microsoft.Win32.SystemEvents" Version="10.0.0-rc.3.25603.102">
6464
<Uri>https://github.com/dotnet/dotnet</Uri>
65-
<Sha>78c39718bb6e8008ba9d2dbd00d550bee6be9f59</Sha>
65+
<Sha>29eefe27a350eb8b0bcbababa7863a0d1086295d</Sha>
6666
</Dependency>
67-
<Dependency Name="System.CodeDom" Version="10.0.0-rc.3.25602.105">
67+
<Dependency Name="System.CodeDom" Version="10.0.0-rc.3.25603.102">
6868
<Uri>https://github.com/dotnet/dotnet</Uri>
69-
<Sha>78c39718bb6e8008ba9d2dbd00d550bee6be9f59</Sha>
69+
<Sha>29eefe27a350eb8b0bcbababa7863a0d1086295d</Sha>
7070
</Dependency>
71-
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-rc.3.25602.105">
71+
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-rc.3.25603.102">
7272
<Uri>https://github.com/dotnet/dotnet</Uri>
73-
<Sha>78c39718bb6e8008ba9d2dbd00d550bee6be9f59</Sha>
73+
<Sha>29eefe27a350eb8b0bcbababa7863a0d1086295d</Sha>
7474
</Dependency>
75-
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-rc.3.25602.105">
75+
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-rc.3.25603.102">
7676
<Uri>https://github.com/dotnet/dotnet</Uri>
77-
<Sha>78c39718bb6e8008ba9d2dbd00d550bee6be9f59</Sha>
77+
<Sha>29eefe27a350eb8b0bcbababa7863a0d1086295d</Sha>
7878
</Dependency>
79-
<Dependency Name="System.IO.Hashing" Version="10.0.0-rc.3.25602.105">
79+
<Dependency Name="System.IO.Hashing" Version="10.0.0-rc.3.25603.102">
8080
<Uri>https://github.com/dotnet/dotnet</Uri>
81-
<Sha>78c39718bb6e8008ba9d2dbd00d550bee6be9f59</Sha>
81+
<Sha>29eefe27a350eb8b0bcbababa7863a0d1086295d</Sha>
8282
</Dependency>
8383
</ProductDependencies>
8484
<ToolsetDependencies>
8585
<!-- Arcade -->
86-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25602.105">
86+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25603.102">
8787
<Uri>https://github.com/dotnet/dotnet</Uri>
88-
<Sha>78c39718bb6e8008ba9d2dbd00d550bee6be9f59</Sha>
88+
<Sha>29eefe27a350eb8b0bcbababa7863a0d1086295d</Sha>
8989
</Dependency>
90-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="11.0.0-beta.25602.105">
90+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="11.0.0-beta.25603.102">
9191
<Uri>https://github.com/dotnet/dotnet</Uri>
92-
<Sha>78c39718bb6e8008ba9d2dbd00d550bee6be9f59</Sha>
92+
<Sha>29eefe27a350eb8b0bcbababa7863a0d1086295d</Sha>
9393
</Dependency>
94-
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="11.0.0-beta.25602.105">
94+
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="11.0.0-beta.25603.102">
9595
<Uri>https://github.com/dotnet/dotnet</Uri>
96-
<Sha>78c39718bb6e8008ba9d2dbd00d550bee6be9f59</Sha>
96+
<Sha>29eefe27a350eb8b0bcbababa7863a0d1086295d</Sha>
9797
</Dependency>
98-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25602.105">
98+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25603.102">
9999
<Uri>https://github.com/dotnet/dotnet</Uri>
100-
<Sha>78c39718bb6e8008ba9d2dbd00d550bee6be9f59</Sha>
100+
<Sha>29eefe27a350eb8b0bcbababa7863a0d1086295d</Sha>
101101
</Dependency>
102-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="11.0.0-beta.25602.105">
102+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="11.0.0-beta.25603.102">
103103
<Uri>https://github.com/dotnet/dotnet</Uri>
104-
<Sha>78c39718bb6e8008ba9d2dbd00d550bee6be9f59</Sha>
104+
<Sha>29eefe27a350eb8b0bcbababa7863a0d1086295d</Sha>
105105
</Dependency>
106-
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="11.0.0-beta.25602.105">
106+
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="11.0.0-beta.25603.102">
107107
<Uri>https://github.com/dotnet/dotnet</Uri>
108-
<Sha>78c39718bb6e8008ba9d2dbd00d550bee6be9f59</Sha>
108+
<Sha>29eefe27a350eb8b0bcbababa7863a0d1086295d</Sha>
109109
</Dependency>
110-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.25602.105">
110+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.25603.102">
111111
<Uri>https://github.com/dotnet/dotnet</Uri>
112-
<Sha>78c39718bb6e8008ba9d2dbd00d550bee6be9f59</Sha>
112+
<Sha>29eefe27a350eb8b0bcbababa7863a0d1086295d</Sha>
113113
</Dependency>
114114
</ToolsetDependencies>
115115
</Dependencies>

‎eng/common/tools.ps1‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,6 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
157157
return $global:_DotNetInstallDir
158158
}
159159

160-
# Don't resolve runtime, shared framework, or SDK from other locations to ensure build determinism
161-
$env:DOTNET_MULTILEVEL_LOOKUP=0
162-
163160
# Disable first run since we do not need all ASP.NET packages restored.
164161
$env:DOTNET_NOLOGO=1
165162

@@ -225,7 +222,6 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
225222
# Make Sure that our bootstrapped dotnet cli is available in future steps of the Azure Pipelines build
226223
Write-PipelinePrependPath -Path $dotnetRoot
227224

228-
Write-PipelineSetVariable -Name 'DOTNET_MULTILEVEL_LOOKUP' -Value '0'
229225
Write-PipelineSetVariable -Name 'DOTNET_NOLOGO' -Value '1'
230226

231227
return $global:_DotNetInstallDir = $dotnetRoot

‎eng/common/tools.sh‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,6 @@ function InitializeDotNetCli {
115115

116116
local install=$1
117117

118-
# Don't resolve runtime, shared framework, or SDK from other locations to ensure build determinism
119-
export DOTNET_MULTILEVEL_LOOKUP=0
120-
121118
# Disable first run since we want to control all package sources
122119
export DOTNET_NOLOGO=1
123120

@@ -166,7 +163,6 @@ function InitializeDotNetCli {
166163
# build steps from using anything other than what we've downloaded.
167164
Write-PipelinePrependPath -path "$dotnet_root"
168165

169-
Write-PipelineSetVariable -name "DOTNET_MULTILEVEL_LOOKUP" -value "0"
170166
Write-PipelineSetVariable -name "DOTNET_NOLOGO" -value "1"
171167

172168
# return value

‎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.25602.105",
28-
"Microsoft.DotNet.CMake.Sdk": "11.0.0-beta.25602.105",
29-
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25602.105",
27+
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25603.102",
28+
"Microsoft.DotNet.CMake.Sdk": "11.0.0-beta.25603.102",
29+
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25603.102",
3030
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
31-
"Microsoft.NET.Sdk.IL": "10.0.0-rc.3.25602.105"
31+
"Microsoft.NET.Sdk.IL": "10.0.0-rc.3.25603.102"
3232
},
3333
"native-tools": {
3434
"cmake": "latest"

‎start-code.cmd‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ IF ["%vscode%"] == [""] (
1515
SET DOTNET_ROOT=%~dp0.dotnet
1616
SET DOTNET_ROOT(x86)=%~dp0.dotnet\x86
1717

18-
:: This tells .NET Core not to go looking for .NET Core in other places
19-
SET DOTNET_MULTILEVEL_LOOKUP=0
20-
2118
:: Put our local dotnet.exe on PATH first so Visual Studio knows which one to use
2219
SET PATH=%DOTNET_ROOT%;%PATH%
2320

‎start-vs.cmd‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ setlocal enabledelayedexpansion
77
set DOTNET_ROOT=%~dp0.dotnet
88
set DOTNET_ROOT(x86)=%~dp0.dotnet\x86
99

10-
:: This tells .NET Core not to go looking for .NET Core in other places
11-
set DOTNET_MULTILEVEL_LOOKUP=0
12-
1310
:: Put our local dotnet.exe on PATH first so Visual Studio knows which one to use
1411
set PATH=%DOTNET_ROOT%;%PATH%
1512

0 commit comments

Comments
 (0)