Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/dotnet/runtime.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordkurepa <dkurepa@microsoft.com>2022-08-22 14:47:16 +0300
committerdkurepa <dkurepa@microsoft.com>2022-08-22 14:47:16 +0300
commita3c22653ffba8f956d7dbce4e3315ab700c40477 (patch)
treea95b3558ab7b2930bc11c0c14ba531b10b427ff4
parent277c9583f8a4158cf866ed4c8ed6600e58894166 (diff)
update depencencies from the emsdk build7.0.0-test
-rw-r--r--.config/dotnet-tools.json2
-rw-r--r--NuGet.config8
-rw-r--r--eng/Version.Details.xml160
-rw-r--r--eng/Versions.props72
-rwxr-xr-xeng/common/cross/build-rootfs.sh110
-rw-r--r--eng/common/cross/toolchain.cmake41
-rw-r--r--eng/common/generate-locproject.ps131
-rw-r--r--eng/common/sdk-task.ps12
-rw-r--r--eng/common/templates/job/execute-sdl.yml2
-rw-r--r--eng/common/templates/job/onelocbuild.yml2
-rw-r--r--eng/common/templates/job/source-index-stage1.yml4
-rw-r--r--eng/common/templates/jobs/jobs.yml2
-rw-r--r--eng/common/templates/post-build/post-build.yml8
-rw-r--r--eng/common/tools.ps113
-rw-r--r--global.json8
15 files changed, 155 insertions, 310 deletions
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index 5a423ee75b3..a649fb0f0b4 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -15,7 +15,7 @@
]
},
"microsoft.dotnet.xharness.cli": {
- "version": "1.0.0-prerelease.22411.1",
+ "version": "1.0.0-prerelease.20308.1",
"commands": [
"xharness"
]
diff --git a/NuGet.config b/NuGet.config
index a6d878497ea..d1393492141 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -7,6 +7,14 @@
</fallbackPackageFolders>
<packageSources>
<clear />
+ <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
+ <!-- Begin: Package sources from dotnet-emsdk -->
+ <add key="darc-pub-dotnet-emsdk-fd39cdf" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-fd39cdf0/nuget/v3/index.json" />
+ <!-- End: Package sources from dotnet-emsdk -->
+ <!-- Begin: Package sources from dotnet-runtime -->
+ <add key="darc-pub-dotnet-runtime-277c958" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-277c9583/nuget/v3/index.json" />
+ <!-- End: Package sources from dotnet-runtime -->
+ <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<!--
'src/test/PrepareTestAssets/PrepareTestAssets.proj' generates a NuGet.config file using this
one as a template. The following line is a marker to insert the test restore sources.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 28dd80f5822..682979d2e71 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,52 +1,52 @@
<Dependencies>
<ProductDependencies>
- <Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="7.0.0-rc.1.22408.1">
+ <Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="6.0.0-alpha.1.20506.1">
<Uri>https://github.com/dotnet/icu</Uri>
- <Sha>c04d1340510269c5cd07a285abb097f587924d5b</Sha>
+ <Sha>59bef73a64b208536fa14e9ff2b1928283359912</Sha>
</Dependency>
<Dependency Name="System.Net.MsQuic.Transport" Version="7.0.0-alpha.1.22406.1">
<Uri>https://github.com/dotnet/msquic</Uri>
<Sha>dc012a715ceb9b5d5258f2fda77520586af5a36a</Sha>
</Dependency>
- <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-7.0.100" Version="7.0.0-rc.1.22411.1">
+ <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-7.0.100" Version="7.0.0">
<Uri>https://github.com/dotnet/emsdk</Uri>
- <Sha>216093204c415b6e37dfadfcbcf183881b443636</Sha>
+ <Sha>fd39cdf06553f901a896e1e4bdf0e2668888d3ff</Sha>
</Dependency>
<Dependency Name="System.ServiceModel.Primitives" Version="4.9.0-rc2.21473.1">
<Uri>https://github.com/dotnet/wcf</Uri>
<Sha>7f504aabb1988e9a093c1e74d8040bd52feb2f01</Sha>
</Dependency>
- <Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.ObjWriter" Version="1.0.0-alpha.1.22411.1">
+ <Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.ObjWriter" Version="1.0.0-alpha.1.21627.1">
<Uri>https://github.com/dotnet/llvm-project</Uri>
- <Sha>e73d65f0f80655b463162bd41a8365377ba6565d</Sha>
+ <Sha>d916fe20291111b94db69dd004868e04bc560258</Sha>
</Dependency>
- <Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter" Version="1.0.0-alpha.1.22411.1">
+ <Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter" Version="1.0.0-alpha.1.21627.1">
<Uri>https://github.com/dotnet/llvm-project</Uri>
- <Sha>e73d65f0f80655b463162bd41a8365377ba6565d</Sha>
+ <Sha>d916fe20291111b94db69dd004868e04bc560258</Sha>
</Dependency>
- <Dependency Name="runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.ObjWriter" Version="1.0.0-alpha.1.22411.1">
+ <Dependency Name="runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.ObjWriter" Version="1.0.0-alpha.1.21627.1">
<Uri>https://github.com/dotnet/llvm-project</Uri>
- <Sha>e73d65f0f80655b463162bd41a8365377ba6565d</Sha>
+ <Sha>d916fe20291111b94db69dd004868e04bc560258</Sha>
</Dependency>
- <Dependency Name="runtime.linux-musl-x64.Microsoft.NETCore.Runtime.ObjWriter" Version="1.0.0-alpha.1.22411.1">
+ <Dependency Name="runtime.linux-musl-x64.Microsoft.NETCore.Runtime.ObjWriter" Version="1.0.0-alpha.1.21627.1">
<Uri>https://github.com/dotnet/llvm-project</Uri>
- <Sha>e73d65f0f80655b463162bd41a8365377ba6565d</Sha>
+ <Sha>d916fe20291111b94db69dd004868e04bc560258</Sha>
</Dependency>
- <Dependency Name="runtime.win-arm64.Microsoft.NETCore.Runtime.ObjWriter" Version="1.0.0-alpha.1.22411.1">
+ <Dependency Name="runtime.win-arm64.Microsoft.NETCore.Runtime.ObjWriter" Version="1.0.0-alpha.1.21627.1">
<Uri>https://github.com/dotnet/llvm-project</Uri>
- <Sha>e73d65f0f80655b463162bd41a8365377ba6565d</Sha>
+ <Sha>d916fe20291111b94db69dd004868e04bc560258</Sha>
</Dependency>
- <Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.ObjWriter" Version="1.0.0-alpha.1.22411.1">
+ <Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.ObjWriter" Version="1.0.0-alpha.1.21627.1">
<Uri>https://github.com/dotnet/llvm-project</Uri>
- <Sha>e73d65f0f80655b463162bd41a8365377ba6565d</Sha>
+ <Sha>d916fe20291111b94db69dd004868e04bc560258</Sha>
</Dependency>
- <Dependency Name="runtime.osx.11.0-arm64.Microsoft.NETCore.Runtime.ObjWriter" Version="1.0.0-alpha.1.22411.1">
+ <Dependency Name="runtime.osx.11.0-arm64.Microsoft.NETCore.Runtime.ObjWriter" Version="1.0.0-alpha.1.21627.1">
<Uri>https://github.com/dotnet/llvm-project</Uri>
- <Sha>e73d65f0f80655b463162bd41a8365377ba6565d</Sha>
+ <Sha>d916fe20291111b94db69dd004868e04bc560258</Sha>
</Dependency>
- <Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.ObjWriter" Version="1.0.0-alpha.1.22411.1">
+ <Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.ObjWriter" Version="1.0.0-alpha.1.21627.1">
<Uri>https://github.com/dotnet/llvm-project</Uri>
- <Sha>e73d65f0f80655b463162bd41a8365377ba6565d</Sha>
+ <Sha>d916fe20291111b94db69dd004868e04bc560258</Sha>
</Dependency>
<Dependency Name="System.CommandLine" Version="2.0.0-beta4.22355.1">
<Uri>https://github.com/dotnet/command-line-api</Uri>
@@ -54,77 +54,77 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
- <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22416.1">
+ <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22405.5">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
+ <Sha>94bab7e3e339e1b2841381c69557d864172546b9</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22416.1">
+ <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22405.5">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
+ <Sha>94bab7e3e339e1b2841381c69557d864172546b9</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22416.1">
+ <Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22405.5">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
+ <Sha>94bab7e3e339e1b2841381c69557d864172546b9</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22416.1">
+ <Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22405.5">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
+ <Sha>94bab7e3e339e1b2841381c69557d864172546b9</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.22416.1">
+ <Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.22405.5">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
+ <Sha>94bab7e3e339e1b2841381c69557d864172546b9</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.22416.1">
+ <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.22405.5">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
+ <Sha>94bab7e3e339e1b2841381c69557d864172546b9</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22416.1">
+ <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22405.5">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
+ <Sha>94bab7e3e339e1b2841381c69557d864172546b9</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.22416.1">
+ <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.22405.5">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
+ <Sha>94bab7e3e339e1b2841381c69557d864172546b9</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22416.1">
+ <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22405.5">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
+ <Sha>94bab7e3e339e1b2841381c69557d864172546b9</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22416.1">
+ <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22405.5">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
+ <Sha>94bab7e3e339e1b2841381c69557d864172546b9</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.22416.1">
+ <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.22405.5">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
+ <Sha>94bab7e3e339e1b2841381c69557d864172546b9</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.22416.1">
+ <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.22405.5">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
+ <Sha>94bab7e3e339e1b2841381c69557d864172546b9</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.22416.1">
+ <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.22405.5">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
+ <Sha>94bab7e3e339e1b2841381c69557d864172546b9</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.22416.1">
+ <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.22405.5">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
+ <Sha>94bab7e3e339e1b2841381c69557d864172546b9</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.22416.1">
+ <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.22405.5">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
+ <Sha>94bab7e3e339e1b2841381c69557d864172546b9</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.22416.1">
+ <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.22405.5">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
+ <Sha>94bab7e3e339e1b2841381c69557d864172546b9</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.22416.1">
+ <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.22405.5">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
+ <Sha>94bab7e3e339e1b2841381c69557d864172546b9</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.22416.1">
+ <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.22405.5">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
+ <Sha>94bab7e3e339e1b2841381c69557d864172546b9</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="7.0.0-beta.22415.3">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
@@ -206,53 +206,53 @@
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>f049b5ff5955a8281c70d27ad45cbd87e9df1ab6</Sha>
</Dependency>
- <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0-rc.1.22414.6">
+ <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
- <Sha>e680411c22e33f45821f4ae64365a2970b2430a6</Sha>
+ <Sha>277c9583f8a4158cf866ed4c8ed6600e58894166</Sha>
</Dependency>
- <Dependency Name="Microsoft.NETCore.DotNetHost" Version="7.0.0-rc.1.22414.6">
+ <Dependency Name="Microsoft.NETCore.DotNetHost" Version="7.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
- <Sha>e680411c22e33f45821f4ae64365a2970b2430a6</Sha>
+ <Sha>277c9583f8a4158cf866ed4c8ed6600e58894166</Sha>
</Dependency>
- <Dependency Name="Microsoft.NETCore.DotNetHostPolicy" Version="7.0.0-rc.1.22414.6">
+ <Dependency Name="Microsoft.NETCore.DotNetHostPolicy" Version="7.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
- <Sha>e680411c22e33f45821f4ae64365a2970b2430a6</Sha>
+ <Sha>277c9583f8a4158cf866ed4c8ed6600e58894166</Sha>
</Dependency>
- <Dependency Name="runtime.native.System.IO.Ports" Version="7.0.0-rc.1.22414.6">
+ <Dependency Name="runtime.native.System.IO.Ports" Version="7.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
- <Sha>e680411c22e33f45821f4ae64365a2970b2430a6</Sha>
+ <Sha>277c9583f8a4158cf866ed4c8ed6600e58894166</Sha>
</Dependency>
- <Dependency Name="Microsoft.NETCore.ILAsm" Version="7.0.0-rc.1.22414.6">
+ <Dependency Name="Microsoft.NETCore.ILAsm" Version="7.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
- <Sha>e680411c22e33f45821f4ae64365a2970b2430a6</Sha>
+ <Sha>277c9583f8a4158cf866ed4c8ed6600e58894166</Sha>
</Dependency>
- <Dependency Name="Microsoft.NET.Sdk.IL" Version="7.0.0-rc.1.22414.6">
+ <Dependency Name="Microsoft.NET.Sdk.IL" Version="7.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
- <Sha>e680411c22e33f45821f4ae64365a2970b2430a6</Sha>
+ <Sha>277c9583f8a4158cf866ed4c8ed6600e58894166</Sha>
</Dependency>
- <Dependency Name="System.Text.Json" Version="7.0.0-rc.1.22414.6">
+ <Dependency Name="System.Text.Json" Version="7.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
- <Sha>e680411c22e33f45821f4ae64365a2970b2430a6</Sha>
+ <Sha>277c9583f8a4158cf866ed4c8ed6600e58894166</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22412.4">
<Uri>https://github.com/dotnet/linker</Uri>
<Sha>fda7b09fc005acb865deaf526c7adbb1be27a5f9</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="1.0.0-prerelease.22411.1">
+ <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="1.0.0-prerelease.20308.1">
<Uri>https://github.com/dotnet/xharness</Uri>
- <Sha>5ebf69650b9f7b4ecab485be840b3022420f7812</Sha>
+ <Sha>93557c5e866412f8e651fb08b7aef7bee1da65b6</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.22411.1">
+ <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.20308.1">
<Uri>https://github.com/dotnet/xharness</Uri>
- <Sha>5ebf69650b9f7b4ecab485be840b3022420f7812</Sha>
+ <Sha>93557c5e866412f8e651fb08b7aef7bee1da65b6</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.22411.1">
+ <Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.20308.1">
<Uri>https://github.com/dotnet/xharness</Uri>
- <Sha>5ebf69650b9f7b4ecab485be840b3022420f7812</Sha>
+ <Sha>93557c5e866412f8e651fb08b7aef7bee1da65b6</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.22416.1">
+ <Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.22405.5">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
+ <Sha>94bab7e3e339e1b2841381c69557d864172546b9</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.22415.6">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
@@ -278,9 +278,9 @@
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>555080fde81d34b38dfab27115c52f0a620803a2</Sha>
</Dependency>
- <Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.0-preview1.22403.2">
+ <Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="3.3.0-beta1.20262.20">
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
- <Sha>793113a41d7f21b03470521bf48438f2abd9b12f</Sha>
+ <Sha>42be055d9555bd00b465995daf22b3a06c79d797</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat.Task" Version="7.0.100-rc.1.22402.1">
<Uri>https://github.com/dotnet/sdk</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 3e0be766d9d..311e237cf47 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -43,7 +43,7 @@
<MicrosoftCodeAnalysisCSharpCodeStyleVersion>4.3.0-2.final</MicrosoftCodeAnalysisCSharpCodeStyleVersion>
<MicrosoftCodeAnalysisCSharpWorkspacesVersion>4.3.0-2.final</MicrosoftCodeAnalysisCSharpWorkspacesVersion>
<MicrosoftCodeAnalysisCSharpVersion>4.3.0-2.final</MicrosoftCodeAnalysisCSharpVersion>
- <MicrosoftCodeAnalysisNetAnalyzersVersion>7.0.0-preview1.22403.2</MicrosoftCodeAnalysisNetAnalyzersVersion>
+ <MicrosoftCodeAnalysisNetAnalyzersVersion>3.3.0-beta1.20262.20</MicrosoftCodeAnalysisNetAnalyzersVersion>
<MicrosoftCodeAnalysisVersion>4.3.0-2.final</MicrosoftCodeAnalysisVersion>
<!--
TODO: Remove pinned version once arcade supplies a compiler that enables the repo to compile.
@@ -53,39 +53,39 @@
<!-- SDK dependencies -->
<MicrosoftDotNetApiCompatTaskVersion>7.0.100-rc.1.22402.1</MicrosoftDotNetApiCompatTaskVersion>
<!-- Arcade dependencies -->
- <MicrosoftDotNetApiCompatVersion>7.0.0-beta.22416.1</MicrosoftDotNetApiCompatVersion>
- <MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksFeedVersion>
- <MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.22416.1</MicrosoftDotNetCodeAnalysisVersion>
- <MicrosoftDotNetGenAPIVersion>7.0.0-beta.22416.1</MicrosoftDotNetGenAPIVersion>
- <MicrosoftDotNetGenFacadesVersion>7.0.0-beta.22416.1</MicrosoftDotNetGenFacadesVersion>
- <MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.22416.1</MicrosoftDotNetXUnitExtensionsVersion>
- <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22416.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
- <MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksArchivesVersion>
- <MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksInstallersVersion>
- <MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksPackagingVersion>
- <MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
- <MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksTemplatingVersion>
- <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
- <MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.22416.1</MicrosoftDotNetRemoteExecutorVersion>
- <MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.22416.1</MicrosoftDotNetVersionToolsTasksVersion>
- <MicrosoftDotNetPackageTestingVersion>7.0.0-beta.22416.1</MicrosoftDotNetPackageTestingVersion>
+ <MicrosoftDotNetApiCompatVersion>7.0.0-beta.22405.5</MicrosoftDotNetApiCompatVersion>
+ <MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.22405.5</MicrosoftDotNetBuildTasksFeedVersion>
+ <MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.22405.5</MicrosoftDotNetCodeAnalysisVersion>
+ <MicrosoftDotNetGenAPIVersion>7.0.0-beta.22405.5</MicrosoftDotNetGenAPIVersion>
+ <MicrosoftDotNetGenFacadesVersion>7.0.0-beta.22405.5</MicrosoftDotNetGenFacadesVersion>
+ <MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.22405.5</MicrosoftDotNetXUnitExtensionsVersion>
+ <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22405.5</MicrosoftDotNetXUnitConsoleRunnerVersion>
+ <MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.22405.5</MicrosoftDotNetBuildTasksArchivesVersion>
+ <MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22405.5</MicrosoftDotNetBuildTasksInstallersVersion>
+ <MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22405.5</MicrosoftDotNetBuildTasksPackagingVersion>
+ <MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.22405.5</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
+ <MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22405.5</MicrosoftDotNetBuildTasksTemplatingVersion>
+ <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.22405.5</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
+ <MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.22405.5</MicrosoftDotNetRemoteExecutorVersion>
+ <MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.22405.5</MicrosoftDotNetVersionToolsTasksVersion>
+ <MicrosoftDotNetPackageTestingVersion>7.0.0-beta.22405.5</MicrosoftDotNetPackageTestingVersion>
<!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
- <MicrosoftNETCoreAppRuntimewinx64Version>7.0.0-rc.1.22414.6</MicrosoftNETCoreAppRuntimewinx64Version>
- <MicrosoftNETCoreDotNetHostVersion>7.0.0-rc.1.22414.6</MicrosoftNETCoreDotNetHostVersion>
- <MicrosoftNETCoreDotNetHostPolicyVersion>7.0.0-rc.1.22414.6</MicrosoftNETCoreDotNetHostPolicyVersion>
+ <MicrosoftNETCoreAppRuntimewinx64Version>7.0.0</MicrosoftNETCoreAppRuntimewinx64Version>
+ <MicrosoftNETCoreDotNetHostVersion>7.0.0</MicrosoftNETCoreDotNetHostVersion>
+ <MicrosoftNETCoreDotNetHostPolicyVersion>7.0.0</MicrosoftNETCoreDotNetHostPolicyVersion>
<MicrosoftExtensionsDependencyModelVersion>6.0.0</MicrosoftExtensionsDependencyModelVersion>
<!-- CoreClr dependencies -->
- <MicrosoftNETCoreILAsmVersion>7.0.0-rc.1.22414.6</MicrosoftNETCoreILAsmVersion>
- <runtimelinuxarm64MicrosoftNETCoreRuntimeObjWriterVersion>1.0.0-alpha.1.22411.1</runtimelinuxarm64MicrosoftNETCoreRuntimeObjWriterVersion>
- <runtimelinuxx64MicrosoftNETCoreRuntimeObjWriterVersion>1.0.0-alpha.1.22411.1</runtimelinuxx64MicrosoftNETCoreRuntimeObjWriterVersion>
- <runtimelinuxmuslarm64MicrosoftNETCoreRuntimeObjWriterVersion>1.0.0-alpha.1.22411.1</runtimelinuxmuslarm64MicrosoftNETCoreRuntimeObjWriterVersion>
- <runtimelinuxmuslx64MicrosoftNETCoreRuntimeObjWriterVersion>1.0.0-alpha.1.22411.1</runtimelinuxmuslx64MicrosoftNETCoreRuntimeObjWriterVersion>
- <runtimewinarm64MicrosoftNETCoreRuntimeObjWriterVersion>1.0.0-alpha.1.22411.1</runtimewinarm64MicrosoftNETCoreRuntimeObjWriterVersion>
- <runtimewinx64MicrosoftNETCoreRuntimeObjWriterVersion>1.0.0-alpha.1.22411.1</runtimewinx64MicrosoftNETCoreRuntimeObjWriterVersion>
- <runtimeosx110arm64MicrosoftNETCoreRuntimeObjWriterVersion>1.0.0-alpha.1.22411.1</runtimeosx110arm64MicrosoftNETCoreRuntimeObjWriterVersion>
- <runtimeosx1012x64MicrosoftNETCoreRuntimeObjWriterVersion>1.0.0-alpha.1.22411.1</runtimeosx1012x64MicrosoftNETCoreRuntimeObjWriterVersion>
+ <MicrosoftNETCoreILAsmVersion>7.0.0</MicrosoftNETCoreILAsmVersion>
+ <runtimelinuxarm64MicrosoftNETCoreRuntimeObjWriterVersion>1.0.0-alpha.1.21627.1</runtimelinuxarm64MicrosoftNETCoreRuntimeObjWriterVersion>
+ <runtimelinuxx64MicrosoftNETCoreRuntimeObjWriterVersion>1.0.0-alpha.1.21627.1</runtimelinuxx64MicrosoftNETCoreRuntimeObjWriterVersion>
+ <runtimelinuxmuslarm64MicrosoftNETCoreRuntimeObjWriterVersion>1.0.0-alpha.1.21627.1</runtimelinuxmuslarm64MicrosoftNETCoreRuntimeObjWriterVersion>
+ <runtimelinuxmuslx64MicrosoftNETCoreRuntimeObjWriterVersion>1.0.0-alpha.1.21627.1</runtimelinuxmuslx64MicrosoftNETCoreRuntimeObjWriterVersion>
+ <runtimewinarm64MicrosoftNETCoreRuntimeObjWriterVersion>1.0.0-alpha.1.21627.1</runtimewinarm64MicrosoftNETCoreRuntimeObjWriterVersion>
+ <runtimewinx64MicrosoftNETCoreRuntimeObjWriterVersion>1.0.0-alpha.1.21627.1</runtimewinx64MicrosoftNETCoreRuntimeObjWriterVersion>
+ <runtimeosx110arm64MicrosoftNETCoreRuntimeObjWriterVersion>1.0.0-alpha.1.21627.1</runtimeosx110arm64MicrosoftNETCoreRuntimeObjWriterVersion>
+ <runtimeosx1012x64MicrosoftNETCoreRuntimeObjWriterVersion>1.0.0-alpha.1.21627.1</runtimeosx1012x64MicrosoftNETCoreRuntimeObjWriterVersion>
<!-- Libraries dependencies -->
<MicrosoftBclAsyncInterfacesVersion>6.0.0</MicrosoftBclAsyncInterfacesVersion>
<MicrosoftBclHashCodeVersion>1.1.1</MicrosoftBclHashCodeVersion>
@@ -112,11 +112,11 @@
<SystemSecurityCryptographyOpenSslVersion>5.0.0</SystemSecurityCryptographyOpenSslVersion>
<SystemSecurityPrincipalWindowsVersion>5.0.0</SystemSecurityPrincipalWindowsVersion>
<SystemServiceModelPrimitivesVersion>4.9.0</SystemServiceModelPrimitivesVersion>
- <SystemTextJsonVersion>7.0.0-rc.1.22414.6</SystemTextJsonVersion>
+ <SystemTextJsonVersion>7.0.0</SystemTextJsonVersion>
<SystemRuntimeCompilerServicesUnsafeVersion>6.0.0</SystemRuntimeCompilerServicesUnsafeVersion>
<SystemThreadingTasksExtensionsVersion>4.5.4</SystemThreadingTasksExtensionsVersion>
<SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
- <runtimenativeSystemIOPortsVersion>7.0.0-rc.1.22414.6</runtimenativeSystemIOPortsVersion>
+ <runtimenativeSystemIOPortsVersion>7.0.0</runtimenativeSystemIOPortsVersion>
<!-- Runtime-Assets dependencies -->
<SystemRuntimeNumericsTestDataVersion>7.0.0-beta.22415.3</SystemRuntimeNumericsTestDataVersion>
<SystemComponentModelTypeConverterTestDataVersion>7.0.0-beta.22415.3</SystemComponentModelTypeConverterTestDataVersion>
@@ -153,9 +153,9 @@
<!-- Testing -->
<MicrosoftNETCoreCoreDisToolsVersion>1.1.0</MicrosoftNETCoreCoreDisToolsVersion>
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
- <MicrosoftDotNetXHarnessTestRunnersCommonVersion>1.0.0-prerelease.22411.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
- <MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.22411.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
- <MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.22411.1</MicrosoftDotNetXHarnessCLIVersion>
+ <MicrosoftDotNetXHarnessTestRunnersCommonVersion>1.0.0-prerelease.20308.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
+ <MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.20308.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
+ <MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.20308.1</MicrosoftDotNetXHarnessCLIVersion>
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>1.1.0-alpha.0.22415.2</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
<XUnitVersion>2.4.2</XUnitVersion>
<XUnitAnalyzersVersion>1.0.0</XUnitAnalyzersVersion>
@@ -175,7 +175,7 @@
<MicrosoftNETILLinkTasksVersion>7.0.100-1.22412.4</MicrosoftNETILLinkTasksVersion>
<MicrosoftNETILLinkAnalyzerPackageVersion>$(MicrosoftNETILLinkTasksVersion)</MicrosoftNETILLinkAnalyzerPackageVersion>
<!-- ICU -->
- <MicrosoftNETCoreRuntimeICUTransportVersion>7.0.0-rc.1.22408.1</MicrosoftNETCoreRuntimeICUTransportVersion>
+ <MicrosoftNETCoreRuntimeICUTransportVersion>6.0.0-alpha.1.20506.1</MicrosoftNETCoreRuntimeICUTransportVersion>
<!-- MsQuic -->
<MicrosoftNativeQuicMsQuicVersion>2.1</MicrosoftNativeQuicMsQuicVersion>
<SystemNetMsQuicTransportVersion>7.0.0-alpha.1.22406.1</SystemNetMsQuicTransportVersion>
@@ -189,7 +189,7 @@
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.22415.2</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.22415.2</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<!-- emscripten / Node -->
- <MicrosoftNETWorkloadEmscriptenManifest70100Version>7.0.0-rc.1.22411.1</MicrosoftNETWorkloadEmscriptenManifest70100Version>
+ <MicrosoftNETWorkloadEmscriptenManifest70100Version>7.0.0</MicrosoftNETWorkloadEmscriptenManifest70100Version>
<MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptenManifest70100Version)</MicrosoftNETRuntimeEmscriptenVersion>
<!-- workloads -->
<SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>
diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh
index 032f5f19373..f058c98763a 100755
--- a/eng/common/cross/build-rootfs.sh
+++ b/eng/common/cross/build-rootfs.sh
@@ -8,13 +8,11 @@ usage()
echo "BuildArch can be: arm(default), arm64, armel, armv6, ppc64le, riscv64, s390x, x64, x86"
echo "CodeName - optional, Code name for Linux, can be: xenial(default), zesty, bionic, alpine, alpine3.13 or alpine3.14. If BuildArch is armel, LinuxCodeName is jessie(default) or tizen."
echo " for FreeBSD can be: freebsd12, freebsd13"
- echo " for illumos can be: illumos"
- echo " for Haiku can be: haiku."
+ echo " for illumos can be: illumos."
echo "lldbx.y - optional, LLDB version, can be: lldb3.9(default), lldb4.0, lldb5.0, lldb6.0 no-lldb. Ignored for alpine and FreeBSD"
echo "llvmx[.y] - optional, LLVM version for LLVM related packages."
echo "--skipunmount - optional, will skip the unmount of rootfs folder."
echo "--use-mirror - optional, use mirror URL to fetch resources, when available."
- echo "--jobs N - optional, restrict to N jobs."
exit 1
}
@@ -76,21 +74,10 @@ __FreeBSDPackages+=" openssl"
__FreeBSDPackages+=" krb5"
__FreeBSDPackages+=" terminfo-db"
-__IllumosPackages="icu"
-__IllumosPackages+=" mit-krb5"
-__IllumosPackages+=" openssl"
-__IllumosPackages+=" zlib"
-
-__HaikuPackages="gmp"
-__HaikuPackages+=" gmp_devel"
-__HaikuPackages+=" krb5"
-__HaikuPackages+=" krb5_devel"
-__HaikuPackages+=" libiconv"
-__HaikuPackages+=" libiconv_devel"
-__HaikuPackages+=" llvm12_libunwind"
-__HaikuPackages+=" llvm12_libunwind_devel"
-__HaikuPackages+=" mpfr"
-__HaikuPackages+=" mpfr_devel"
+__IllumosPackages="icu-64.2nb2"
+__IllumosPackages+=" mit-krb5-1.16.2nb4"
+__IllumosPackages+=" openssl-1.1.1e"
+__IllumosPackages+=" zlib-1.2.11"
# ML.NET dependencies
__UbuntuPackages+=" libomp5"
@@ -276,11 +263,6 @@ while :; do
__CodeName=illumos
__SkipUnmount=1
;;
- haiku)
- __CodeName=haiku
- __BuildArch=x64
- __SkipUnmount=1
- ;;
--skipunmount)
__SkipUnmount=1
;;
@@ -291,10 +273,6 @@ while :; do
--use-mirror)
__UseMirror=1
;;
- --use-jobs)
- shift
- MAXJOBS=$1
- ;;
*)
__UnprocessedBuildArgs="$__UnprocessedBuildArgs $1"
;;
@@ -348,7 +326,7 @@ if [[ "$__CodeName" == "alpine" ]]; then
rm -r "$__ApkToolsDir"
elif [[ "$__CodeName" == "freebsd" ]]; then
mkdir -p "$__RootfsDir"/usr/local/etc
- JOBS=${MAXJOBS:="$(getconf _NPROCESSORS_ONLN)"}
+ JOBS="$(getconf _NPROCESSORS_ONLN)"
wget -O - "https://download.freebsd.org/ftp/releases/${__FreeBSDArch}/${__FreeBSDMachineArch}/${__FreeBSDBase}/base.txz" | tar -C "$__RootfsDir" -Jxf - ./lib ./usr/lib ./usr/libdata ./usr/include ./usr/share/keys ./etc ./bin/freebsd-version
echo "ABI = \"FreeBSD:${__FreeBSDABI}:${__FreeBSDMachineArch}\"; FINGERPRINTS = \"${__RootfsDir}/usr/share/keys\"; REPOS_DIR = [\"${__RootfsDir}/etc/pkg\"]; REPO_AUTOUPDATE = NO; RUN_SCRIPTS = NO;" > "${__RootfsDir}"/usr/local/etc/pkg.conf
echo "FreeBSD: { url: \"pkg+http://pkg.FreeBSD.org/\${ABI}/quarterly\", mirror_type: \"srv\", signature_type: \"fingerprints\", fingerprints: \"${__RootfsDir}/usr/share/keys/pkg\", enabled: yes }" > "${__RootfsDir}"/etc/pkg/FreeBSD.conf
@@ -366,7 +344,7 @@ elif [[ "$__CodeName" == "freebsd" ]]; then
elif [[ "$__CodeName" == "illumos" ]]; then
mkdir "$__RootfsDir/tmp"
pushd "$__RootfsDir/tmp"
- JOBS=${MAXJOBS:="$(getconf _NPROCESSORS_ONLN)"}
+ JOBS="$(getconf _NPROCESSORS_ONLN)"
echo "Downloading sysroot."
wget -O - https://github.com/illumos/sysroot/releases/download/20181213-de6af22ae73b-v1/illumos-sysroot-i386-20181213-de6af22ae73b-v1.tar.gz | tar -C "$__RootfsDir" -xzf -
echo "Building binutils. Please wait.."
@@ -390,18 +368,14 @@ elif [[ "$__CodeName" == "illumos" ]]; then
if [[ "$__UseMirror" == 1 ]]; then
BaseUrl=http://pkgsrc.smartos.skylime.net
fi
- BaseUrl="$BaseUrl/packages/SmartOS/trunk/${__illumosArch}/All"
- echo "Downloading manifest"
- wget "$BaseUrl"
+ BaseUrl="$BaseUrl/packages/SmartOS/2020Q1/${__illumosArch}/All"
echo "Downloading dependencies."
read -ra array <<<"$__IllumosPackages"
for package in "${array[@]}"; do
- echo "Installing '$package'"
- package="$(grep ">$package-[0-9]" All | sed -En 's/.*href="(.*)\.tgz".*/\1/p')"
- echo "Resolved name '$package'"
+ echo "Installing $package..."
wget "$BaseUrl"/"$package".tgz
ar -x "$package".tgz
- tar --skip-old-files -xzf "$package".tmp.tg* -C "$__RootfsDir" 2>/dev/null
+ tar --skip-old-files -xzf "$package".tmp.tgz -C "$__RootfsDir" 2>/dev/null
done
echo "Cleaning up temporary files."
popd
@@ -412,70 +386,6 @@ elif [[ "$__CodeName" == "illumos" ]]; then
wget -P "$__RootfsDir"/usr/include/net https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/io/bpf/net/dlt.h
wget -P "$__RootfsDir"/usr/include/netpacket https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/inet/sockmods/netpacket/packet.h
wget -P "$__RootfsDir"/usr/include/sys https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/sys/sdt.h
-elif [[ "$__CodeName" == "haiku" ]]; then
- JOBS=${MAXJOBS:="$(getconf _NPROCESSORS_ONLN)"}
-
- echo "Building Haiku sysroot for x86_64"
- mkdir -p "$__RootfsDir/tmp"
- cd "$__RootfsDir/tmp"
- git clone -b hrev56235 https://review.haiku-os.org/haiku
- git clone -b btrev43195 https://review.haiku-os.org/buildtools
- cd "$__RootfsDir/tmp/buildtools" && git checkout 7487388f5110021d400b9f3b88e1a7f310dc066d
-
- # Fetch some unmerged patches
- cd "$__RootfsDir/tmp/haiku"
- ## Add development build profile (slimmer than nightly)
- git fetch origin refs/changes/64/4164/1 && git -c commit.gpgsign=false cherry-pick FETCH_HEAD
-
- # Build jam
- cd "$__RootfsDir/tmp/buildtools/jam"
- make
-
- # Configure cross tools
- echo "Building cross-compiler"
- mkdir -p "$__RootfsDir/generated"
- cd "$__RootfsDir/generated"
- "$__RootfsDir/tmp/haiku/configure" -j"$JOBS" --sysroot "$__RootfsDir" --cross-tools-source "$__RootfsDir/tmp/buildtools" --build-cross-tools x86_64
-
- # Build Haiku packages
- echo "Building Haiku"
- echo 'HAIKU_BUILD_PROFILE = "development-raw" ;' > UserProfileConfig
- "$__RootfsDir/tmp/buildtools/jam/jam0" -j"$JOBS" -q '<build>package' '<repository>Haiku'
-
- BaseUrl="https://depot.haiku-os.org/__api/v2/pkg/get-pkg"
-
- # Download additional packages
- echo "Downloading additional required packages"
- read -ra array <<<"$__HaikuPackages"
- for package in "${array[@]}"; do
- echo "Downloading $package..."
- # API documented here: https://github.com/haiku/haikudepotserver/blob/master/haikudepotserver-api2/src/main/resources/api2/pkg.yaml#L60
- # The schema here: https://github.com/haiku/haikudepotserver/blob/master/haikudepotserver-api2/src/main/resources/api2/pkg.yaml#L598
- hpkgDownloadUrl="$(wget -qO- --post-data='{"name":"'"$package"'","repositorySourceCode":"haikuports_x86_64","versionType":"LATEST","naturalLanguageCode":"en"}' \
- --header='Content-Type:application/json' "$BaseUrl" | jq -r '.result.versions[].hpkgDownloadURL')"
- wget -P "$__RootfsDir/generated/download" "$hpkgDownloadUrl"
- done
-
- # Setup the sysroot
- echo "Setting up sysroot and extracting needed packages"
- mkdir -p "$__RootfsDir/boot/system"
- for file in "$__RootfsDir/generated/objects/haiku/x86_64/packaging/packages/"*.hpkg; do
- "$__RootfsDir/generated/objects/linux/x86_64/release/tools/package/package" extract -C "$__RootfsDir/boot/system" "$file"
- done
- for file in "$__RootfsDir/generated/download/"*.hpkg; do
- "$__RootfsDir/generated/objects/linux/x86_64/release/tools/package/package" extract -C "$__RootfsDir/boot/system" "$file"
- done
-
- # Cleaning up temporary files
- echo "Cleaning up temporary files"
- rm -rf "$__RootfsDir/tmp"
- for name in "$__RootfsDir/generated/"*; do
- if [[ "$name" =~ "cross-tools-" ]]; then
- : # Keep the cross-compiler
- else
- rm -rf "$name"
- fi
- done
elif [[ -n "$__CodeName" ]]; then
qemu-debootstrap $__Keyring --arch "$__UbuntuArch" "$__CodeName" "$__RootfsDir" "$__UbuntuRepo"
cp "$__CrossDir/$__BuildArch/sources.list.$__CodeName" "$__RootfsDir/etc/apt/sources.list"
diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake
index 561576be97c..909117759e6 100644
--- a/eng/common/cross/toolchain.cmake
+++ b/eng/common/cross/toolchain.cmake
@@ -7,8 +7,6 @@ if(EXISTS ${CROSS_ROOTFS}/bin/freebsd-version)
elseif(EXISTS ${CROSS_ROOTFS}/usr/platform/i86pc)
set(CMAKE_SYSTEM_NAME SunOS)
set(ILLUMOS 1)
-elseif(EXISTS ${CROSS_ROOTFS}/boot/system/develop/headers/config/HaikuConfig.h)
- set(CMAKE_SYSTEM_NAME Haiku)
else()
set(CMAKE_SYSTEM_NAME Linux)
set(LINUX 1)
@@ -78,8 +76,6 @@ elseif(TARGET_ARCH_NAME STREQUAL "x64")
set(triple "x86_64-unknown-freebsd12")
elseif(ILLUMOS)
set(TOOLCHAIN "x86_64-illumos")
- elseif(HAIKU)
- set(TOOLCHAIN "x64_64-unknown-haiku")
endif()
elseif(TARGET_ARCH_NAME STREQUAL "x86")
set(CMAKE_SYSTEM_PROCESSOR i686)
@@ -174,41 +170,6 @@ elseif(ILLUMOS)
set(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES} -lssp")
set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} -lssp")
-elseif(HAIKU)
- set(CMAKE_SYSROOT "${CROSS_ROOTFS}")
-
- set(TOOLSET_PREFIX ${TOOLCHAIN}-)
- function(locate_toolchain_exec exec var)
- string(TOUPPER ${exec} EXEC_UPPERCASE)
- if(NOT "$ENV{CLR_${EXEC_UPPERCASE}}" STREQUAL "")
- set(${var} "$ENV{CLR_${EXEC_UPPERCASE}}" PARENT_SCOPE)
- return()
- endif()
-
- set(SEARCH_PATH "${CROSS_ROOTFS}/generated/cross-tools-x86_64/bin")
-
- find_program(EXEC_LOCATION_${exec}
- PATHS ${SEARCH_PATH}
- NAMES
- "${TOOLSET_PREFIX}${exec}${CLR_CMAKE_COMPILER_FILE_NAME_VERSION}"
- "${TOOLSET_PREFIX}${exec}")
-
- if (EXEC_LOCATION_${exec} STREQUAL "EXEC_LOCATION_${exec}-NOTFOUND")
- message(FATAL_ERROR "Unable to find toolchain executable. Name: ${exec}, Prefix: ${TOOLSET_PREFIX}.")
- endif()
- set(${var} ${EXEC_LOCATION_${exec}} PARENT_SCOPE)
- endfunction()
-
- set(CMAKE_SYSTEM_PREFIX_PATH "${CROSS_ROOTFS}")
-
- locate_toolchain_exec(gcc CMAKE_C_COMPILER)
- locate_toolchain_exec(g++ CMAKE_CXX_COMPILER)
-
- set(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES} -lssp")
- set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} -lssp")
-
- # let CMake set up the correct search paths
- include(Platform/Haiku)
else()
set(CMAKE_SYSROOT "${CROSS_ROOTFS}")
@@ -268,7 +229,7 @@ endif()
# Specify compile options
-if((TARGET_ARCH_NAME MATCHES "^(arm|arm64|armel|armv6|ppc64le|riscv64|s390x)$" AND NOT ANDROID AND NOT FREEBSD) OR ILLUMOS OR HAIKU)
+if((TARGET_ARCH_NAME MATCHES "^(arm|arm64|armel|armv6|ppc64le|riscv64|s390x)$" AND NOT ANDROID AND NOT FREEBSD) OR ILLUMOS)
set(CMAKE_C_COMPILER_TARGET ${TOOLCHAIN})
set(CMAKE_CXX_COMPILER_TARGET ${TOOLCHAIN})
set(CMAKE_ASM_COMPILER_TARGET ${TOOLCHAIN})
diff --git a/eng/common/generate-locproject.ps1 b/eng/common/generate-locproject.ps1
index 846e7950ce9..afdd1750290 100644
--- a/eng/common/generate-locproject.ps1
+++ b/eng/common/generate-locproject.ps1
@@ -33,8 +33,6 @@ $jsonTemplateFiles | ForEach-Object {
$jsonWinformsTemplateFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\\strings\.json" } # current winforms pattern
-$wxlFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\.+\.wxl" -And -Not( $_.Directory.Name -Match "\d{4}" ) } # localized files live in four digit lang ID directories; this excludes them
-
$xlfFiles = @()
$allXlfFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory\*\*.xlf"
@@ -79,7 +77,8 @@ $locJson = @{
CopyOption = "LangIDOnPath"
OutputPath = "$($_.Directory.Parent.FullName | Resolve-Path -Relative)\"
}
- } else {
+ }
+ else {
return @{
SourceFile = $sourceFile
CopyOption = "LangIDOnName"
@@ -89,32 +88,6 @@ $locJson = @{
}
}
)
- },
- @{
- CloneLanguageSet = "WiX_CloneLanguages"
- LssFiles = @( "wxl_loc.lss" )
- LocItems = @(
- $wxlFiles | ForEach-Object {
- $outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\"
- $continue = $true
- foreach ($exclusion in $exclusions.Exclusions) {
- if ($outputPath.Contains($exclusion))
- {
- $continue = $false
- }
- }
- $sourceFile = ($_.FullName | Resolve-Path -Relative)
- if ($continue)
- {
- return @{
- SourceFile = $sourceFile
- CopyOption = "LangIDOnPath"
- OutputPath = $outputPath
- Languages = "cs-CZ;de-DE;es-ES;fr-FR;it-IT;ja-JP;ko-KR;pl-PL;pt-BR;ru-RU;tr-TR;zh-CN;zh-TW"
- }
- }
- }
- )
}
)
}
diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1
index c35087a0601..119a6c660d1 100644
--- a/eng/common/sdk-task.ps1
+++ b/eng/common/sdk-task.ps1
@@ -64,7 +64,7 @@ try {
$GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
}
if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
- $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.2.1" -MemberType NoteProperty
+ $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.1.0" -MemberType NoteProperty
}
if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
$xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true
diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml
index 9ff6a10a682..24cec0424e5 100644
--- a/eng/common/templates/job/execute-sdl.yml
+++ b/eng/common/templates/job/execute-sdl.yml
@@ -54,7 +54,7 @@ jobs:
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: NetCore1ESPool-Internal
- demands: ImageOverride -equals windows.vs2019.amd64
+ demands: ImageOverride -equals Build.Server.Amd64.VS2019
steps:
- checkout: self
clean: true
diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml
index 6c523b714f4..3bcd243c46b 100644
--- a/eng/common/templates/job/onelocbuild.yml
+++ b/eng/common/templates/job/onelocbuild.yml
@@ -41,7 +41,7 @@ jobs:
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: NetCore1ESPool-Internal
- demands: ImageOverride -equals windows.vs2019.amd64
+ demands: ImageOverride -equals Build.Server.Amd64.VS2019
variables:
- group: OneLocBuildVariables # Contains the CeapexPat and GithubPat
diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml
index c85044a6849..4e37210857d 100644
--- a/eng/common/templates/job/source-index-stage1.yml
+++ b/eng/common/templates/job/source-index-stage1.yml
@@ -29,10 +29,10 @@ jobs:
pool:
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: NetCore1ESPool-Public
- demands: ImageOverride -equals windows.vs2019.amd64.open
+ demands: ImageOverride -equals Build.Server.Amd64.VS2019.Open
${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: NetCore1ESPool-Internal
- demands: ImageOverride -equals windows.vs2019.amd64
+ demands: ImageOverride -equals Build.Server.Amd64.VS2019
steps:
- ${{ each preStep in parameters.preSteps }}:
diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml
index 64e5929f221..2cca53c2d1d 100644
--- a/eng/common/templates/jobs/jobs.yml
+++ b/eng/common/templates/jobs/jobs.yml
@@ -96,7 +96,7 @@ jobs:
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: NetCore1ESPool-Internal
- demands: ImageOverride -equals windows.vs2019.amd64
+ demands: ImageOverride -equals Build.Server.Amd64.VS2019
runAsPublic: ${{ parameters.runAsPublic }}
publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }}
diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml
index 87fcae940cf..e0beb25d4e7 100644
--- a/eng/common/templates/post-build/post-build.yml
+++ b/eng/common/templates/post-build/post-build.yml
@@ -107,7 +107,7 @@ stages:
# If it's not devdiv, it's dnceng
${{ else }}:
name: NetCore1ESPool-Internal
- demands: ImageOverride -equals windows.vs2019.amd64
+ demands: ImageOverride -equals Build.Server.Amd64.VS2019
steps:
- template: setup-maestro-vars.yml
@@ -144,7 +144,7 @@ stages:
# If it's not devdiv, it's dnceng
${{ else }}:
name: NetCore1ESPool-Internal
- demands: ImageOverride -equals windows.vs2019.amd64
+ demands: ImageOverride -equals Build.Server.Amd64.VS2019
steps:
- template: setup-maestro-vars.yml
parameters:
@@ -204,7 +204,7 @@ stages:
# If it's not devdiv, it's dnceng
${{ else }}:
name: NetCore1ESPool-Internal
- demands: ImageOverride -equals windows.vs2019.amd64
+ demands: ImageOverride -equals Build.Server.Amd64.VS2019
steps:
- template: setup-maestro-vars.yml
parameters:
@@ -263,7 +263,7 @@ stages:
# If it's not devdiv, it's dnceng
${{ else }}:
name: NetCore1ESPool-Internal
- demands: ImageOverride -equals windows.vs2019.amd64
+ demands: ImageOverride -equals Build.Server.Amd64.VS2019
steps:
- template: setup-maestro-vars.yml
parameters:
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index aba6308ad31..9638c63c725 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -365,17 +365,10 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
# If the version of msbuild is going to be xcopied,
# use this version. Version matches a package here:
- # https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=17.2.1&view=overview
- $defaultXCopyMSBuildVersion = '17.2.1'
+ # https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=17.1.0&view=overview
+ $defaultXCopyMSBuildVersion = '17.1.0'
- if (!$vsRequirements) {
- if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {
- $vsRequirements = $GlobalJson.tools.vs
- }
- else {
- $vsRequirements = New-Object PSObject -Property @{ version = $vsMinVersionReqdStr }
- }
- }
+ if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs }
$vsMinVersionStr = if ($vsRequirements.version) { $vsRequirements.version } else { $vsMinVersionReqdStr }
$vsMinVersion = [Version]::new($vsMinVersionStr)
diff --git a/global.json b/global.json
index 4a177769017..4436fb5a914 100644
--- a/global.json
+++ b/global.json
@@ -8,11 +8,11 @@
"dotnet": "7.0.100-preview.7.22377.5"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22416.1",
- "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22416.1",
- "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22416.1",
+ "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22405.5",
+ "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22405.5",
+ "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22405.5",
"Microsoft.Build.NoTargets": "3.5.0",
"Microsoft.Build.Traversal": "3.1.6",
- "Microsoft.NET.Sdk.IL": "7.0.0-rc.1.22414.6"
+ "Microsoft.NET.Sdk.IL": "7.0.0"
}
}