Skip to content

Commit 75ae939

Browse files
directhexdirecthex
committed
Merge remote-tracking branch 'origin/main' into cmake-toolchain-support-is-moderately-cursed
2 parents baca797 + 74f5ca5 commit 75ae939

File tree

111 files changed

+1566
-4886
lines changed

Some content is hidden

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

111 files changed

+1566
-4886
lines changed

Diff for: ‎.devcontainer/Dockerfile

+9
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,12 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
1010
build-essential python curl git lldb-6.0 liblldb-6.0-dev \
1111
libunwind8 libunwind8-dev gettext libicu-dev liblttng-ust-dev \
1212
libssl-dev libnuma-dev libkrb5-dev zlib1g-dev ninja-build
13+
14+
# Install V8 Engine
15+
SHELL ["/bin/bash", "-c"]
16+
17+
RUN curl -sSL "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/linux/chromium-v8/v8-linux64-rel-8.5.183.zip" -o ./v8.zip \
18+
&& unzip ./v8.zip -d /usr/local/v8 \
19+
&& echo $'#!/usr/bin/env bash\n\
20+
"/usr/local/v8/d8" --snapshot_blob="/usr/local/v8/snapshot_blob.bin" "$@"\n' > /usr/local/bin/v8 \
21+
&& chmod +x /usr/local/bin/v8

Diff for: ‎.devcontainer/scripts/onCreateCommand.sh

+5
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,10 @@ set -e
77
# restore libs tests so that the project is ready to be loaded by OmniSharp
88
./build.sh libs.tests -restore
99

10+
# prebuild for WASM, so it is ready for wasm development
11+
make -C src/mono/wasm provision-wasm
12+
export EMSDK_PATH=$PWD/src/mono/wasm/emsdk
13+
./build.sh mono+libs -os Browser -c release
14+
1015
# save the commit hash of the currently built assemblies, so developers know which version was built
1116
git rev-parse HEAD > ./artifacts/prebuild.sha

Diff for: ‎Directory.Build.props

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
<_hostArch>$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant)</_hostArch>
3030
<BuildArchitecture Condition="'$(BuildArchitecture)' == ''">$(_hostArch)</BuildArchitecture>
3131
<TargetArchitecture Condition="'$(TargetArchitecture)' == '' and '$(_hostArch)' == 'arm'">arm</TargetArchitecture>
32+
<TargetArchitecture Condition="'$(TargetArchitecture)' == '' and '$(_hostArch)' == 'armv6'">armv6</TargetArchitecture>
3233
<TargetArchitecture Condition="'$(TargetArchitecture)' == '' and '$(_hostArch)' == 'armel'">armel</TargetArchitecture>
3334
<TargetArchitecture Condition="'$(TargetArchitecture)' == '' and '$(_hostArch)' == 'arm64'">arm64</TargetArchitecture>
3435
<TargetArchitecture Condition="'$(TargetArchitecture)' == '' and '$(_hostArch)' == 'loongarch64'">loongarch64</TargetArchitecture>

Diff for: ‎NuGet.config

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
1616
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
1717
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
18+
<!-- TODO: Remove dotnet7 feeds when dependencies publish into dotnet8 feeds: https://github.com/dotnet/runtime/issues/63375. -->
1819
<add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />
1920
<add key="dotnet7-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7-transport/nuget/v3/index.json" />
2021
<!-- TODO: Remove dotnet6 feeds when dependencies publish into dotnet7 feeds: https://github.com/dotnet/runtime/issues/57716. -->

Diff for: ‎docs/coding-guidelines/libraries-packaging.md

+7
Original file line numberDiff line numberDiff line change
@@ -86,5 +86,12 @@ In the analyzer project make sure to do the following. Ensure it only targets `n
8686
</PropertyGroup>
8787
```
8888

