From 3d7d087bbd56824cde5a9c1396aad1e103faa423 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
<41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 16 Aug 2022 18:27:57 -0700
Subject: Product dependencies in Versions.props must be on the latest patch
version for libraries dependencies (#74024)
Co-authored-by: carlossanlop <1175054+carlossanlop@users.noreply.github.com>
---
eng/Versions.props | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'eng')
diff --git a/eng/Versions.props b/eng/Versions.props
index 72f17c83aa2..fcf8192c891 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -99,9 +99,9 @@
4.5.0
5.0.0
5.0.0
- 4.5.4
+ 4.5.5
4.5.0
- 6.0.0
+ 6.0.1
4.7.1
4.7.0
4.7.0
--
cgit v1.2.3
From 02789c34d69d864206e41325dcf2adfb7efda298 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
<41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 17 Aug 2022 10:49:56 -0700
Subject: [release/7.0-rc1] Workload changes - account for SDK bands and use
archives (#74054)
* Update arcade to 7.0.0-beta.22416.1
* Port workload changes from release/6.0
* workloads: Add multithread, and perftrace runtime packs for wasm workload
* Mono.ToolChain.Manifest short name
* Change order of shortnames
Co-authored-by: Juan Sebastian Hoyos Ayala
Co-authored-by: Jacques Eloff
Co-authored-by: Ankit Jain
---
eng/Version.Details.xml | 76 ++++++++++++------------
eng/Versions.props | 32 +++++-----
eng/common/cross/build-rootfs.sh | 18 +++---
eng/common/generate-locproject.ps1 | 31 +++++++++-
eng/common/sdk-task.ps1 | 2 +-
eng/common/tools.ps1 | 4 +-
eng/pipelines/mono/templates/workloads-build.yml | 2 +
7 files changed, 99 insertions(+), 66 deletions(-)
(limited to 'eng')
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 6ab177bb875..1cc5ed7d3b6 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -54,77 +54,77 @@
-
+
https://github.com/dotnet/arcade
- 6a638cd0c13962ab2a1943cb1c878be5a41dd82e
+ afc901d73d7d3bd363547ddf8769efe14052bfa7
-
+
https://github.com/dotnet/arcade
- 6a638cd0c13962ab2a1943cb1c878be5a41dd82e
+ afc901d73d7d3bd363547ddf8769efe14052bfa7
-
+
https://github.com/dotnet/arcade
- 6a638cd0c13962ab2a1943cb1c878be5a41dd82e
+ afc901d73d7d3bd363547ddf8769efe14052bfa7
-
+
https://github.com/dotnet/arcade
- 6a638cd0c13962ab2a1943cb1c878be5a41dd82e
+ afc901d73d7d3bd363547ddf8769efe14052bfa7
-
+
https://github.com/dotnet/arcade
- 6a638cd0c13962ab2a1943cb1c878be5a41dd82e
+ afc901d73d7d3bd363547ddf8769efe14052bfa7
-
+
https://github.com/dotnet/arcade
- 6a638cd0c13962ab2a1943cb1c878be5a41dd82e
+ afc901d73d7d3bd363547ddf8769efe14052bfa7
-
+
https://github.com/dotnet/arcade
- 6a638cd0c13962ab2a1943cb1c878be5a41dd82e
+ afc901d73d7d3bd363547ddf8769efe14052bfa7
-
+
https://github.com/dotnet/arcade
- 6a638cd0c13962ab2a1943cb1c878be5a41dd82e
+ afc901d73d7d3bd363547ddf8769efe14052bfa7
-
+
https://github.com/dotnet/arcade
- 6a638cd0c13962ab2a1943cb1c878be5a41dd82e
+ afc901d73d7d3bd363547ddf8769efe14052bfa7
-
+
https://github.com/dotnet/arcade
- 6a638cd0c13962ab2a1943cb1c878be5a41dd82e
+ afc901d73d7d3bd363547ddf8769efe14052bfa7
-
+
https://github.com/dotnet/arcade
- 6a638cd0c13962ab2a1943cb1c878be5a41dd82e
+ afc901d73d7d3bd363547ddf8769efe14052bfa7
-
+
https://github.com/dotnet/arcade
- 6a638cd0c13962ab2a1943cb1c878be5a41dd82e
+ afc901d73d7d3bd363547ddf8769efe14052bfa7
-
+
https://github.com/dotnet/arcade
- 6a638cd0c13962ab2a1943cb1c878be5a41dd82e
+ afc901d73d7d3bd363547ddf8769efe14052bfa7
-
+
https://github.com/dotnet/arcade
- 6a638cd0c13962ab2a1943cb1c878be5a41dd82e
+ afc901d73d7d3bd363547ddf8769efe14052bfa7
-
+
https://github.com/dotnet/arcade
- 6a638cd0c13962ab2a1943cb1c878be5a41dd82e
+ afc901d73d7d3bd363547ddf8769efe14052bfa7
-
+
https://github.com/dotnet/arcade
- 6a638cd0c13962ab2a1943cb1c878be5a41dd82e
+ afc901d73d7d3bd363547ddf8769efe14052bfa7
-
+
https://github.com/dotnet/arcade
- 6a638cd0c13962ab2a1943cb1c878be5a41dd82e
+ afc901d73d7d3bd363547ddf8769efe14052bfa7
-
+
https://github.com/dotnet/arcade
- 6a638cd0c13962ab2a1943cb1c878be5a41dd82e
+ afc901d73d7d3bd363547ddf8769efe14052bfa7
https://github.com/dotnet/runtime-assets
@@ -250,9 +250,9 @@
https://github.com/dotnet/xharness
5ebf69650b9f7b4ecab485be840b3022420f7812
-
+
https://github.com/dotnet/arcade
- 6a638cd0c13962ab2a1943cb1c878be5a41dd82e
+ afc901d73d7d3bd363547ddf8769efe14052bfa7
https://dev.azure.com/dnceng/internal/_git/dotnet-optimization
diff --git a/eng/Versions.props b/eng/Versions.props
index fcf8192c891..d3c7704dab4 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -54,22 +54,22 @@
7.0.100-rc.1.22402.1
- 7.0.0-beta.22411.2
- 7.0.0-beta.22411.2
- 7.0.0-beta.22411.2
- 7.0.0-beta.22411.2
- 7.0.0-beta.22411.2
- 7.0.0-beta.22411.2
- 2.5.1-beta.22411.2
- 7.0.0-beta.22411.2
- 7.0.0-beta.22411.2
- 7.0.0-beta.22411.2
- 7.0.0-beta.22411.2
- 7.0.0-beta.22411.2
- 7.0.0-beta.22411.2
- 7.0.0-beta.22411.2
- 7.0.0-beta.22411.2
- 7.0.0-beta.22411.2
+ 7.0.0-beta.22416.1
+ 7.0.0-beta.22416.1
+ 7.0.0-beta.22416.1
+ 7.0.0-beta.22416.1
+ 7.0.0-beta.22416.1
+ 7.0.0-beta.22416.1
+ 2.5.1-beta.22416.1
+ 7.0.0-beta.22416.1
+ 7.0.0-beta.22416.1
+ 7.0.0-beta.22416.1
+ 7.0.0-beta.22416.1
+ 7.0.0-beta.22416.1
+ 7.0.0-beta.22416.1
+ 7.0.0-beta.22416.1
+ 7.0.0-beta.22416.1
+ 7.0.0-beta.22416.1
6.0.0-preview.1.102
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/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
--
cgit v1.2.3
From d4b85caa22dacfa1bd2b60db882a445038b435c9 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
<41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 17 Aug 2022 16:38:55 -0700
Subject: [release/7.0-rc1] perf pipeline: Switch to node 14.x (#74089)
* perf pipeline: Switch to node 14.x
- Switch to node 14.x instead of 18.x, because the latter doesn't seem
to be compatible with ubuntu 18.x:
`node: /lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.28' not found (required by node)`
- Also, remove the existing `nodejs` package before installing a new
one, because these machines are shared, and would get affected by
installations performed by other runs.
* perf pipeline: install wasm pre-reqs only on wasm jobs
* perf pipeline: correctly return exit code, so helix can pick that up and set _commandExitCode
* Set a default value for non-wasm cases
* Change the prereqs condition so a failure needs to be explicitly marked
This allows cases which don't care about this, to continue working,
because they won't set `$PERF_PREREQS_INSTALL_FAILED`, and default to
continuing with the job.
* Use --user with pip install
* Update eng/testing/performance/microbenchmarks.proj
Co-authored-by: Ankit Jain
---
.../coreclr/templates/run-performance-job.yml | 30 +++++++++++++---------
eng/testing/performance/microbenchmarks.proj | 12 ++++-----
2 files changed, 24 insertions(+), 18 deletions(-)
(limited to 'eng')
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/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 @@
$(WorkItemDirectory)
$(WorkItemCommand) --bdn-artifacts $(BaselineArtifactsDirectory) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(BaselineCoreRunArgument) --partition-count $(PartitionCount) --partition-index %(HelixWorkItem.Index)"
- 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
$(WorkItemCommand) --bdn-artifacts $(ArtifactsDirectory) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(CoreRunArgument) --partition-count $(PartitionCount) --partition-index %(HelixWorkItem.Index)"
$(DotnetExe) run -f $(PERFLAB_Framework) -p $(ResultsComparer) --base $(BaselineArtifactsDirectory) --diff $(ArtifactsDirectory) --threshold 2$(Percent) --xml $(XMLResults);$(FinalCommand)
@@ -148,10 +148,10 @@
$(WorkItemDirectory)
$(WorkItemCommand) --bdn-artifacts $(BaselineArtifactsDirectory) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(BaselineCoreRunArgument)"
- 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
$(WorkItemCommand) --bdn-artifacts $(ArtifactsDirectory) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(CoreRunArgument)"
$(DotnetExe) run -f $(PERFLAB_Framework) -p $(ResultsComparer) --base $(BaselineArtifactsDirectory) --diff $(ArtifactsDirectory) --threshold 2$(Percent) --xml $(XMLResults)
--
cgit v1.2.3
From 7ea346d9a8b638862489e9a0debfdce26eb96108 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
<41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 17 Aug 2022 19:44:56 -0700
Subject: [release/7.0-rc1] Add Arm64 PGO/IBC to Windows and Linux builds
(#74098)
* Add Arm64 PGO/IBC to Windows and Linux builds
* WIP
* Update opt data package version
Co-authored-by: Drew Scoggins
---
eng/Version.Details.xml | 24 ++++++++++++++++--------
eng/Versions.props | 10 ++++++----
eng/nativepgo.targets | 12 +++++++++---
eng/restore/optimizationData.targets | 2 ++
4 files changed, 33 insertions(+), 15 deletions(-)
(limited to 'eng')
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 1cc5ed7d3b6..394b058cb4b 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -254,21 +254,21 @@
https://github.com/dotnet/arcade
afc901d73d7d3bd363547ddf8769efe14052bfa7
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-optimization
- e01e5b0aed54a5a8d9df74e717d1b13f0fb0e056
+ 5e0b0da43f660de5798186f4fd3bc900fc90576c
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-optimization
- e01e5b0aed54a5a8d9df74e717d1b13f0fb0e056
+ 5e0b0da43f660de5798186f4fd3bc900fc90576c
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-optimization
- e01e5b0aed54a5a8d9df74e717d1b13f0fb0e056
+ 5e0b0da43f660de5798186f4fd3bc900fc90576c
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-optimization
- e01e5b0aed54a5a8d9df74e717d1b13f0fb0e056
+ 5e0b0da43f660de5798186f4fd3bc900fc90576c
https://github.com/dotnet/hotreload-utils
@@ -286,5 +286,13 @@
https://github.com/dotnet/sdk
3f2524bd65a6ab77b9160bcc23824dbc03990f3d
+
+ https://dev.azure.com/dnceng/internal/_git/dotnet-optimization
+ 5e0b0da43f660de5798186f4fd3bc900fc90576c
+
+
+ https://dev.azure.com/dnceng/internal/_git/dotnet-optimization
+ 5e0b0da43f660de5798186f4fd3bc900fc90576c
+
diff --git a/eng/Versions.props b/eng/Versions.props
index d3c7704dab4..0a1d7ed3b2f 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -133,10 +133,12 @@
7.0.0-beta.22409.1
7.0.0-beta.22409.1
- 1.0.0-prerelease.22375.7
- 1.0.0-prerelease.22375.7
- 1.0.0-prerelease.22375.7
- 1.0.0-prerelease.22375.7
+ 1.0.0-prerelease.22415.6
+ 1.0.0-prerelease.22415.6
+ 1.0.0-prerelease.22415.6
+ 1.0.0-prerelease.22415.6
+ 1.0.0-prerelease.22415.6
+ 1.0.0-prerelease.22415.6
16.9.0-beta1.21055.5
2.0.0-beta4.22355.1
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 @@
- true
- true
+ true
+ true
false
false
@@ -16,14 +16,20 @@
+
+
-
+
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 @@
+
+
--
cgit v1.2.3
From 7ab10ff615cd8782c42166e91cd0db0ff893499a Mon Sep 17 00:00:00 2001
From: Carlos Sanchez <1175054+carlossanlop@users.noreply.github.com>
Date: Wed, 17 Aug 2022 19:50:01 -0700
Subject: [release/7.0-rc1] Set configureplatform.make prerelease to 0 (#74103)
---
eng/native/configureplatform.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'eng')
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
--
cgit v1.2.3