Skip to content

Commit cac00aa

Browse files
author
Steve Pfister
committed
Merge remote-tracking branch 'upstream/master' into build-wasm-aot-helix
2 parents 573a5e7 + bf459c1 commit cac00aa

File tree

396 files changed

+2699
-6208
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

396 files changed

+2699
-6208
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
]
1616
},
1717
"microsoft.dotnet.xharness.cli": {
18-
"version": "1.0.0-prerelease.21111.1",
18+
"version": "1.0.0-prerelease.21115.3",
1919
"commands": [
2020
"xharness"
2121
]

‎.gitignore‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,3 @@ src/coreclr/System.Private.CoreLib/common
360360
!src/coreclr/inc/obj/
361361
!src/coreclr/vm/.vscode/
362362
!src/coreclr/vm/.vscode/c_cpp_properties.json
363-
364-
# Mono Wasm-specific excludes
365-
src/mono/wasm/emsdk/
366-
src/mono/wasm/.stamp-wasm-install-and-select*

‎Directory.Build.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
<CoreClrProjectRoot>$([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', 'src', 'coreclr'))</CoreClrProjectRoot>
5656
<MonoProjectRoot>$([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', 'src', 'mono'))</MonoProjectRoot>
5757
<InstallerProjectRoot>$([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', 'src', 'installer'))</InstallerProjectRoot>
58+
<SharedNativeRoot>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'native'))</SharedNativeRoot>
5859
<RepoToolsLocalDir>$([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', 'tools-local'))</RepoToolsLocalDir>
5960
<RepoTasksDir>$([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', 'src', 'tasks'))</RepoTasksDir>
6061
<IbcOptimizationDataDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'ibc'))</IbcOptimizationDataDir>

‎docs/design/features/framework-version-resolution.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Each framework reference consists of these values
1111
* Version - for example `3.0.1`
1212
* Roll-forward setting - for example `Minor`
1313

14-
*In the code the framework reference is represented by an instance of [`fx_reference_t`](https://github.com/dotnet/runtime/blob/master/src/installer/corehost/cli/fx_reference.h).*
14+
*In the code the framework reference is represented by an instance of [`fx_reference_t`](https://github.com/dotnet/runtime/blob/master/src/native/corehost/fx_reference.h).*
1515

1616
In the `.runtimeconfig.json` these values are defined like this:
1717
``` json

‎docs/design/features/native-hosting.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -488,8 +488,8 @@ One such scenario is a COM host on multiple threads. The app is not running any
488488
At the same time it gives the native app (`comhost` in this case) the ability to query and modify runtime properties in between the `hostfxr_initialize...` and `hostfxr_get_runtime_delegate` calls on the `first host context`.
489489

490490
### API usage
491-
The `hostfxr` exports are defined in the [hostfxr.h](https://github.com/dotnet/runtime/blob/master/src/installer/corehost/cli/hostfxr.h) header file.
492-
The runtime helper and method signatures for loading managed components are defined in [coreclr_delegates.h](https://github.com/dotnet/runtime/blob/master/src/installer/corehost/cli/coreclr_delegates.h) header file.
491+
The `hostfxr` exports are defined in the [hostfxr.h](https://github.com/dotnet/runtime/blob/master/src/native/corehost/hostfxr.h) header file.
492+
The runtime helper and method signatures for loading managed components are defined in [coreclr_delegates.h](https://github.com/dotnet/runtime/blob/master/src/native/corehost/coreclr_delegates.h) header file.
493493
494494
Currently we don't plan to ship these files, but it's possible to take them from the repo and use it.
495495

‎eng/Subsets.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@
256256

257257
<!-- Host sets -->
258258
<ItemGroup Condition="$(_subset.Contains('+host.native+'))">
259-
<CorehostProjectToBuild Include="$(InstallerProjectRoot)corehost\corehost.proj" SignPhase="Binaries" BuildInParallel="false" />
259+
<CorehostProjectToBuild Include="$(InstallerProjectRoot)corehost.proj" SignPhase="Binaries" BuildInParallel="false" />
260260
<ProjectToBuild Include="@(CorehostProjectToBuild)" Pack="true" Category="host" />
261261
</ItemGroup>
262262

‎eng/Version.Details.xml‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -94,41 +94,41 @@
9494
<Uri>https://github.com/microsoft/vstest</Uri>
9595
<Sha>ca24ad0d8b48021ddbe98e4d688bb7e31c7b7eaf</Sha>
9696
</Dependency>
97-
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="5.0.0-beta.21110.2">
97+
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="5.0.0-beta.21112.1">
9898
<Uri>https://github.com/dotnet/runtime-assets</Uri>
99-
<Sha>97e545a94661bfd9a408cab1c186d5d28fe21932</Sha>
99+
<Sha>4e4ab3fccf3ce276c280d939d5d8271dc3024a89</Sha>
100100
</Dependency>
101-
<Dependency Name="System.Drawing.Common.TestData" Version="5.0.0-beta.21110.2">
101+
<Dependency Name="System.Drawing.Common.TestData" Version="5.0.0-beta.21112.1">
102102
<Uri>https://github.com/dotnet/runtime-assets</Uri>
103-
<Sha>97e545a94661bfd9a408cab1c186d5d28fe21932</Sha>
103+
<Sha>4e4ab3fccf3ce276c280d939d5d8271dc3024a89</Sha>
104104
</Dependency>
105-
<Dependency Name="System.IO.Compression.TestData" Version="5.0.0-beta.21110.2">
105+
<Dependency Name="System.IO.Compression.TestData" Version="5.0.0-beta.21112.1">
106106
<Uri>https://github.com/dotnet/runtime-assets</Uri>
107-
<Sha>97e545a94661bfd9a408cab1c186d5d28fe21932</Sha>
107+
<Sha>4e4ab3fccf3ce276c280d939d5d8271dc3024a89</Sha>
108108
</Dependency>
109-
<Dependency Name="System.IO.Packaging.TestData" Version="5.0.0-beta.21110.2">
109+
<Dependency Name="System.IO.Packaging.TestData" Version="5.0.0-beta.21112.1">
110110
<Uri>https://github.com/dotnet/runtime-assets</Uri>
111-
<Sha>97e545a94661bfd9a408cab1c186d5d28fe21932</Sha>
111+
<Sha>4e4ab3fccf3ce276c280d939d5d8271dc3024a89</Sha>
112112
</Dependency>
113-
<Dependency Name="System.Net.TestData" Version="5.0.0-beta.21110.2">
113+
<Dependency Name="System.Net.TestData" Version="5.0.0-beta.21112.1">
114114
<Uri>https://github.com/dotnet/runtime-assets</Uri>
115-
<Sha>97e545a94661bfd9a408cab1c186d5d28fe21932</Sha>
115+
<Sha>4e4ab3fccf3ce276c280d939d5d8271dc3024a89</Sha>
116116
</Dependency>
117-
<Dependency Name="System.Private.Runtime.UnicodeData" Version="5.0.0-beta.21110.2">
117+
<Dependency Name="System.Private.Runtime.UnicodeData" Version="5.0.0-beta.21112.1">
118118
<Uri>https://github.com/dotnet/runtime-assets</Uri>
119-
<Sha>97e545a94661bfd9a408cab1c186d5d28fe21932</Sha>
119+
<Sha>4e4ab3fccf3ce276c280d939d5d8271dc3024a89</Sha>
120120
</Dependency>
121-
<Dependency Name="System.Runtime.TimeZoneData" Version="5.0.0-beta.21110.2">
121+
<Dependency Name="System.Runtime.TimeZoneData" Version="5.0.0-beta.21112.1">
122122
<Uri>https://github.com/dotnet/runtime-assets</Uri>
123-
<Sha>97e545a94661bfd9a408cab1c186d5d28fe21932</Sha>
123+
<Sha>4e4ab3fccf3ce276c280d939d5d8271dc3024a89</Sha>
124124
</Dependency>
125-
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="5.0.0-beta.21110.2">
125+
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="5.0.0-beta.21112.1">
126126
<Uri>https://github.com/dotnet/runtime-assets</Uri>
127-
<Sha>97e545a94661bfd9a408cab1c186d5d28fe21932</Sha>
127+
<Sha>4e4ab3fccf3ce276c280d939d5d8271dc3024a89</Sha>
128128
</Dependency>
129-
<Dependency Name="System.Windows.Extensions.TestData" Version="5.0.0-beta.21110.2">
129+
<Dependency Name="System.Windows.Extensions.TestData" Version="5.0.0-beta.21112.1">
130130
<Uri>https://github.com/dotnet/runtime-assets</Uri>
131-
<Sha>97e545a94661bfd9a408cab1c186d5d28fe21932</Sha>
131+
<Sha>4e4ab3fccf3ce276c280d939d5d8271dc3024a89</Sha>
132132
</Dependency>
133133
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="9.0.1-alpha.1.21109.2">
134134
<Uri>https://github.com/dotnet/llvm-project</Uri>
@@ -166,45 +166,45 @@
166166
<Uri>https://github.com/dotnet/runtime</Uri>
167167
<Sha>d86d0668bbb1c51695b7b914e60e49aec1fdefbb</Sha>
168168
</Dependency>
169-
<Dependency Name="Microsoft.NETCore.DotNetHost" Version="5.0.0-alpha.1.19618.1">
169+
<Dependency Name="Microsoft.NETCore.DotNetHost" Version="6.0.0-preview.2.21115.2">
170170
<Uri>https://github.com/dotnet/runtime</Uri>
171-
<Sha>d86d0668bbb1c51695b7b914e60e49aec1fdefbb</Sha>
171+
<Sha>2437619a41b22e9326700403c845dde69d2a0f78</Sha>
172172
</Dependency>
173-
<Dependency Name="Microsoft.NETCore.DotNetHostPolicy" Version="5.0.0-alpha.1.19618.1">
173+
<Dependency Name="Microsoft.NETCore.DotNetHostPolicy" Version="6.0.0-preview.2.21115.2">
174174
<Uri>https://github.com/dotnet/runtime</Uri>
175-
<Sha>d86d0668bbb1c51695b7b914e60e49aec1fdefbb</Sha>
175+
<Sha>2437619a41b22e9326700403c845dde69d2a0f78</Sha>
176176
</Dependency>
177-
<Dependency Name="runtime.native.System.IO.Ports" Version="5.0.0-alpha.1.19618.1">
177+
<Dependency Name="runtime.native.System.IO.Ports" Version="6.0.0-preview.2.21115.2">
178178
<Uri>https://github.com/dotnet/runtime</Uri>
179-
<Sha>d86d0668bbb1c51695b7b914e60e49aec1fdefbb</Sha>
179+
<Sha>2437619a41b22e9326700403c845dde69d2a0f78</Sha>
180180
</Dependency>
181-
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.0-preview.2.21108.2">
181+
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.0-preview.2.21115.2">
182182
<Uri>https://github.com/dotnet/runtime</Uri>
183-
<Sha>a66b4e3bf5e3c5ecb2e9fba771f69b177bd3844e</Sha>
183+
<Sha>2437619a41b22e9326700403c845dde69d2a0f78</Sha>
184184
</Dependency>
185-
<Dependency Name="Microsoft.NET.Sdk.IL" Version="6.0.0-preview.2.21108.2">
185+
<Dependency Name="Microsoft.NET.Sdk.IL" Version="6.0.0-preview.2.21115.2">
186186
<Uri>https://github.com/dotnet/runtime</Uri>
187-
<Sha>a66b4e3bf5e3c5ecb2e9fba771f69b177bd3844e</Sha>
187+
<Sha>2437619a41b22e9326700403c845dde69d2a0f78</Sha>
188188
</Dependency>
189-
<Dependency Name="System.Text.Json" Version="5.0.0-alpha.1.19618.1">
189+
<Dependency Name="System.Text.Json" Version="6.0.0-preview.2.21115.2">
190190
<Uri>https://github.com/dotnet/runtime</Uri>
191-
<Sha>d86d0668bbb1c51695b7b914e60e49aec1fdefbb</Sha>
191+
<Sha>2437619a41b22e9326700403c845dde69d2a0f78</Sha>
192192
</Dependency>
193-
<Dependency Name="System.Runtime.CompilerServices.Unsafe" Version="5.0.0-alpha.1.19618.1">
193+
<Dependency Name="System.Runtime.CompilerServices.Unsafe" Version="6.0.0-preview.2.21115.2">
194194
<Uri>https://github.com/dotnet/runtime</Uri>
195-
<Sha>d86d0668bbb1c51695b7b914e60e49aec1fdefbb</Sha>
195+
<Sha>2437619a41b22e9326700403c845dde69d2a0f78</Sha>
196196
</Dependency>
197-
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.0-alpha.1.21112.2">
197+
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.0-alpha.1.21116.1">
198198
<Uri>https://github.com/mono/linker</Uri>
199-
<Sha>ca0a3e6877505e774f135168fe4afc922af99b13</Sha>
199+
<Sha>2cb420dbabb4ec86d41a1b431696e58f45f031cd</Sha>
200200
</Dependency>
201-
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.21111.1">
201+
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.21115.3">
202202
<Uri>https://github.com/dotnet/xharness</Uri>
203-
<Sha>66b9a52dfea930ff2cfb588e5f2636932a1f6868</Sha>
203+
<Sha>ee39b9be541619a00a97d53b4c8339dfd6d06c77</Sha>
204204
</Dependency>
205-
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.21111.1">
205+
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.21115.3">
206206
<Uri>https://github.com/dotnet/xharness</Uri>
207-
<Sha>66b9a52dfea930ff2cfb588e5f2636932a1f6868</Sha>
207+
<Sha>ee39b9be541619a00a97d53b4c8339dfd6d06c77</Sha>
208208
</Dependency>
209209
</ToolsetDependencies>
210210
</Dependencies>

‎eng/Versions.props‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,12 @@
6464
<!-- NuGet dependencies -->
6565
<NuGetBuildTasksPackVersion>5.9.0-preview.2</NuGetBuildTasksPackVersion>
6666
<!-- Installer dependencies -->
67-
<MicrosoftNETCoreAppVersion>5.0.0-alpha.1.19618.1</MicrosoftNETCoreAppVersion>
68-
<MicrosoftNETCoreDotNetHostVersion>5.0.0-alpha.1.19618.1</MicrosoftNETCoreDotNetHostVersion>
69-
<MicrosoftNETCoreDotNetHostPolicyVersion>5.0.0-alpha.1.19618.1</MicrosoftNETCoreDotNetHostPolicyVersion>
67+
<MicrosoftNETCoreAppVersion>6.0.0-alpha.1.20612.4</MicrosoftNETCoreAppVersion>
68+
<MicrosoftNETCoreDotNetHostVersion>6.0.0-preview.2.21115.2</MicrosoftNETCoreDotNetHostVersion>
69+
<MicrosoftNETCoreDotNetHostPolicyVersion>6.0.0-preview.2.21115.2</MicrosoftNETCoreDotNetHostPolicyVersion>
7070
<MicrosoftExtensionsDependencyModelVersion>3.1.0</MicrosoftExtensionsDependencyModelVersion>
7171
<!-- CoreClr dependencies -->
72-
<MicrosoftNETCoreILAsmVersion>6.0.0-preview.2.21108.2</MicrosoftNETCoreILAsmVersion>
72+
<MicrosoftNETCoreILAsmVersion>6.0.0-preview.2.21115.2</MicrosoftNETCoreILAsmVersion>
7373
<!-- Libraries dependencies -->
7474
<StyleCopAnalyzersVersion>1.2.0-beta.304</StyleCopAnalyzersVersion>
7575
<SystemBuffersVersion>4.5.1</SystemBuffersVersion>
@@ -97,24 +97,24 @@
9797
<SystemSecurityCryptographyCngVersion>4.7.0</SystemSecurityCryptographyCngVersion>
9898
<SystemSecurityCryptographyPkcsVersion>4.7.0</SystemSecurityCryptographyPkcsVersion>
9999
<SystemSecurityCryptographyOpenSslVersion>4.7.0</SystemSecurityCryptographyOpenSslVersion>
100-
<SystemTextJsonVersion>5.0.0-alpha.1.19618.1</SystemTextJsonVersion>
101-
<SystemRuntimeCompilerServicesUnsafeVersion>5.0.0-alpha.1.19618.1</SystemRuntimeCompilerServicesUnsafeVersion>
100+
<SystemTextJsonVersion>6.0.0-preview.2.21115.2</SystemTextJsonVersion>
101+
<SystemRuntimeCompilerServicesUnsafeVersion>6.0.0-preview.2.21115.2</SystemRuntimeCompilerServicesUnsafeVersion>
102102
<SystemThreadingVersion>4.3.0</SystemThreadingVersion>
103103
<SystemThreadingTasksExtensionsVersion>4.5.4</SystemThreadingTasksExtensionsVersion>
104104
<SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
105105
<MicrosoftBclAsyncInterfacesVersion>1.1.1</MicrosoftBclAsyncInterfacesVersion>
106106
<MicrosoftWin32PrimitivesVersion>4.3.0</MicrosoftWin32PrimitivesVersion>
107-
<runtimenativeSystemIOPortsVersion>5.0.0-alpha.1.19618.1</runtimenativeSystemIOPortsVersion>
107+
<runtimenativeSystemIOPortsVersion>6.0.0-preview.2.21115.2</runtimenativeSystemIOPortsVersion>
108108
<!-- Runtime-Assets dependencies -->
109-
<SystemComponentModelTypeConverterTestDataVersion>5.0.0-beta.21110.2</SystemComponentModelTypeConverterTestDataVersion>
110-
<SystemDrawingCommonTestDataVersion>5.0.0-beta.21110.2</SystemDrawingCommonTestDataVersion>
111-
<SystemIOCompressionTestDataVersion>5.0.0-beta.21110.2</SystemIOCompressionTestDataVersion>
112-
<SystemIOPackagingTestDataVersion>5.0.0-beta.21110.2</SystemIOPackagingTestDataVersion>
113-
<SystemNetTestDataVersion>5.0.0-beta.21110.2</SystemNetTestDataVersion>
114-
<SystemPrivateRuntimeUnicodeDataVersion>5.0.0-beta.21110.2</SystemPrivateRuntimeUnicodeDataVersion>
115-
<SystemRuntimeTimeZoneDataVersion>5.0.0-beta.21110.2</SystemRuntimeTimeZoneDataVersion>
116-
<SystemSecurityCryptographyX509CertificatesTestDataVersion>5.0.0-beta.21110.2</SystemSecurityCryptographyX509CertificatesTestDataVersion>
117-
<SystemWindowsExtensionsTestDataVersion>5.0.0-beta.21110.2</SystemWindowsExtensionsTestDataVersion>
109+
<SystemComponentModelTypeConverterTestDataVersion>5.0.0-beta.21112.1</SystemComponentModelTypeConverterTestDataVersion>
110+
<SystemDrawingCommonTestDataVersion>5.0.0-beta.21112.1</SystemDrawingCommonTestDataVersion>
111+
<SystemIOCompressionTestDataVersion>5.0.0-beta.21112.1</SystemIOCompressionTestDataVersion>
112+
<SystemIOPackagingTestDataVersion>5.0.0-beta.21112.1</SystemIOPackagingTestDataVersion>
113+
<SystemNetTestDataVersion>5.0.0-beta.21112.1</SystemNetTestDataVersion>
114+
<SystemPrivateRuntimeUnicodeDataVersion>5.0.0-beta.21112.1</SystemPrivateRuntimeUnicodeDataVersion>
115+
<SystemRuntimeTimeZoneDataVersion>5.0.0-beta.21112.1</SystemRuntimeTimeZoneDataVersion>
116+
<SystemSecurityCryptographyX509CertificatesTestDataVersion>5.0.0-beta.21112.1</SystemSecurityCryptographyX509CertificatesTestDataVersion>
117+
<SystemWindowsExtensionsTestDataVersion>5.0.0-beta.21112.1</SystemWindowsExtensionsTestDataVersion>
118118
<!-- dotnet-optimization dependencies -->
119119
<optimizationwindows_ntx64IBCCoreFxVersion>99.99.99-master-20200806.6</optimizationwindows_ntx64IBCCoreFxVersion>
120120
<optimizationlinuxx64IBCCoreFxVersion>99.99.99-master-20200806.6</optimizationlinuxx64IBCCoreFxVersion>
@@ -143,8 +143,8 @@
143143
<!-- Testing -->
144144
<MicrosoftNETCoreCoreDisToolsVersion>1.0.1-prerelease-00006</MicrosoftNETCoreCoreDisToolsVersion>
145145
<MicrosoftNETTestSdkVersion>16.9.0-preview-20201201-01</MicrosoftNETTestSdkVersion>
146-
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.21111.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
147-
<MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.21111.1</MicrosoftDotNetXHarnessCLIVersion>
146+
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.21115.3</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
147+
<MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.21115.3</MicrosoftDotNetXHarnessCLIVersion>
148148
<XUnitVersion>2.4.1</XUnitVersion>
149149
<XUnitRunnerVisualStudioVersion>2.4.2</XUnitRunnerVisualStudioVersion>
150150
<CoverletCollectorVersion>1.3.0</CoverletCollectorVersion>
@@ -155,7 +155,7 @@
155155
<!-- Docs -->
156156
<MicrosoftPrivateIntellisenseVersion>5.0.0-preview-20201009.2</MicrosoftPrivateIntellisenseVersion>
157157
<!-- ILLink -->
158-
<MicrosoftNETILLinkTasksVersion>6.0.0-alpha.1.21112.2</MicrosoftNETILLinkTasksVersion>
158+
<MicrosoftNETILLinkTasksVersion>6.0.0-alpha.1.21116.1</MicrosoftNETILLinkTasksVersion>
159159
<!-- ICU -->
160160
<MicrosoftNETCoreRuntimeICUTransportVersion>6.0.0-preview.2.21108.1</MicrosoftNETCoreRuntimeICUTransportVersion>
161161
<!-- Mono LLVM -->

‎eng/pipelines/common/platform-matrix.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ jobs:
193193
targetRid: browser-wasm
194194
platform: Browser_wasm
195195
container:
196-
image: ubuntu-18.04-webassembly-20201218203401-96da775
196+
image: ubuntu-18.04-webassembly-20210111135621-8ac9b02
197197
registry: mcr
198198
jobParameters:
199199
runtimeFlavor: ${{ parameters.runtimeFlavor }}

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21112.2",
1818
"Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21105.12",
1919
"Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
20-
"Microsoft.NET.Sdk.IL": "6.0.0-preview.2.21108.2",
20+
"Microsoft.NET.Sdk.IL": "6.0.0-preview.2.21115.2",
2121
"Microsoft.Build.NoTargets": "2.0.17",
2222
"Microsoft.Build.Traversal": "2.1.1"
2323
}

0 commit comments

Comments
 (0)