89+
In order to mitigate design-time/build-time performance issues with source generators, we generate build logic to allow the end user to disable the source generator from the package. By default, the MSBuild property an end user can set is named `Disable{PackageId}SourceGenerator`. If a package needs a custom property name, this can be overriden by setting the following property in the project that produces the package
90+
```xml
91+
<PropertyGroup>
92+
<DisableSourceGeneratorPropertyName>CustomPropertyName</DisableSourceGeneratorPropertyName>
93+
</PropertyGroup>
94+
```
95+
8996
### .NETFramework RID specific assets
9097
When targeting .NETFramework, RID specific assets are automatically added to the package if the project contains other compatible RID specific assets, mainly `netstandard2.0-windows`.

Diff for: ‎docs/workflow/debugging/libraries/debugging-corelib.md

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
Debugging System.Private.CoreLib
2+
==========================
3+
4+
`System.Console.Write`/`System.Console.WriteLine` cannot be used in `System.Private.CoreLib`. Instead, use `Internal.Console.Write` to add temporary logging for printf-style debugging.
5+
6+
### Android
7+
The logs can be found through the generated Android Debug Bridge log or viewed directly through ADB logcat.

Diff for: ‎eng/Subsets.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
flavor is used to decide when to build the hosts and installers. -->
2828
<PropertyGroup>
2929
<PrimaryRuntimeFlavor>CoreCLR</PrimaryRuntimeFlavor>
30-
<PrimaryRuntimeFlavor Condition="'$(TargetArchitecture)' == 's390x'">Mono</PrimaryRuntimeFlavor>
30+
<PrimaryRuntimeFlavor Condition="'$(TargetArchitecture)' == 's390x' or '$(TargetArchitecture)' == 'armv6'">Mono</PrimaryRuntimeFlavor>
3131
</PropertyGroup>
3232

3333
<PropertyGroup>

Diff for: ‎eng/Version.Details.xml

