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
path: root/eng
diff options
context:
space:
mode:
authorCarlos Sanchez <1175054+carlossanlop@users.noreply.github.com>2022-08-19 04:00:41 +0300
committerGitHub <noreply@github.com>2022-08-19 04:00:41 +0300
commit238c04840876b516aeae99e449b829842924805a (patch)
treeb9e9e8b295277c01057b94be341e5d5af1a037d1 /eng
parent56e2dc08c07aa263f250205ce5e5d6375e45278a (diff)
parent0ec29b6c65336fe7bfc1de28078b56453eca841c (diff)
Merge pull request #74045 from dotnet-maestro-bot/merge/release/7.0-rc1-to-release/7.0
[automated] Merge branch 'release/7.0-rc1' => 'release/7.0'
Diffstat (limited to 'eng')
-rw-r--r--eng/Version.Details.xml100
-rw-r--r--eng/Versions.props46
-rwxr-xr-xeng/common/cross/build-rootfs.sh18
-rw-r--r--eng/common/generate-locproject.ps131
-rw-r--r--eng/common/sdk-task.ps12
-rw-r--r--eng/common/tools.ps14
-rw-r--r--eng/native/configureplatform.cmake2
-rw-r--r--eng/nativepgo.targets12
-rw-r--r--eng/pipelines/coreclr/templates/run-performance-job.yml30
-rw-r--r--eng/pipelines/mono/templates/workloads-build.yml2
-rw-r--r--eng/restore/optimizationData.targets2
-rw-r--r--eng/testing/performance/microbenchmarks.proj12
12 files changed, 159 insertions, 102 deletions
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index a5b2ac29d31..28dd80f5822 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -54,77 +54,77 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
- <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22411.2">
+ <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22416.1">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>6a638cd0c13962ab2a1943cb1c878be5a41dd82e</Sha>
+ <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22411.2">
+ <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22416.1">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>6a638cd0c13962ab2a1943cb1c878be5a41dd82e</Sha>
+ <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22411.2">
+ <Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22416.1">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>6a638cd0c13962ab2a1943cb1c878be5a41dd82e</Sha>
+ <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22411.2">
+ <Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22416.1">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>6a638cd0c13962ab2a1943cb1c878be5a41dd82e</Sha>
+ <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.22411.2">
+ <Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.22416.1">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>6a638cd0c13962ab2a1943cb1c878be5a41dd82e</Sha>
+ <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.22411.2">
+ <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.22416.1">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>6a638cd0c13962ab2a1943cb1c878be5a41dd82e</Sha>
+ <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22411.2">
+ <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22416.1">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>6a638cd0c13962ab2a1943cb1c878be5a41dd82e</Sha>
+ <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.22411.2">
+ <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.22416.1">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>6a638cd0c13962ab2a1943cb1c878be5a41dd82e</Sha>
+ <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22411.2">
+ <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22416.1">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>6a638cd0c13962ab2a1943cb1c878be5a41dd82e</Sha>
+ <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22411.2">
+ <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22416.1">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>6a638cd0c13962ab2a1943cb1c878be5a41dd82e</Sha>
+ <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.22411.2">
+ <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.22416.1">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>6a638cd0c13962ab2a1943cb1c878be5a41dd82e</Sha>
+ <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.22411.2">
+ <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.22416.1">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>6a638cd0c13962ab2a1943cb1c878be5a41dd82e</Sha>
+ <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.22411.2">
+ <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.22416.1">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>6a638cd0c13962ab2a1943cb1c878be5a41dd82e</Sha>
+ <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.22411.2">
+ <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.22416.1">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>6a638cd0c13962ab2a1943cb1c878be5a41dd82e</Sha>
+ <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.22411.2">
+ <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.22416.1">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>6a638cd0c13962ab2a1943cb1c878be5a41dd82e</Sha>
+ <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.22411.2">
+ <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.22416.1">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>6a638cd0c13962ab2a1943cb1c878be5a41dd82e</Sha>
+ <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.22411.2">
+ <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.22416.1">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>6a638cd0c13962ab2a1943cb1c878be5a41dd82e</Sha>
+ <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.22411.2">
+ <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.22416.1">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>6a638cd0c13962ab2a1943cb1c878be5a41dd82e</Sha>
+ <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="7.0.0-beta.22415.3">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
@@ -250,25 +250,25 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>5ebf69650b9f7b4ecab485be840b3022420f7812</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.22411.2">
+ <Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.22416.1">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>6a638cd0c13962ab2a1943cb1c878be5a41dd82e</Sha>
+ <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
</Dependency>
- <Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.22375.7">
+ <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>
- <Sha>e01e5b0aed54a5a8d9df74e717d1b13f0fb0e056</Sha>
+ <Sha>5e0b0da43f660de5798186f4fd3bc900fc90576c</Sha>
</Dependency>
- <Dependency Name="optimization.windows_nt-x86.MIBC.Runtime" Version="1.0.0-prerelease.22375.7">
+ <Dependency Name="optimization.windows_nt-x86.MIBC.Runtime" Version="1.0.0-prerelease.22415.6">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
- <Sha>e01e5b0aed54a5a8d9df74e717d1b13f0fb0e056</Sha>
+ <Sha>5e0b0da43f660de5798186f4fd3bc900fc90576c</Sha>
</Dependency>
- <Dependency Name="optimization.linux-x64.MIBC.Runtime" Version="1.0.0-prerelease.22375.7">
+ <Dependency Name="optimization.linux-x64.MIBC.Runtime" Version="1.0.0-prerelease.22415.6">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
- <Sha>e01e5b0aed54a5a8d9df74e717d1b13f0fb0e056</Sha>
+ <Sha>5e0b0da43f660de5798186f4fd3bc900fc90576c</Sha>
</Dependency>
- <Dependency Name="optimization.PGO.CoreCLR" Version="1.0.0-prerelease.22375.7">
+ <Dependency Name="optimization.PGO.CoreCLR" Version="1.0.0-prerelease.22415.6">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
- <Sha>e01e5b0aed54a5a8d9df74e717d1b13f0fb0e056</Sha>
+ <Sha>5e0b0da43f660de5798186f4fd3bc900fc90576c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="1.1.0-alpha.0.22415.2">
<Uri>https://github.com/dotnet/hotreload-utils</Uri>
@@ -286,5 +286,13 @@
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>3f2524bd65a6ab77b9160bcc23824dbc03990f3d</Sha>
</Dependency>
+ <Dependency Name="optimization.windows_nt-arm64.MIBC.Runtime" Version="1.0.0-prerelease.22415.6">
+ <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
+ <Sha>5e0b0da43f660de5798186f4fd3bc900fc90576c</Sha>
+ </Dependency>
+ <Dependency Name="optimization.linux-arm64.MIBC.Runtime" Version="1.0.0-prerelease.22415.6">
+ <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
+ <Sha>5e0b0da43f660de5798186f4fd3bc900fc90576c</Sha>
+ </Dependency>
</ToolsetDependencies>
</Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index d65a78f7e95..be4c1a93969 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -54,22 +54,22 @@
<!-- SDK dependencies -->
<MicrosoftDotNetApiCompatTaskVersion>7.0.100-rc.1.22402.1</MicrosoftDotNetApiCompatTaskVersion>
<!-- Arcade dependencies -->
- <MicrosoftDotNetApiCompatVersion>7.0.0-beta.22411.2</MicrosoftDotNetApiCompatVersion>
- <MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.22411.2</MicrosoftDotNetBuildTasksFeedVersion>
- <MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.22411.2</MicrosoftDotNetCodeAnalysisVersion>
- <MicrosoftDotNetGenAPIVersion>7.0.0-beta.22411.2</MicrosoftDotNetGenAPIVersion>
- <MicrosoftDotNetGenFacadesVersion>7.0.0-beta.22411.2</MicrosoftDotNetGenFacadesVersion>
- <MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.22411.2</MicrosoftDotNetXUnitExtensionsVersion>
- <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22411.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
- <MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.22411.2</MicrosoftDotNetBuildTasksArchivesVersion>
- <MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22411.2</MicrosoftDotNetBuildTasksInstallersVersion>
- <MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22411.2</MicrosoftDotNetBuildTasksPackagingVersion>
- <MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.22411.2</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
- <MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22411.2</MicrosoftDotNetBuildTasksTemplatingVersion>
- <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.22411.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
- <MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.22411.2</MicrosoftDotNetRemoteExecutorVersion>
- <MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.22411.2</MicrosoftDotNetVersionToolsTasksVersion>
- <MicrosoftDotNetPackageTestingVersion>7.0.0-beta.22411.2</MicrosoftDotNetPackageTestingVersion>
+ <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>
<!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
@@ -99,9 +99,9 @@
<SystemDataDataSetExtensionsVersion>4.5.0</SystemDataDataSetExtensionsVersion>
<SystemIOFileSystemAccessControlVersion>5.0.0</SystemIOFileSystemAccessControlVersion>
<SystemIOPipesAccessControlVersion>5.0.0</SystemIOPipesAccessControlVersion>
- <SystemMemoryVersion>4.5.4</SystemMemoryVersion>
+ <SystemMemoryVersion>4.5.5</SystemMemoryVersion>
<SystemNumericsVectorsVersion>4.5.0</SystemNumericsVectorsVersion>
- <SystemReflectionMetadataVersion>6.0.0</SystemReflectionMetadataVersion>
+ <SystemReflectionMetadataVersion>6.0.1</SystemReflectionMetadataVersion>
<SystemReflectionMetadataLoadContextVersion>4.7.1</SystemReflectionMetadataLoadContextVersion>
<SystemReflectionEmitVersion>4.7.0</SystemReflectionEmitVersion>
<SystemReflectionEmitILGenerationVersion>4.7.0</SystemReflectionEmitILGenerationVersion>
@@ -133,10 +133,12 @@
<SystemWindowsExtensionsTestDataVersion>7.0.0-beta.22415.3</SystemWindowsExtensionsTestDataVersion>
<MicrosoftDotNetCilStripSourcesVersion>7.0.0-beta.22415.3</MicrosoftDotNetCilStripSourcesVersion>
<!-- dotnet-optimization dependencies -->
- <optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.22375.7</optimizationwindows_ntx64MIBCRuntimeVersion>
- <optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.22375.7</optimizationwindows_ntx86MIBCRuntimeVersion>
- <optimizationlinuxx64MIBCRuntimeVersion>1.0.0-prerelease.22375.7</optimizationlinuxx64MIBCRuntimeVersion>
- <optimizationPGOCoreCLRVersion>1.0.0-prerelease.22375.7</optimizationPGOCoreCLRVersion>
+ <optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.22415.6</optimizationwindows_ntx64MIBCRuntimeVersion>
+ <optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.22415.6</optimizationwindows_ntx86MIBCRuntimeVersion>
+ <optimizationwindows_ntarm64MIBCRuntimeVersion>1.0.0-prerelease.22415.6</optimizationwindows_ntarm64MIBCRuntimeVersion>
+ <optimizationlinuxx64MIBCRuntimeVersion>1.0.0-prerelease.22415.6</optimizationlinuxx64MIBCRuntimeVersion>
+ <optimizationlinuxarm64MIBCRuntimeVersion>1.0.0-prerelease.22415.6</optimizationlinuxarm64MIBCRuntimeVersion>
+ <optimizationPGOCoreCLRVersion>1.0.0-prerelease.22415.6</optimizationPGOCoreCLRVersion>
<!-- Not auto-updated. -->
<MicrosoftDiaSymReaderNativeVersion>16.9.0-beta1.21055.5</MicrosoftDiaSymReaderNativeVersion>
<SystemCommandLineVersion>2.0.0-beta4.22355.1</SystemCommandLineVersion>
diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh
index d3b0ac3ba7b..032f5f19373 100755
--- a/eng/common/cross/build-rootfs.sh
+++ b/eng/common/cross/build-rootfs.sh
@@ -76,10 +76,10 @@ __FreeBSDPackages+=" openssl"
__FreeBSDPackages+=" krb5"
__FreeBSDPackages+=" terminfo-db"
-__IllumosPackages="icu-64.2nb2"
-__IllumosPackages+=" mit-krb5-1.16.2nb4"
-__IllumosPackages+=" openssl-1.1.1e"
-__IllumosPackages+=" zlib-1.2.11"
+__IllumosPackages="icu"
+__IllumosPackages+=" mit-krb5"
+__IllumosPackages+=" openssl"
+__IllumosPackages+=" zlib"
__HaikuPackages="gmp"
__HaikuPackages+=" gmp_devel"
@@ -390,14 +390,18 @@ elif [[ "$__CodeName" == "illumos" ]]; then
if [[ "$__UseMirror" == 1 ]]; then
BaseUrl=http://pkgsrc.smartos.skylime.net
fi
- BaseUrl="$BaseUrl/packages/SmartOS/2020Q1/${__illumosArch}/All"
+ BaseUrl="$BaseUrl/packages/SmartOS/trunk/${__illumosArch}/All"
+ echo "Downloading manifest"
+ wget "$BaseUrl"
echo "Downloading dependencies."
read -ra array <<<"$__IllumosPackages"
for package in "${array[@]}"; do
- echo "Installing $package..."
+ echo "Installing '$package'"
+ package="$(grep ">$package-[0-9]" All | sed -En 's/.*href="(.*)\.tgz".*/\1/p')"
+ echo "Resolved name '$package'"
wget "$BaseUrl"/"$package".tgz
ar -x "$package".tgz
- tar --skip-old-files -xzf "$package".tmp.tgz -C "$__RootfsDir" 2>/dev/null
+ tar --skip-old-files -xzf "$package".tmp.tg* -C "$__RootfsDir" 2>/dev/null
done
echo "Cleaning up temporary files."
popd
diff --git a/eng/common/generate-locproject.ps1 b/eng/common/generate-locproject.ps1
index afdd1750290..846e7950ce9 100644
--- a/eng/common/generate-locproject.ps1
+++ b/eng/common/generate-locproject.ps1
@@ -33,6 +33,8 @@ $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"
@@ -77,8 +79,7 @@ $locJson = @{
CopyOption = "LangIDOnPath"
OutputPath = "$($_.Directory.Parent.FullName | Resolve-Path -Relative)\"
}
- }
- else {
+ } else {
return @{
SourceFile = $sourceFile
CopyOption = "LangIDOnName"
@@ -88,6 +89,32 @@ $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 119a6c660d1..c35087a0601 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.1.0" -MemberType NoteProperty
+ $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.2.1" -MemberType NoteProperty
}
if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
$xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index f83a748c37e..aba6308ad31 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -365,8 +365,8 @@ 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.1.0&view=overview
- $defaultXCopyMSBuildVersion = '17.1.0'
+ # 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'
if (!$vsRequirements) {
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {
diff --git a/eng/native/configureplatform.cmake b/eng/native/configureplatform.cmake
index c7a38c3eee8..9f8ac48694b 100644
--- a/eng/native/configureplatform.cmake
+++ b/eng/native/configureplatform.cmake
@@ -2,7 +2,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/functions.cmake)
# If set, indicates that this is not an officially supported release.
# Release branches should set this to false.
-set(PRERELEASE 1)
+set(PRERELEASE 0)
#----------------------------------------
# Detect and set platform variable names
diff --git a/eng/nativepgo.targets b/eng/nativepgo.targets
index e6d58a33994..5dc312774e3 100644
--- a/eng/nativepgo.targets
+++ b/eng/nativepgo.targets
@@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
- <NativeOptimizationDataSupported Condition="'$(TargetOS)' == 'windows' And ('$(TargetArchitecture)' == 'x64' Or '$(TargetArchitecture)' == 'x86')">true</NativeOptimizationDataSupported>
- <NativeOptimizationDataSupported Condition="'$(TargetOS)' == 'Linux' And '$(TargetArchitecture)' == 'x64'">true</NativeOptimizationDataSupported>
+ <NativeOptimizationDataSupported Condition="'$(TargetOS)' == 'windows' And ('$(TargetArchitecture)' == 'x64' Or '$(TargetArchitecture)' == 'x86' Or '$(TargetArchitecture)' == 'arm64')">true</NativeOptimizationDataSupported>
+ <NativeOptimizationDataSupported Condition="'$(TargetOS)' == 'Linux' And ('$(TargetArchitecture)' == 'x64' Or '$(TargetArchitecture)' == 'arm64')">true</NativeOptimizationDataSupported>
<NativeOptimizationDataSupported Condition="'$(NoPgoOptimize)' == 'true'">false</NativeOptimizationDataSupported>
<NativeOptimizationDataSupported Condition="'$(Configuration)' != 'Release'">false</NativeOptimizationDataSupported>
@@ -16,14 +16,20 @@
<PackageReference Include="optimization.windows_nt-x86.PGO.CoreCLR"
Version="$(optimizationPGOCoreCLRVersion)"
GeneratePathProperty="true" />
+ <PackageReference Include="optimization.windows_nt-arm64.PGO.CoreCLR"
+ Version="$(optimizationPGOCoreCLRVersion)"
+ GeneratePathProperty="true" />
<PackageReference Include="optimization.linux-x64.PGO.CoreCLR"
Version="$(optimizationPGOCoreCLRVersion)"
GeneratePathProperty="true" />
+ <PackageReference Include="optimization.linux-arm64.PGO.CoreCLR"
+ Version="$(optimizationPGOCoreCLRVersion)"
+ GeneratePathProperty="true" />
</ItemGroup>
<!-- -->
- <!-- Task: GetPgoDataPackagePath -->
+ <!-- Task: GetPgoDataPackagePath -->
<!-- -->
<!-- Notes: -->
<!-- -->
diff --git a/eng/pipelines/coreclr/templates/run-performance-job.yml b/eng/pipelines/coreclr/templates/run-performance-job.yml
index d4e25aff3f4..218c8262ad5 100644
--- a/eng/pipelines/coreclr/templates/run-performance-job.yml
+++ b/eng/pipelines/coreclr/templates/run-performance-job.yml
@@ -64,29 +64,35 @@ jobs:
- HelixPerfUploadTokenValue: '$(PerfCommandUploadTokenLinux)'
- ${{ if and(notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.osGroup, 'windows')) }}:
- HelixPerfUploadTokenValue: '$(PerfCommandUploadToken)'
+ - ${{ if eq(parameters.runtimeType, 'wasm') }}:
+ - HelixPreCommandsWasmOnLinux: >-
+ sudo apt-get -y remove nodejs &&
+ curl -fsSL https://deb.nodesource.com/setup_14.x | sudo -E bash - &&
+ sudo apt-get -y install nodejs &&
+ npm install --prefix $HELIX_WORKITEM_PAYLOAD jsvu -g &&
+ $HELIX_WORKITEM_PAYLOAD/bin/jsvu --os=linux64 --engines=v8,javascriptcore
+ - ${{ if ne(parameters.runtimeType, 'wasm') }}:
+ - HelixPreCommandsWasmOnLinux: echo
- HelixPreCommandStemWindows: 'set ORIGPYPATH=%PYTHONPATH%;py -m pip install -U pip;py -3 -m venv %HELIX_WORKITEM_PAYLOAD%\.venv;call %HELIX_WORKITEM_PAYLOAD%\.venv\Scripts\activate.bat;set PYTHONPATH=;py -3 -m pip install -U pip;py -3 -m pip install azure.storage.blob==12.0.0;py -3 -m pip install azure.storage.queue==12.0.0;set "PERFLAB_UPLOAD_TOKEN=$(HelixPerfUploadTokenValue)"'
- HelixPreCommandStemLinux: >-
export ORIGPYPATH=$PYTHONPATH
export CRYPTOGRAPHY_ALLOW_OPENSSL_102=true;
echo "** Installing prerequistes **";
- python3 -m pip install -U pip &&
+ python3 -m pip install --user -U pip &&
sudo apt-get -y install python3-venv &&
python3 -m venv $HELIX_WORKITEM_PAYLOAD/.venv &&
ls -l $HELIX_WORKITEM_PAYLOAD/.venv/bin/activate &&
export PYTHONPATH= &&
- python3 -m pip install -U pip &&
- pip3 install azure.storage.blob==12.0.0 &&
- pip3 install azure.storage.queue==12.0.0 &&
+ python3 -m pip install --user -U pip &&
+ pip3 install --user azure.storage.blob==12.0.0 &&
+ pip3 install --user azure.storage.queue==12.0.0 &&
sudo apt-get update &&
sudo apt -y install curl dirmngr apt-transport-https lsb-release ca-certificates &&
- curl -fsSL https://deb.nodesource.com/setup_18.x | sudo -E bash - &&
- sudo apt-get -y install nodejs &&
- npm install --prefix $HELIX_WORKITEM_PAYLOAD jsvu -g &&
- $HELIX_WORKITEM_PAYLOAD/bin/jsvu --os=linux64 --engines=v8,javascriptcore &&
- export PERFLAB_UPLOAD_TOKEN="$(HelixPerfUploadTokenValue)" &&
- export PERF_PREREQS_INSTALLED=1;
- test "x$PERF_PREREQS_INSTALLED" = "x1" || echo "** Error: Failed to install prerequites **"
- - HelixPreCommandStemMusl: 'export ORIGPYPATH=$PYTHONPATH;sudo apk add icu-libs krb5-libs libgcc libintl libssl1.1 libstdc++ zlib cargo;sudo apk add libgdiplus --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing; python3 -m venv $HELIX_WORKITEM_PAYLOAD/.venv;source $HELIX_WORKITEM_PAYLOAD/.venv/bin/activate;export PYTHONPATH=;python3 -m pip install -U pip;pip3 install azure.storage.blob==12.7.1;pip3 install azure.storage.queue==12.1.5;export PERFLAB_UPLOAD_TOKEN="$(HelixPerfUploadTokenValue)"'
+ $(HelixPreCommandsWasmOnLinux) &&
+ export PERFLAB_UPLOAD_TOKEN="$(HelixPerfUploadTokenValue)"
+ || export PERF_PREREQS_INSTALL_FAILED=1;
+ test "x$PERF_PREREQS_INSTALL_FAILED" = "x1" && echo "** Error: Failed to install prerequites **"
+ - HelixPreCommandStemMusl: 'export ORIGPYPATH=$PYTHONPATH;sudo apk add icu-libs krb5-libs libgcc libintl libssl1.1 libstdc++ zlib cargo;sudo apk add libgdiplus --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing; python3 -m venv $HELIX_WORKITEM_PAYLOAD/.venv;source $HELIX_WORKITEM_PAYLOAD/.venv/bin/activate;export PYTHONPATH=;python3 -m pip install --user -U pip;pip3 install --user azure.storage.blob==12.7.1;pip3 install --user azure.storage.queue==12.1.5;export PERFLAB_UPLOAD_TOKEN="$(HelixPerfUploadTokenValue)"'
- ExtraMSBuildLogsWindows: 'set MSBUILDDEBUGCOMM=1;set "MSBUILDDEBUGPATH=%HELIX_WORKITEM_UPLOAD_ROOT%"'
- ExtraMSBuildLogsLinux: 'export MSBUILDDEBUGCOMM=1;export "MSBUILDDEBUGPATH=$HELIX_WORKITEM_UPLOAD_ROOT"'
- HelixPreCommand: ''
diff --git a/eng/pipelines/mono/templates/workloads-build.yml b/eng/pipelines/mono/templates/workloads-build.yml
index 28fb20114c8..19a56febb53 100644
--- a/eng/pipelines/mono/templates/workloads-build.yml
+++ b/eng/pipelines/mono/templates/workloads-build.yml
@@ -56,6 +56,8 @@ jobs:
IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm*.nupkg
IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NETCore.App.Runtime.Mono.android-*.nupkg
IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NETCore.App.Runtime.Mono.browser-wasm*.nupkg
+ IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NETCore.App.Runtime.Mono.multithread.browser-wasm*.nupkg
+ IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NETCore.App.Runtime.Mono.perftrace.browser-wasm*.nupkg
IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NETCore.App.Runtime.Mono.ios-*.nupkg
IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NETCore.App.Runtime.Mono.iossimulator-*.nupkg
IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NETCore.App.Runtime.Mono.maccatalyst-*.nupkg
diff --git a/eng/restore/optimizationData.targets b/eng/restore/optimizationData.targets
index 2072c6a28d2..9d8717803f1 100644
--- a/eng/restore/optimizationData.targets
+++ b/eng/restore/optimizationData.targets
@@ -3,7 +3,9 @@
<!-- Mibc data to use when exact architecture match is available -->
<MIBCPackageDef Include="optimization.windows_nt-x86.mibc.runtime" Version="$(optimizationwindows_ntx86MIBCRuntimeVersion)" MibcArchitecture="Windows/x86"/>
<MIBCPackageDef Include="optimization.windows_nt-x64.mibc.runtime" Version="$(optimizationwindows_ntx64MIBCRuntimeVersion)" MibcArchitecture="Windows/x64"/>
+ <MIBCPackageDef Include="optimization.windows_nt-arm64.mibc.runtime" Version="$(optimizationwindows_ntarm64MIBCRuntimeVersion)" MibcArchitecture="Windows/arm64"/>
<MIBCPackageDef Include="optimization.linux-x64.mibc.runtime" Version="$(optimizationlinuxx64MIBCRuntimeVersion)" MibcArchitecture="Linux/x64"/>
+ <MIBCPackageDef Include="optimization.linux-arm64.mibc.runtime" Version="$(optimizationlinuxarm64MIBCRuntimeVersion)" MibcArchitecture="Linux/arm64"/>
<!-- Mibc data to use when exact architecture match not available -->
<MIBCPackageDef Include="optimization.windows_nt-x64.mibc.runtime" Version="$(optimizationwindows_ntx64MIBCRuntimeVersion)" MibcArchitecture="Windows"/>
diff --git a/eng/testing/performance/microbenchmarks.proj b/eng/testing/performance/microbenchmarks.proj
index 1331e1e7a81..3793751775f 100644
--- a/eng/testing/performance/microbenchmarks.proj
+++ b/eng/testing/performance/microbenchmarks.proj
@@ -132,10 +132,10 @@
<PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
<PreCommands Condition="'$(Compare)' == 'true'">$(WorkItemCommand) --bdn-artifacts $(BaselineArtifactsDirectory) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(BaselineCoreRunArgument) --partition-count $(PartitionCount) --partition-index %(HelixWorkItem.Index)"</PreCommands>
<Command Condition="'$(AGENT_OS)' != 'Windows_NT'">
- if [ "x$PERF_PREREQS_INSTALLED" = "x1" ]; then
- $(WorkItemCommand) --bdn-artifacts $(ArtifactsDirectory) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(CoreRunArgument) --partition-count $(PartitionCount) --partition-index %(HelixWorkItem.Index)";
+ if [ "x$PERF_PREREQS_INSTALL_FAILED" = "x1" ]; then
+ echo "\n\n** Error: Failed to install prerequisites **\n\n"; (exit 1);
else
- echo "\n\n** Error: Failed to install prerequisites **\n\n"; export _commandExitCode=1;
+ $(WorkItemCommand) --bdn-artifacts $(ArtifactsDirectory) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(CoreRunArgument) --partition-count $(PartitionCount) --partition-index %(HelixWorkItem.Index)";
fi</Command>
<Command Condition="'$(AGENT_OS)' == 'Windows_NT'">$(WorkItemCommand) --bdn-artifacts $(ArtifactsDirectory) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(CoreRunArgument) --partition-count $(PartitionCount) --partition-index %(HelixWorkItem.Index)"</Command>
<PostCommands Condition="'$(Compare)' == 'true'">$(DotnetExe) run -f $(PERFLAB_Framework) -p $(ResultsComparer) --base $(BaselineArtifactsDirectory) --diff $(ArtifactsDirectory) --threshold 2$(Percent) --xml $(XMLResults);$(FinalCommand)</PostCommands>
@@ -148,10 +148,10 @@
<PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
<PreCommands Condition="'$(Compare)' == 'true'">$(WorkItemCommand) --bdn-artifacts $(BaselineArtifactsDirectory) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(BaselineCoreRunArgument)"</PreCommands>
<Command Condition="'$(AGENT_OS)' != 'Windows_NT'">
- if [ "x$PERF_PREREQS_INSTALLED" = "x1" ]; then
- $(WorkItemCommand) --bdn-artifacts $(ArtifactsDirectory) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(CoreRunArgument)";
+ if [ "x$PERF_PREREQS_INSTALL_FAILED" = "x1" ]; then
+ echo "\n\n** Error: Failed to install prerequisites **\n\n"; (exit 1);
else
- echo "\n\n** Error: Failed to install prerequisites **\n\n"; export _commandExitCode=1;
+ $(WorkItemCommand) --bdn-artifacts $(ArtifactsDirectory) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(CoreRunArgument)";
fi</Command>
<Command Condition="'$(AGENT_OS)' == 'Windows_NT'">$(WorkItemCommand) --bdn-artifacts $(ArtifactsDirectory) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(CoreRunArgument)"</Command>
<PostCommands Condition="'$(Compare)' == 'true'">$(DotnetExe) run -f $(PERFLAB_Framework) -p $(ResultsComparer) --base $(BaselineArtifactsDirectory) --diff $(ArtifactsDirectory) --threshold 2$(Percent) --xml $(XMLResults)</PostCommands>