+32-32
Original file line numberDiff line numberDiff line change
@@ -16,37 +16,37 @@
1616
<Uri>https://github.com/dotnet/wcf</Uri>
1717
<Sha>7f504aabb1988e9a093c1e74d8040bd52feb2f01</Sha>
1818
</Dependency>
19-
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.ObjWriter" Version="1.0.0-alpha.1.22070.1">
19+
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.ObjWriter" Version="1.0.0-alpha.1.22073.1">
2020
<Uri>https://github.com/dotnet/llvm-project</Uri>
21-
<Sha>fe77708023f3d8a51c1548b86487a692897227ec</Sha>
21+
<Sha>afc9070f64d110ce2bf029a4a624b9dd1c6dbffd</Sha>
2222
</Dependency>
23-
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter" Version="1.0.0-alpha.1.22070.1">
23+
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter" Version="1.0.0-alpha.1.22073.1">
2424
<Uri>https://github.com/dotnet/llvm-project</Uri>
25-
<Sha>fe77708023f3d8a51c1548b86487a692897227ec</Sha>
25+
<Sha>afc9070f64d110ce2bf029a4a624b9dd1c6dbffd</Sha>
2626
</Dependency>
27-
<Dependency Name="runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.ObjWriter" Version="1.0.0-alpha.1.22070.1">
27+
<Dependency Name="runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.ObjWriter" Version="1.0.0-alpha.1.22073.1">
2828
<Uri>https://github.com/dotnet/llvm-project</Uri>
29-
<Sha>fe77708023f3d8a51c1548b86487a692897227ec</Sha>
29+
<Sha>afc9070f64d110ce2bf029a4a624b9dd1c6dbffd</Sha>
3030
</Dependency>
31-
<Dependency Name="runtime.linux-musl-x64.Microsoft.NETCore.Runtime.ObjWriter" Version="1.0.0-alpha.1.22070.1">
31+
<Dependency Name="runtime.linux-musl-x64.Microsoft.NETCore.Runtime.ObjWriter" Version="1.0.0-alpha.1.22073.1">
3232
<Uri>https://github.com/dotnet/llvm-project</Uri>
33-
<Sha>fe77708023f3d8a51c1548b86487a692897227ec</Sha>
33+
<Sha>afc9070f64d110ce2bf029a4a624b9dd1c6dbffd</Sha>
3434
</Dependency>
35-
<Dependency Name="runtime.win-arm64.Microsoft.NETCore.Runtime.ObjWriter" Version="1.0.0-alpha.1.22070.1">
35+
<Dependency Name="runtime.win-arm64.Microsoft.NETCore.Runtime.ObjWriter" Version="1.0.0-alpha.1.22073.1">
3636
<Uri>https://github.com/dotnet/llvm-project</Uri>
37-
<Sha>fe77708023f3d8a51c1548b86487a692897227ec</Sha>
37+
<Sha>afc9070f64d110ce2bf029a4a624b9dd1c6dbffd</Sha>
3838
</Dependency>
39-
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.ObjWriter" Version="1.0.0-alpha.1.22070.1">
39+
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.ObjWriter" Version="1.0.0-alpha.1.22073.1">
4040
<Uri>https://github.com/dotnet/llvm-project</Uri>
41-
<Sha>fe77708023f3d8a51c1548b86487a692897227ec</Sha>
41+
<Sha>afc9070f64d110ce2bf029a4a624b9dd1c6dbffd</Sha>
4242
</Dependency>
43-
<Dependency Name="runtime.osx.11.0-arm64.Microsoft.NETCore.Runtime.ObjWriter" Version="1.0.0-alpha.1.22070.1">
43+
<Dependency Name="runtime.osx.11.0-arm64.Microsoft.NETCore.Runtime.ObjWriter" Version="1.0.0-alpha.1.22073.1">
4444
<Uri>https://github.com/dotnet/llvm-project</Uri>
45-
<Sha>fe77708023f3d8a51c1548b86487a692897227ec</Sha>
45+
<Sha>afc9070f64d110ce2bf029a4a624b9dd1c6dbffd</Sha>
4646
</Dependency>
47-
<Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.ObjWriter" Version="1.0.0-alpha.1.22070.1">
47+
<Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.ObjWriter" Version="1.0.0-alpha.1.22073.1">
4848
<Uri>https://github.com/dotnet/llvm-project</Uri>
49-
<Sha>fe77708023f3d8a51c1548b86487a692897227ec</Sha>
49+
<Sha>afc9070f64d110ce2bf029a4a624b9dd1c6dbffd</Sha>
5050
</Dependency>
5151
</ProductDependencies>
5252
<ToolsetDependencies>
@@ -202,37 +202,37 @@
202202
<Uri>https://github.com/dotnet/llvm-project</Uri>
203203
<Sha>79a6d232058e2c2f1d9e833355b72f07fe342a3b</Sha>
204204
</Dependency>
205-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0-alpha.1.22066.4">
205+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0-alpha.1.22073.5">
206206
<Uri>https://github.com/dotnet/runtime</Uri>
207-
<Sha>ae2f60c950cc021921fce83c796cbcb5ff96c658</Sha>
207+
<Sha>09ff1acdad2e7789908b5db9bb89896144c13042</Sha>
208208
</Dependency>
209-
<Dependency Name="Microsoft.NETCore.DotNetHost" Version="7.0.0-alpha.1.22066.4">
209+
<Dependency Name="Microsoft.NETCore.DotNetHost" Version="7.0.0-alpha.1.22073.5">
210210
<Uri>https://github.com/dotnet/runtime</Uri>
211-
<Sha>ae2f60c950cc021921fce83c796cbcb5ff96c658</Sha>
211+
<Sha>09ff1acdad2e7789908b5db9bb89896144c13042</Sha>
212212
</Dependency>
213-
<Dependency Name="Microsoft.NETCore.DotNetHostPolicy" Version="7.0.0-alpha.1.22066.4">
213+
<Dependency Name="Microsoft.NETCore.DotNetHostPolicy" Version="7.0.0-alpha.1.22073.5">
214214
<Uri>https://github.com/dotnet/runtime</Uri>
215-
<Sha>ae2f60c950cc021921fce83c796cbcb5ff96c658</Sha>
215+
<Sha>09ff1acdad2e7789908b5db9bb89896144c13042</Sha>
216216
</Dependency>
217-
<Dependency Name="runtime.native.System.IO.Ports" Version="7.0.0-alpha.1.22066.4">
217+
<Dependency Name="runtime.native.System.IO.Ports" Version="7.0.0-alpha.1.22073.5">
218218
<Uri>https://github.com/dotnet/runtime</Uri>
219-
<Sha>ae2f60c950cc021921fce83c796cbcb5ff96c658</Sha>
219+
<Sha>09ff1acdad2e7789908b5db9bb89896144c13042</Sha>
220220
</Dependency>
221-
<Dependency Name="Microsoft.NETCore.ILAsm" Version="7.0.0-alpha.1.22066.4">
221+
<Dependency Name="Microsoft.NETCore.ILAsm" Version="7.0.0-alpha.1.22073.5">
222222
<Uri>https://github.com/dotnet/runtime</Uri>
223-
<Sha>ae2f60c950cc021921fce83c796cbcb5ff96c658</Sha>
223+
<Sha>09ff1acdad2e7789908b5db9bb89896144c13042</Sha>
224224
</Dependency>
225-
<Dependency Name="Microsoft.NET.Sdk.IL" Version="7.0.0-alpha.1.22066.4">
225+
<Dependency Name="Microsoft.NET.Sdk.IL" Version="7.0.0-alpha.1.22073.5">
226226
<Uri>https://github.com/dotnet/runtime</Uri>
227-
<Sha>ae2f60c950cc021921fce83c796cbcb5ff96c658</Sha>
227+
<Sha>09ff1acdad2e7789908b5db9bb89896144c13042</Sha>
228228
</Dependency>
229-
<Dependency Name="System.Text.Json" Version="7.0.0-alpha.1.22066.4">
229+
<Dependency Name="System.Text.Json" Version="7.0.0-alpha.1.22073.5">
230230
<Uri>https://github.com/dotnet/runtime</Uri>
231-
<Sha>ae2f60c950cc021921fce83c796cbcb5ff96c658</Sha>
231+
<Sha>09ff1acdad2e7789908b5db9bb89896144c13042</Sha>
232232
</Dependency>
233-
<Dependency Name="System.Runtime.CompilerServices.Unsafe" Version="7.0.0-alpha.1.22066.4">
233+
<Dependency Name="System.Runtime.CompilerServices.Unsafe" Version="7.0.0-alpha.1.22073.5">
234234
<Uri>https://github.com/dotnet/runtime</Uri>
235-
<Sha>ae2f60c950cc021921fce83c796cbcb5ff96c658</Sha>
235+
<Sha>09ff1acdad2e7789908b5db9bb89896144c13042</Sha>
236236
</Dependency>
237237
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22063.2">
238238
<Uri>https://github.com/dotnet/linker</Uri>

Diff for: ‎eng/Versions.props

+19-19
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<MinorVersion>0</MinorVersion>
88
<PatchVersion>0</PatchVersion>
99
<SdkBandVersion>7.0.100</SdkBandVersion>
10-
<PreReleaseVersionLabel>alpha</PreReleaseVersionLabel>
11-
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
10+
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
11+
<PreReleaseVersionIteration>2</PreReleaseVersionIteration>
1212
<!-- Set assembly version to align with major and minor version,
1313
as for the patches and revisions should be manually updated per assembly if it is serviced. -->
1414
<AssemblyVersion>$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>
@@ -72,20 +72,20 @@
7272
<!-- NuGet dependencies -->
7373
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
7474
<!-- Installer dependencies -->
75-
<MicrosoftNETCoreAppRuntimewinx64Version>7.0.0-alpha.1.22066.4</MicrosoftNETCoreAppRuntimewinx64Version>
76-
<MicrosoftNETCoreDotNetHostVersion>7.0.0-alpha.1.22066.4</MicrosoftNETCoreDotNetHostVersion>
77-
<MicrosoftNETCoreDotNetHostPolicyVersion>7.0.0-alpha.1.22066.4</MicrosoftNETCoreDotNetHostPolicyVersion>
75+
<MicrosoftNETCoreAppRuntimewinx64Version>7.0.0-alpha.1.22073.5</MicrosoftNETCoreAppRuntimewinx64Version>
76+
<MicrosoftNETCoreDotNetHostVersion>7.0.0-alpha.1.22073.5</MicrosoftNETCoreDotNetHostVersion>
77+
<MicrosoftNETCoreDotNetHostPolicyVersion>7.0.0-alpha.1.22073.5</MicrosoftNETCoreDotNetHostPolicyVersion>
7878
<MicrosoftExtensionsDependencyModelVersion>3.1.0</MicrosoftExtensionsDependencyModelVersion>
7979
<!-- CoreClr dependencies -->
80-
<MicrosoftNETCoreILAsmVersion>7.0.0-alpha.1.22066.4</MicrosoftNETCoreILAsmVersion>
81-
<runtimelinuxarm64MicrosoftNETCoreRuntimeObjWriterVersion>1.0.0-alpha.1.22070.1</runtimelinuxarm64MicrosoftNETCoreRuntimeObjWriterVersion>
82-
<runtimelinuxx64MicrosoftNETCoreRuntimeObjWriterVersion>1.0.0-alpha.1.22070.1</runtimelinuxx64MicrosoftNETCoreRuntimeObjWriterVersion>
83-
<runtimelinuxmuslarm64MicrosoftNETCoreRuntimeObjWriterVersion>1.0.0-alpha.1.22070.1</runtimelinuxmuslarm64MicrosoftNETCoreRuntimeObjWriterVersion>
84-
<runtimelinuxmuslx64MicrosoftNETCoreRuntimeObjWriterVersion>1.0.0-alpha.1.22070.1</runtimelinuxmuslx64MicrosoftNETCoreRuntimeObjWriterVersion>
85-
<runtimewinarm64MicrosoftNETCoreRuntimeObjWriterVersion>1.0.0-alpha.1.22070.1</runtimewinarm64MicrosoftNETCoreRuntimeObjWriterVersion>
86-
<runtimewinx64MicrosoftNETCoreRuntimeObjWriterVersion>1.0.0-alpha.1.22070.1</runtimewinx64MicrosoftNETCoreRuntimeObjWriterVersion>
87-
<runtimeosx110arm64MicrosoftNETCoreRuntimeObjWriterVersion>1.0.0-alpha.1.22070.1</runtimeosx110arm64MicrosoftNETCoreRuntimeObjWriterVersion>
88-
<runtimeosx1012x64MicrosoftNETCoreRuntimeObjWriterVersion>1.0.0-alpha.1.22070.1</runtimeosx1012x64MicrosoftNETCoreRuntimeObjWriterVersion>
80+
<MicrosoftNETCoreILAsmVersion>7.0.0-alpha.1.22073.5</MicrosoftNETCoreILAsmVersion>
81+
<runtimelinuxarm64MicrosoftNETCoreRuntimeObjWriterVersion>1.0.0-alpha.1.22073.1</runtimelinuxarm64MicrosoftNETCoreRuntimeObjWriterVersion>
82+
<runtimelinuxx64MicrosoftNETCoreRuntimeObjWriterVersion>1.0.0-alpha.1.22073.1</runtimelinuxx64MicrosoftNETCoreRuntimeObjWriterVersion>
83+
<runtimelinuxmuslarm64MicrosoftNETCoreRuntimeObjWriterVersion>1.0.0-alpha.1.22073.1</runtimelinuxmuslarm64MicrosoftNETCoreRuntimeObjWriterVersion>
84+
<runtimelinuxmuslx64MicrosoftNETCoreRuntimeObjWriterVersion>1.0.0-alpha.1.22073.1</runtimelinuxmuslx64MicrosoftNETCoreRuntimeObjWriterVersion>
85+
<runtimewinarm64MicrosoftNETCoreRuntimeObjWriterVersion>1.0.0-alpha.1.22073.1</runtimewinarm64MicrosoftNETCoreRuntimeObjWriterVersion>
86+
<runtimewinx64MicrosoftNETCoreRuntimeObjWriterVersion>1.0.0-alpha.1.22073.1</runtimewinx64MicrosoftNETCoreRuntimeObjWriterVersion>
87+
<runtimeosx110arm64MicrosoftNETCoreRuntimeObjWriterVersion>1.0.0-alpha.1.22073.1</runtimeosx110arm64MicrosoftNETCoreRuntimeObjWriterVersion>
88+
<runtimeosx1012x64MicrosoftNETCoreRuntimeObjWriterVersion>1.0.0-alpha.1.22073.1</runtimeosx1012x64MicrosoftNETCoreRuntimeObjWriterVersion>
8989
<!-- Libraries dependencies -->
9090
<MicrosoftBclAsyncInterfacesVersion>5.0.0</MicrosoftBclAsyncInterfacesVersion>
9191
<MicrosoftWin32PrimitivesVersion>4.3.0</MicrosoftWin32PrimitivesVersion>
@@ -114,17 +114,17 @@
114114
<SystemRuntimeInteropServicesVersion>4.3.0</SystemRuntimeInteropServicesVersion>
115115
<SystemRuntimeInteropServicesRuntimeInformationVersion>4.3.0</SystemRuntimeInteropServicesRuntimeInformationVersion>
116116
<SystemRuntimeSerializationPrimitivesVersion>4.3.0</SystemRuntimeSerializationPrimitivesVersion>
117-
<SystemSecurityAccessControlVersion>6.0.0-rc.2.21454.1</SystemSecurityAccessControlVersion>
117+
<SystemSecurityAccessControlVersion>6.0.0</SystemSecurityAccessControlVersion>
118118
<SystemSecurityCryptographyAlgorithmsVersion>4.3.1</SystemSecurityCryptographyAlgorithmsVersion>
119119
<SystemSecurityCryptographyCngVersion>5.0.0</SystemSecurityCryptographyCngVersion>
120120
<SystemSecurityCryptographyOpenSslVersion>5.0.0</SystemSecurityCryptographyOpenSslVersion>
121121
<SystemSecurityPrincipalWindowsVersion>5.0.0</SystemSecurityPrincipalWindowsVersion>
122122
<SystemServiceModelPrimitivesVersion>4.9.0-rc2.21473.1</SystemServiceModelPrimitivesVersion>
123-
<SystemTextJsonVersion>7.0.0-alpha.1.22066.4</SystemTextJsonVersion>
124-
<SystemRuntimeCompilerServicesUnsafeVersion>7.0.0-alpha.1.22066.4</SystemRuntimeCompilerServicesUnsafeVersion>
123+
<SystemTextJsonVersion>7.0.0-alpha.1.22073.5</SystemTextJsonVersion>
124+
<SystemRuntimeCompilerServicesUnsafeVersion>7.0.0-alpha.1.22073.5</SystemRuntimeCompilerServicesUnsafeVersion>
125125
<SystemThreadingTasksExtensionsVersion>4.5.4</SystemThreadingTasksExtensionsVersion>
126126
<SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
127-
<runtimenativeSystemIOPortsVersion>7.0.0-alpha.1.22066.4</runtimenativeSystemIOPortsVersion>
127+
<runtimenativeSystemIOPortsVersion>7.0.0-alpha.1.22073.5</runtimenativeSystemIOPortsVersion>
128128
<!-- Runtime-Assets dependencies -->
129129
<SystemRuntimeNumericsTestDataVersion>7.0.0-beta.22060.1</SystemRuntimeNumericsTestDataVersion>
130130
<SystemComponentModelTypeConverterTestDataVersion>7.0.0-beta.22060.1</SystemComponentModelTypeConverterTestDataVersion>
@@ -175,7 +175,7 @@
175175
<SdkVersionForWorkloadTesting>7.0.100-alpha.1.21528.1</SdkVersionForWorkloadTesting>
176176
<CompilerPlatformTestingVersion>1.1.1-beta1.21467.5</CompilerPlatformTestingVersion>
177177
<!-- Docs -->
178-
<MicrosoftPrivateIntellisenseVersion>6.0.0-preview-20211019.1</MicrosoftPrivateIntellisenseVersion>
178+
<MicrosoftPrivateIntellisenseVersion>6.0.0-preview-20220104.1</MicrosoftPrivateIntellisenseVersion>
179179
<!-- ILLink -->
180180
<MicrosoftNETILLinkTasksVersion>7.0.100-1.22063.2</MicrosoftNETILLinkTasksVersion>
181181
<MicrosoftNETILLinkAnalyzerPackageVersion>$(MicrosoftNETILLinkTasksVersion)</MicrosoftNETILLinkAnalyzerPackageVersion>

Diff for: ‎eng/build.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
1717
usage()
1818
{
1919
echo "Common settings:"
20-
echo " --arch (-a) Target platform: x86, x64, arm, armel, arm64, loongarch64, s390x or wasm."
20+
echo " --arch (-a) Target platform: x86, x64, arm, armv6, armel, arm64, loongarch64, s390x or wasm."
2121
echo " [Default: Your machine's architecture.]"
2222
echo " --binaryLog (-bl) Output binary log."
2323
echo " --cross Optional argument to signify cross compilation."
@@ -206,12 +206,12 @@ while [[ $# > 0 ]]; do
206206
fi
207207
passedArch="$(echo "$2" | tr "[:upper:]" "[:lower:]")"
208208
case "$passedArch" in
209-
x64|x86|arm|armel|arm64|loongarch64|s390x|wasm)
209+
x64|x86|arm|armv6|armel|arm64|loongarch64|s390x|wasm)
210210
arch=$passedArch
211211
;;
212212
*)
213213
echo "Unsupported target architecture '$2'."
214-
echo "The allowed values are x86, x64, arm, armel, arm64, loongarch64, s390x, and wasm."
214+
echo "The allowed values are x86, x64, arm, armv6, armel, arm64, loongarch64, s390x, and wasm."
215215
exit 1
216216
;;
217217
esac

Diff for: ‎eng/common/cross/arm/tizen-build-rootfs.sh

100644100755
File mode changed.

Diff for: ‎eng/common/cross/arm/tizen-fetch.sh

100644100755
File mode changed.

Diff for: ‎eng/native/build-commons.sh

+5-1
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ usage()
197197
echo ""
198198
echo "Common Options:"
199199
echo ""
200-
echo "BuildArch can be: -arm, -armel, -arm64, -loongarch64, -s390x, x64, x86, -wasm"
200+
echo "BuildArch can be: -arm, -armv6, -armel, -arm64, -loongarch64, -s390x, x64, x86, -wasm"
201201
echo "BuildType can be: -debug, -checked, -release"
202202
echo "-os: target OS (defaults to running OS)"
203203
echo "-bindir: output directory (defaults to $__ProjectRoot/artifacts)"
@@ -270,6 +270,10 @@ while :; do
270270
__BuildArch=arm
271271
;;
272272

273+
armv6|-armv6)
274+
__BuildArch=armv6
275+
;;
276+
273277
arm64|-arm64)
274278
__BuildArch=arm64
275279
;;

0 commit comments

Comments
 (0)