From 40e5371010b5031b5bdd538f50cb7c43d5088a8d Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 25 Jan 2024 11:02:50 -0800 Subject: [PATCH 01/19] Add preview 1 to the table --- README.md | 110 +++++++++++++++--- .../TableGenerator/Program.fs | 3 + 2 files changed, 97 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 58f160035..58c25c670 100644 --- a/README.md +++ b/README.md @@ -169,25 +169,24 @@ With development builds, internal NuGet feeds are necessary for some scenarios ( Do not directly edit the table below. Use https://github.com/dotnet/installer/tree/main/tools/sdk-readme-table-generator to help you generate it. Make sure to run the table generator test and make any changes to the generator along with your changes to the table. Daily servicing builds aren't shown here because they may contain upcoming security fixes. All public servicing builds can be downloaded at http://aka.ms/dotnet-download. ### Table -*Note* the 8.0.100 build will be finished internally starting in mid-October. Use 'dotnet --help' to see available commands or visit: https://aka.ms/dotnet-cli -------------------------------------------------------------------------------------- -| Platform | main
(9.0.x Runtime) | 8.0.3xx
(8.0 Runtime) | Release/7.0.4xx
(7.0.x Runtime) | -| :--------- | :----------: | :----------: | :----------: | -| **Windows x64** | [![][win-x64-badge-main]][win-x64-version-main]
[Installer][win-x64-installer-main] - [Checksum][win-x64-installer-checksum-main]
[zip][win-x64-zip-main] - [Checksum][win-x64-zip-checksum-main] | [![][win-x64-badge-8.0.3XX]][win-x64-version-8.0.3XX]
[Installer][win-x64-installer-8.0.3XX] - [Checksum][win-x64-installer-checksum-8.0.3XX]
[zip][win-x64-zip-8.0.3XX] - [Checksum][win-x64-zip-checksum-8.0.3XX] | [![][win-x64-badge-7.0.4XX]][win-x64-version-7.0.4XX]
[Installer][win-x64-installer-7.0.4XX] - [Checksum][win-x64-installer-checksum-7.0.4XX]
[zip][win-x64-zip-7.0.4XX] - [Checksum][win-x64-zip-checksum-7.0.4XX] | -| **Windows x86** | [![][win-x86-badge-main]][win-x86-version-main]
[Installer][win-x86-installer-main] - [Checksum][win-x86-installer-checksum-main]
[zip][win-x86-zip-main] - [Checksum][win-x86-zip-checksum-main] | [![][win-x86-badge-8.0.3XX]][win-x86-version-8.0.3XX]
[Installer][win-x86-installer-8.0.3XX] - [Checksum][win-x86-installer-checksum-8.0.3XX]
[zip][win-x86-zip-8.0.3XX] - [Checksum][win-x86-zip-checksum-8.0.3XX] | [![][win-x86-badge-7.0.4XX]][win-x86-version-7.0.4XX]
[Installer][win-x86-installer-7.0.4XX] - [Checksum][win-x86-installer-checksum-7.0.4XX]
[zip][win-x86-zip-7.0.4XX] - [Checksum][win-x86-zip-checksum-7.0.4XX] | -| **Windows arm** | **N/A** | **N/A** | **N/A** | -| **Windows arm64** | [![][win-arm64-badge-main]][win-arm64-version-main]
[Installer][win-arm64-installer-main] - [Checksum][win-arm64-installer-checksum-main]
[zip][win-arm64-zip-main] | [![][win-arm64-badge-8.0.3XX]][win-arm64-version-8.0.3XX]
[Installer][win-arm64-installer-8.0.3XX] - [Checksum][win-arm64-installer-checksum-8.0.3XX]
[zip][win-arm64-zip-8.0.3XX] | [![][win-arm64-badge-7.0.4XX]][win-arm64-version-7.0.4XX]
[Installer][win-arm64-installer-7.0.4XX] - [Checksum][win-arm64-installer-checksum-7.0.4XX]
[zip][win-arm64-zip-7.0.4XX] | -| **macOS x64** | [![][osx-x64-badge-main]][osx-x64-version-main]
[Installer][osx-x64-installer-main] - [Checksum][osx-x64-installer-checksum-main]
[tar.gz][osx-x64-targz-main] - [Checksum][osx-x64-targz-checksum-main] | [![][osx-x64-badge-8.0.3XX]][osx-x64-version-8.0.3XX]
[Installer][osx-x64-installer-8.0.3XX] - [Checksum][osx-x64-installer-checksum-8.0.3XX]
[tar.gz][osx-x64-targz-8.0.3XX] - [Checksum][osx-x64-targz-checksum-8.0.3XX] | [![][osx-x64-badge-7.0.4XX]][osx-x64-version-7.0.4XX]
[Installer][osx-x64-installer-7.0.4XX] - [Checksum][osx-x64-installer-checksum-7.0.4XX]
[tar.gz][osx-x64-targz-7.0.4XX] - [Checksum][osx-x64-targz-checksum-7.0.4XX] | -| **macOS arm64** | [![][osx-arm64-badge-main]][osx-arm64-version-main]
[Installer][osx-arm64-installer-main] - [Checksum][osx-arm64-installer-checksum-main]
[tar.gz][osx-arm64-targz-main] - [Checksum][osx-arm64-targz-checksum-main] | [![][osx-arm64-badge-8.0.3XX]][osx-arm64-version-8.0.3XX]
[Installer][osx-arm64-installer-8.0.3XX] - [Checksum][osx-arm64-installer-checksum-8.0.3XX]
[tar.gz][osx-arm64-targz-8.0.3XX] - [Checksum][osx-arm64-targz-checksum-8.0.3XX] | [![][osx-arm64-badge-7.0.4XX]][osx-arm64-version-7.0.4XX]
[Installer][osx-arm64-installer-7.0.4XX] - [Checksum][osx-arm64-installer-checksum-7.0.4XX]
[tar.gz][osx-arm64-targz-7.0.4XX] - [Checksum][osx-arm64-targz-checksum-7.0.4XX] | -| **Linux x64** | [![][linux-badge-main]][linux-version-main]
[DEB Installer][linux-DEB-installer-main] - [Checksum][linux-DEB-installer-checksum-main]
[RPM Installer][linux-RPM-installer-main] - [Checksum][linux-RPM-installer-checksum-main]
_see installer note below_1
[tar.gz][linux-targz-main] - [Checksum][linux-targz-checksum-main] | [![][linux-badge-8.0.3XX]][linux-version-8.0.3XX]
[DEB Installer][linux-DEB-installer-8.0.3XX] - [Checksum][linux-DEB-installer-checksum-8.0.3XX]
[RPM Installer][linux-RPM-installer-8.0.3XX] - [Checksum][linux-RPM-installer-checksum-8.0.3XX]
_see installer note below_1
[tar.gz][linux-targz-8.0.3XX] - [Checksum][linux-targz-checksum-8.0.3XX] | [![][linux-badge-7.0.4XX]][linux-version-7.0.4XX]
[DEB Installer][linux-DEB-installer-7.0.4XX] - [Checksum][linux-DEB-installer-checksum-7.0.4XX]
[RPM Installer][linux-RPM-installer-7.0.4XX] - [Checksum][linux-RPM-installer-checksum-7.0.4XX]
_see installer note below_1
[tar.gz][linux-targz-7.0.4XX] - [Checksum][linux-targz-checksum-7.0.4XX] | -| **Linux arm** | [![][linux-arm-badge-main]][linux-arm-version-main]
[tar.gz][linux-arm-targz-main] - [Checksum][linux-arm-targz-checksum-main] | [![][linux-arm-badge-8.0.3XX]][linux-arm-version-8.0.3XX]
[tar.gz][linux-arm-targz-8.0.3XX] - [Checksum][linux-arm-targz-checksum-8.0.3XX] | [![][linux-arm-badge-7.0.4XX]][linux-arm-version-7.0.4XX]
[tar.gz][linux-arm-targz-7.0.4XX] - [Checksum][linux-arm-targz-checksum-7.0.4XX] | -| **Linux arm64** | [![][linux-arm64-badge-main]][linux-arm64-version-main]
[tar.gz][linux-arm64-targz-main] - [Checksum][linux-arm64-targz-checksum-main] | [![][linux-arm64-badge-8.0.3XX]][linux-arm64-version-8.0.3XX]
[tar.gz][linux-arm64-targz-8.0.3XX] - [Checksum][linux-arm64-targz-checksum-8.0.3XX] | [![][linux-arm64-badge-7.0.4XX]][linux-arm64-version-7.0.4XX]
[tar.gz][linux-arm64-targz-7.0.4XX] - [Checksum][linux-arm64-targz-checksum-7.0.4XX] | -| **Linux-musl-x64** | [![][linux-musl-x64-badge-main]][linux-musl-x64-version-main]
[tar.gz][linux-musl-x64-targz-main] - [Checksum][linux-musl-x64-targz-checksum-main] | [![][linux-musl-x64-badge-8.0.3XX]][linux-musl-x64-version-8.0.3XX]
[tar.gz][linux-musl-x64-targz-8.0.3XX] - [Checksum][linux-musl-x64-targz-checksum-8.0.3XX] | [![][linux-musl-x64-badge-7.0.4XX]][linux-musl-x64-version-7.0.4XX]
[tar.gz][linux-musl-x64-targz-7.0.4XX] - [Checksum][linux-musl-x64-targz-checksum-7.0.4XX] | -| **Linux-musl-arm** | [![][linux-musl-arm-badge-main]][linux-musl-arm-version-main]
[tar.gz][linux-musl-arm-targz-main] - [Checksum][linux-musl-arm-targz-checksum-main] | [![][linux-musl-arm-badge-8.0.3XX]][linux-musl-arm-version-8.0.3XX]
[tar.gz][linux-musl-arm-targz-8.0.3XX] - [Checksum][linux-musl-arm-targz-checksum-8.0.3XX] | [![][linux-musl-arm-badge-7.0.4XX]][linux-musl-arm-version-7.0.4XX]
[tar.gz][linux-musl-arm-targz-7.0.4XX] - [Checksum][linux-musl-arm-targz-checksum-7.0.4XX] | -| **Linux-musl-arm64** | [![][linux-musl-arm64-badge-main]][linux-musl-arm64-version-main]
[tar.gz][linux-musl-arm64-targz-main] - [Checksum][linux-musl-arm64-targz-checksum-main] | [![][linux-musl-arm64-badge-8.0.3XX]][linux-musl-arm64-version-8.0.3XX]
[tar.gz][linux-musl-arm64-targz-8.0.3XX] - [Checksum][linux-musl-arm64-targz-checksum-8.0.3XX] | [![][linux-musl-arm64-badge-7.0.4XX]][linux-musl-arm64-version-7.0.4XX]
[tar.gz][linux-musl-arm64-targz-7.0.4XX] - [Checksum][linux-musl-arm64-targz-checksum-7.0.4XX] | -| **RHEL 6** | **N/A** | **N/A** | **N/A** | +| Platform | main
(9.0.x Runtime) | 9.0.1xx-preview1
(9.0-preview1 Runtime) | 8.0.3xx
(8.0 Runtime) | Release/7.0.4xx
(7.0.x Runtime) | +| :--------- | :----------: | :----------: | :----------: | :----------: | +| **Windows x64** | [![][win-x64-badge-main]][win-x64-version-main]
[Installer][win-x64-installer-main] - [Checksum][win-x64-installer-checksum-main]
[zip][win-x64-zip-main] - [Checksum][win-x64-zip-checksum-main] | [![][win-x64-badge-9.0.1XX-preview1]][win-x64-version-9.0.1XX-preview1]
[Installer][win-x64-installer-9.0.1XX-preview1] - [Checksum][win-x64-installer-checksum-9.0.1XX-preview1]
[zip][win-x64-zip-9.0.1XX-preview1] - [Checksum][win-x64-zip-checksum-9.0.1XX-preview1] | [![][win-x64-badge-8.0.3XX]][win-x64-version-8.0.3XX]
[Installer][win-x64-installer-8.0.3XX] - [Checksum][win-x64-installer-checksum-8.0.3XX]
[zip][win-x64-zip-8.0.3XX] - [Checksum][win-x64-zip-checksum-8.0.3XX] | [![][win-x64-badge-7.0.4XX]][win-x64-version-7.0.4XX]
[Installer][win-x64-installer-7.0.4XX] - [Checksum][win-x64-installer-checksum-7.0.4XX]
[zip][win-x64-zip-7.0.4XX] - [Checksum][win-x64-zip-checksum-7.0.4XX] | +| **Windows x86** | [![][win-x86-badge-main]][win-x86-version-main]
[Installer][win-x86-installer-main] - [Checksum][win-x86-installer-checksum-main]
[zip][win-x86-zip-main] - [Checksum][win-x86-zip-checksum-main] | [![][win-x86-badge-9.0.1XX-preview1]][win-x86-version-9.0.1XX-preview1]
[Installer][win-x86-installer-9.0.1XX-preview1] - [Checksum][win-x86-installer-checksum-9.0.1XX-preview1]
[zip][win-x86-zip-9.0.1XX-preview1] - [Checksum][win-x86-zip-checksum-9.0.1XX-preview1] | [![][win-x86-badge-8.0.3XX]][win-x86-version-8.0.3XX]
[Installer][win-x86-installer-8.0.3XX] - [Checksum][win-x86-installer-checksum-8.0.3XX]
[zip][win-x86-zip-8.0.3XX] - [Checksum][win-x86-zip-checksum-8.0.3XX] | [![][win-x86-badge-7.0.4XX]][win-x86-version-7.0.4XX]
[Installer][win-x86-installer-7.0.4XX] - [Checksum][win-x86-installer-checksum-7.0.4XX]
[zip][win-x86-zip-7.0.4XX] - [Checksum][win-x86-zip-checksum-7.0.4XX] | +| **Windows arm** | **N/A** | **N/A** | **N/A** | **N/A** | +| **Windows arm64** | [![][win-arm64-badge-main]][win-arm64-version-main]
[Installer][win-arm64-installer-main] - [Checksum][win-arm64-installer-checksum-main]
[zip][win-arm64-zip-main] | [![][win-arm64-badge-9.0.1XX-preview1]][win-arm64-version-9.0.1XX-preview1]
[Installer][win-arm64-installer-9.0.1XX-preview1] - [Checksum][win-arm64-installer-checksum-9.0.1XX-preview1]
[zip][win-arm64-zip-9.0.1XX-preview1] | [![][win-arm64-badge-8.0.3XX]][win-arm64-version-8.0.3XX]
[Installer][win-arm64-installer-8.0.3XX] - [Checksum][win-arm64-installer-checksum-8.0.3XX]
[zip][win-arm64-zip-8.0.3XX] | [![][win-arm64-badge-7.0.4XX]][win-arm64-version-7.0.4XX]
[Installer][win-arm64-installer-7.0.4XX] - [Checksum][win-arm64-installer-checksum-7.0.4XX]
[zip][win-arm64-zip-7.0.4XX] | +| **macOS x64** | [![][osx-x64-badge-main]][osx-x64-version-main]
[Installer][osx-x64-installer-main] - [Checksum][osx-x64-installer-checksum-main]
[tar.gz][osx-x64-targz-main] - [Checksum][osx-x64-targz-checksum-main] | [![][osx-x64-badge-9.0.1XX-preview1]][osx-x64-version-9.0.1XX-preview1]
[Installer][osx-x64-installer-9.0.1XX-preview1] - [Checksum][osx-x64-installer-checksum-9.0.1XX-preview1]
[tar.gz][osx-x64-targz-9.0.1XX-preview1] - [Checksum][osx-x64-targz-checksum-9.0.1XX-preview1] | [![][osx-x64-badge-8.0.3XX]][osx-x64-version-8.0.3XX]
[Installer][osx-x64-installer-8.0.3XX] - [Checksum][osx-x64-installer-checksum-8.0.3XX]
[tar.gz][osx-x64-targz-8.0.3XX] - [Checksum][osx-x64-targz-checksum-8.0.3XX] | [![][osx-x64-badge-7.0.4XX]][osx-x64-version-7.0.4XX]
[Installer][osx-x64-installer-7.0.4XX] - [Checksum][osx-x64-installer-checksum-7.0.4XX]
[tar.gz][osx-x64-targz-7.0.4XX] - [Checksum][osx-x64-targz-checksum-7.0.4XX] | +| **macOS arm64** | [![][osx-arm64-badge-main]][osx-arm64-version-main]
[Installer][osx-arm64-installer-main] - [Checksum][osx-arm64-installer-checksum-main]
[tar.gz][osx-arm64-targz-main] - [Checksum][osx-arm64-targz-checksum-main] | [![][osx-arm64-badge-9.0.1XX-preview1]][osx-arm64-version-9.0.1XX-preview1]
[Installer][osx-arm64-installer-9.0.1XX-preview1] - [Checksum][osx-arm64-installer-checksum-9.0.1XX-preview1]
[tar.gz][osx-arm64-targz-9.0.1XX-preview1] - [Checksum][osx-arm64-targz-checksum-9.0.1XX-preview1] | [![][osx-arm64-badge-8.0.3XX]][osx-arm64-version-8.0.3XX]
[Installer][osx-arm64-installer-8.0.3XX] - [Checksum][osx-arm64-installer-checksum-8.0.3XX]
[tar.gz][osx-arm64-targz-8.0.3XX] - [Checksum][osx-arm64-targz-checksum-8.0.3XX] | [![][osx-arm64-badge-7.0.4XX]][osx-arm64-version-7.0.4XX]
[Installer][osx-arm64-installer-7.0.4XX] - [Checksum][osx-arm64-installer-checksum-7.0.4XX]
[tar.gz][osx-arm64-targz-7.0.4XX] - [Checksum][osx-arm64-targz-checksum-7.0.4XX] | +| **Linux x64** | [![][linux-badge-main]][linux-version-main]
[DEB Installer][linux-DEB-installer-main] - [Checksum][linux-DEB-installer-checksum-main]
[RPM Installer][linux-RPM-installer-main] - [Checksum][linux-RPM-installer-checksum-main]
_see installer note below_1
[tar.gz][linux-targz-main] - [Checksum][linux-targz-checksum-main] | [![][linux-badge-9.0.1XX-preview1]][linux-version-9.0.1XX-preview1]
[DEB Installer][linux-DEB-installer-9.0.1XX-preview1] - [Checksum][linux-DEB-installer-checksum-9.0.1XX-preview1]
[RPM Installer][linux-RPM-installer-9.0.1XX-preview1] - [Checksum][linux-RPM-installer-checksum-9.0.1XX-preview1]
_see installer note below_1
[tar.gz][linux-targz-9.0.1XX-preview1] - [Checksum][linux-targz-checksum-9.0.1XX-preview1] | [![][linux-badge-8.0.3XX]][linux-version-8.0.3XX]
[DEB Installer][linux-DEB-installer-8.0.3XX] - [Checksum][linux-DEB-installer-checksum-8.0.3XX]
[RPM Installer][linux-RPM-installer-8.0.3XX] - [Checksum][linux-RPM-installer-checksum-8.0.3XX]
_see installer note below_1
[tar.gz][linux-targz-8.0.3XX] - [Checksum][linux-targz-checksum-8.0.3XX] | [![][linux-badge-7.0.4XX]][linux-version-7.0.4XX]
[DEB Installer][linux-DEB-installer-7.0.4XX] - [Checksum][linux-DEB-installer-checksum-7.0.4XX]
[RPM Installer][linux-RPM-installer-7.0.4XX] - [Checksum][linux-RPM-installer-checksum-7.0.4XX]
_see installer note below_1
[tar.gz][linux-targz-7.0.4XX] - [Checksum][linux-targz-checksum-7.0.4XX] | +| **Linux arm** | [![][linux-arm-badge-main]][linux-arm-version-main]
[tar.gz][linux-arm-targz-main] - [Checksum][linux-arm-targz-checksum-main] | [![][linux-arm-badge-9.0.1XX-preview1]][linux-arm-version-9.0.1XX-preview1]
[tar.gz][linux-arm-targz-9.0.1XX-preview1] - [Checksum][linux-arm-targz-checksum-9.0.1XX-preview1] | [![][linux-arm-badge-8.0.3XX]][linux-arm-version-8.0.3XX]
[tar.gz][linux-arm-targz-8.0.3XX] - [Checksum][linux-arm-targz-checksum-8.0.3XX] | [![][linux-arm-badge-7.0.4XX]][linux-arm-version-7.0.4XX]
[tar.gz][linux-arm-targz-7.0.4XX] - [Checksum][linux-arm-targz-checksum-7.0.4XX] | +| **Linux arm64** | [![][linux-arm64-badge-main]][linux-arm64-version-main]
[tar.gz][linux-arm64-targz-main] - [Checksum][linux-arm64-targz-checksum-main] | [![][linux-arm64-badge-9.0.1XX-preview1]][linux-arm64-version-9.0.1XX-preview1]
[tar.gz][linux-arm64-targz-9.0.1XX-preview1] - [Checksum][linux-arm64-targz-checksum-9.0.1XX-preview1] | [![][linux-arm64-badge-8.0.3XX]][linux-arm64-version-8.0.3XX]
[tar.gz][linux-arm64-targz-8.0.3XX] - [Checksum][linux-arm64-targz-checksum-8.0.3XX] | [![][linux-arm64-badge-7.0.4XX]][linux-arm64-version-7.0.4XX]
[tar.gz][linux-arm64-targz-7.0.4XX] - [Checksum][linux-arm64-targz-checksum-7.0.4XX] | +| **Linux-musl-x64** | [![][linux-musl-x64-badge-main]][linux-musl-x64-version-main]
[tar.gz][linux-musl-x64-targz-main] - [Checksum][linux-musl-x64-targz-checksum-main] | [![][linux-musl-x64-badge-9.0.1XX-preview1]][linux-musl-x64-version-9.0.1XX-preview1]
[tar.gz][linux-musl-x64-targz-9.0.1XX-preview1] - [Checksum][linux-musl-x64-targz-checksum-9.0.1XX-preview1] | [![][linux-musl-x64-badge-8.0.3XX]][linux-musl-x64-version-8.0.3XX]
[tar.gz][linux-musl-x64-targz-8.0.3XX] - [Checksum][linux-musl-x64-targz-checksum-8.0.3XX] | [![][linux-musl-x64-badge-7.0.4XX]][linux-musl-x64-version-7.0.4XX]
[tar.gz][linux-musl-x64-targz-7.0.4XX] - [Checksum][linux-musl-x64-targz-checksum-7.0.4XX] | +| **Linux-musl-arm** | [![][linux-musl-arm-badge-main]][linux-musl-arm-version-main]
[tar.gz][linux-musl-arm-targz-main] - [Checksum][linux-musl-arm-targz-checksum-main] | [![][linux-musl-arm-badge-9.0.1XX-preview1]][linux-musl-arm-version-9.0.1XX-preview1]
[tar.gz][linux-musl-arm-targz-9.0.1XX-preview1] - [Checksum][linux-musl-arm-targz-checksum-9.0.1XX-preview1] | [![][linux-musl-arm-badge-8.0.3XX]][linux-musl-arm-version-8.0.3XX]
[tar.gz][linux-musl-arm-targz-8.0.3XX] - [Checksum][linux-musl-arm-targz-checksum-8.0.3XX] | [![][linux-musl-arm-badge-7.0.4XX]][linux-musl-arm-version-7.0.4XX]
[tar.gz][linux-musl-arm-targz-7.0.4XX] - [Checksum][linux-musl-arm-targz-checksum-7.0.4XX] | +| **Linux-musl-arm64** | [![][linux-musl-arm64-badge-main]][linux-musl-arm64-version-main]
[tar.gz][linux-musl-arm64-targz-main] - [Checksum][linux-musl-arm64-targz-checksum-main] | [![][linux-musl-arm64-badge-9.0.1XX-preview1]][linux-musl-arm64-version-9.0.1XX-preview1]
[tar.gz][linux-musl-arm64-targz-9.0.1XX-preview1] - [Checksum][linux-musl-arm64-targz-checksum-9.0.1XX-preview1] | [![][linux-musl-arm64-badge-8.0.3XX]][linux-musl-arm64-version-8.0.3XX]
[tar.gz][linux-musl-arm64-targz-8.0.3XX] - [Checksum][linux-musl-arm64-targz-checksum-8.0.3XX] | [![][linux-musl-arm64-badge-7.0.4XX]][linux-musl-arm64-version-7.0.4XX]
[tar.gz][linux-musl-arm64-targz-7.0.4XX] - [Checksum][linux-musl-arm64-targz-checksum-7.0.4XX] | +| **RHEL 6** | **N/A** | **N/A** | **N/A** | **N/A** | Reference notes: > **1**: Our Debian packages are put together slightly differently than the other OS specific installers. Instead of combining everything, we have separate component packages that depend on each other. If you're installing the SDK from the .deb file (via dpkg or similar), then you'll need to install the corresponding dependencies first: @@ -203,6 +202,13 @@ Reference notes: [win-x64-zip-main]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-win-x64.zip [win-x64-zip-checksum-main]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-win-x64.zip.sha +[win-x64-badge-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/win_x64_Release_version_badge.svg?no-cache +[win-x64-version-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/productCommit-win-x64.txt +[win-x64-installer-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-win-x64.exe +[win-x64-installer-checksum-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-win-x64.exe.sha +[win-x64-zip-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-win-x64.zip +[win-x64-zip-checksum-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-win-x64.zip.sha + [win-x64-badge-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/win_x64_Release_version_badge.svg?no-cache [win-x64-version-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/productCommit-win-x64.txt [win-x64-installer-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/dotnet-sdk-win-x64.exe @@ -224,6 +230,13 @@ Reference notes: [win-x86-zip-main]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-win-x86.zip [win-x86-zip-checksum-main]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-win-x86.zip.sha +[win-x86-badge-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/win_x86_Release_version_badge.svg?no-cache +[win-x86-version-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/productCommit-win-x86.txt +[win-x86-installer-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-win-x86.exe +[win-x86-installer-checksum-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-win-x86.exe.sha +[win-x86-zip-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-win-x86.zip +[win-x86-zip-checksum-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-win-x86.zip.sha + [win-x86-badge-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/win_x86_Release_version_badge.svg?no-cache [win-x86-version-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/productCommit-win-x86.txt [win-x86-installer-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/dotnet-sdk-win-x86.exe @@ -245,6 +258,13 @@ Reference notes: [osx-x64-targz-main]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-osx-x64.tar.gz [osx-x64-targz-checksum-main]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-osx-x64.pkg.tar.gz.sha +[osx-x64-badge-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/osx_x64_Release_version_badge.svg?no-cache +[osx-x64-version-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/productCommit-osx-x64.txt +[osx-x64-installer-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-osx-x64.pkg +[osx-x64-installer-checksum-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-osx-x64.pkg.sha +[osx-x64-targz-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-osx-x64.tar.gz +[osx-x64-targz-checksum-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-osx-x64.pkg.tar.gz.sha + [osx-x64-badge-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/osx_x64_Release_version_badge.svg?no-cache [osx-x64-version-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/productCommit-osx-x64.txt [osx-x64-installer-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/dotnet-sdk-osx-x64.pkg @@ -266,6 +286,13 @@ Reference notes: [osx-arm64-targz-main]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-osx-arm64.tar.gz [osx-arm64-targz-checksum-main]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-osx-arm64.pkg.tar.gz.sha +[osx-arm64-badge-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/osx_arm64_Release_version_badge.svg?no-cache +[osx-arm64-version-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/productCommit-osx-arm64.txt +[osx-arm64-installer-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-osx-arm64.pkg +[osx-arm64-installer-checksum-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-osx-arm64.pkg.sha +[osx-arm64-targz-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-osx-arm64.tar.gz +[osx-arm64-targz-checksum-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-osx-arm64.pkg.tar.gz.sha + [osx-arm64-badge-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/osx_arm64_Release_version_badge.svg?no-cache [osx-arm64-version-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/productCommit-osx-arm64.txt [osx-arm64-installer-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/dotnet-sdk-osx-arm64.pkg @@ -289,6 +316,15 @@ Reference notes: [linux-targz-main]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-linux-x64.tar.gz [linux-targz-checksum-main]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-linux-x64.tar.gz.sha +[linux-badge-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/linux_x64_Release_version_badge.svg?no-cache +[linux-version-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/productCommit-linux-x64.txt +[linux-DEB-installer-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-x64.deb +[linux-DEB-installer-checksum-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-x64.deb.sha +[linux-RPM-installer-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-x64.rpm +[linux-RPM-installer-checksum-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-x64.rpm.sha +[linux-targz-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-linux-x64.tar.gz +[linux-targz-checksum-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-linux-x64.tar.gz.sha + [linux-badge-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/linux_x64_Release_version_badge.svg?no-cache [linux-version-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/productCommit-linux-x64.txt [linux-DEB-installer-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/dotnet-sdk-x64.deb @@ -312,6 +348,11 @@ Reference notes: [linux-arm-targz-main]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-linux-arm.tar.gz [linux-arm-targz-checksum-main]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-linux-arm.tar.gz.sha +[linux-arm-badge-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/linux_arm_Release_version_badge.svg?no-cache +[linux-arm-version-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/productCommit-linux-arm.txt +[linux-arm-targz-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-linux-arm.tar.gz +[linux-arm-targz-checksum-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-linux-arm.tar.gz.sha + [linux-arm-badge-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/linux_arm_Release_version_badge.svg?no-cache [linux-arm-version-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/productCommit-linux-arm.txt [linux-arm-targz-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/dotnet-sdk-linux-arm.tar.gz @@ -327,6 +368,11 @@ Reference notes: [linux-arm64-targz-main]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-linux-arm64.tar.gz [linux-arm64-targz-checksum-main]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-linux-arm64.tar.gz.sha +[linux-arm64-badge-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/linux_arm64_Release_version_badge.svg?no-cache +[linux-arm64-version-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/productCommit-linux-arm64.txt +[linux-arm64-targz-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-linux-arm64.tar.gz +[linux-arm64-targz-checksum-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-linux-arm64.tar.gz.sha + [linux-arm64-badge-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/linux_arm64_Release_version_badge.svg?no-cache [linux-arm64-version-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/productCommit-linux-arm64.txt [linux-arm64-targz-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/dotnet-sdk-linux-arm64.tar.gz @@ -342,6 +388,11 @@ Reference notes: [rhel-6-targz-main]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-rhel.6-x64.tar.gz [rhel-6-targz-checksum-main]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-rhel.6-x64.tar.gz.sha +[rhel-6-badge-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/rhel.6_x64_Release_version_badge.svg?no-cache +[rhel-6-version-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/productCommit-rhel.6-x64.txt +[rhel-6-targz-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-rhel.6-x64.tar.gz +[rhel-6-targz-checksum-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-rhel.6-x64.tar.gz.sha + [rhel-6-badge-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/rhel.6_x64_Release_version_badge.svg?no-cache [rhel-6-version-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/productCommit-rhel.6-x64.txt [rhel-6-targz-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/dotnet-sdk-rhel.6-x64.tar.gz @@ -357,6 +408,11 @@ Reference notes: [linux-musl-x64-targz-main]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-linux-musl-x64.tar.gz [linux-musl-x64-targz-checksum-main]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-linux-musl-x64.tar.gz.sha +[linux-musl-x64-badge-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/linux_musl_x64_Release_version_badge.svg?no-cache +[linux-musl-x64-version-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/productCommit-linux-musl-x64.txt +[linux-musl-x64-targz-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-linux-musl-x64.tar.gz +[linux-musl-x64-targz-checksum-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-linux-musl-x64.tar.gz.sha + [linux-musl-x64-badge-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/linux_musl_x64_Release_version_badge.svg?no-cache [linux-musl-x64-version-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/productCommit-linux-musl-x64.txt [linux-musl-x64-targz-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/dotnet-sdk-linux-musl-x64.tar.gz @@ -372,6 +428,11 @@ Reference notes: [linux-musl-arm-targz-main]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-linux-musl-arm.tar.gz [linux-musl-arm-targz-checksum-main]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-linux-musl-arm.tar.gz.sha +[linux-musl-arm-badge-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/linux_musl_arm_Release_version_badge.svg?no-cache +[linux-musl-arm-version-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/productCommit-linux-musl-arm.txt +[linux-musl-arm-targz-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-linux-musl-arm.tar.gz +[linux-musl-arm-targz-checksum-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-linux-musl-arm.tar.gz.sha + [linux-musl-arm-badge-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/linux_musl_arm_Release_version_badge.svg?no-cache [linux-musl-arm-version-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/productCommit-linux-musl-arm.txt [linux-musl-arm-targz-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/dotnet-sdk-linux-musl-arm.tar.gz @@ -387,6 +448,11 @@ Reference notes: [linux-musl-arm64-targz-main]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-linux-musl-arm64.tar.gz [linux-musl-arm64-targz-checksum-main]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-linux-musl-arm64.tar.gz.sha +[linux-musl-arm64-badge-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/linux_musl_arm64_Release_version_badge.svg?no-cache +[linux-musl-arm64-version-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/productCommit-linux-musl-arm64.txt +[linux-musl-arm64-targz-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-linux-musl-arm64.tar.gz +[linux-musl-arm64-targz-checksum-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-linux-musl-arm64.tar.gz.sha + [linux-musl-arm64-badge-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/linux_musl_arm64_Release_version_badge.svg?no-cache [linux-musl-arm64-version-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/productCommit-linux-musl-arm64.txt [linux-musl-arm64-targz-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/dotnet-sdk-linux-musl-arm64.tar.gz @@ -402,6 +468,11 @@ Reference notes: [win-arm-zip-main]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-win-arm.zip [win-arm-zip-checksum-main]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-win-arm.zip.sha +[win-arm-badge-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/win_arm_Release_version_badge.svg?no-cache +[win-arm-version-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/productCommit-win-arm.txt +[win-arm-zip-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-win-arm.zip +[win-arm-zip-checksum-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-win-arm.zip.sha + [win-arm-badge-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/win_arm_Release_version_badge.svg?no-cache [win-arm-version-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/productCommit-win-arm.txt [win-arm-zip-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/dotnet-sdk-win-arm.zip @@ -419,6 +490,13 @@ Reference notes: [win-arm64-zip-main]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-win-arm64.zip [win-arm64-zip-checksum-main]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-win-arm64.zip.sha +[win-arm64-badge-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/win_arm64_Release_version_badge.svg?no-cache +[win-arm64-version-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/productCommit-win-arm64.txt +[win-arm64-installer-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-win-arm64.exe +[win-arm64-installer-checksum-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-win-arm64.exe.sha +[win-arm64-zip-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-win-arm64.zip +[win-arm64-zip-checksum-9.0.1XX-preview1]: https://aka.ms/dotnet/9.0.1xx-preview1/daily/dotnet-sdk-win-arm64.zip.sha + [win-arm64-badge-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/win_arm64_Release_version_badge.svg?no-cache [win-arm64-version-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/productCommit-win-arm64.txt [win-arm64-installer-8.0.3XX]: https://aka.ms/dotnet/8.0.3xx/daily/dotnet-sdk-win-arm64.exe diff --git a/tools/sdk-readme-table-generator/TableGenerator/Program.fs b/tools/sdk-readme-table-generator/TableGenerator/Program.fs index 2f1f90d69..54943c9e5 100644 --- a/tools/sdk-readme-table-generator/TableGenerator/Program.fs +++ b/tools/sdk-readme-table-generator/TableGenerator/Program.fs @@ -9,6 +9,9 @@ let inputBranches = [ { GitBranchName = "main" DisplayName = "main
(9.0.x Runtime)" AkaMsChannel = Some("9.0.1xx/daily") } + { GitBranchName = "release/9.0.1xx-preview1" + DisplayName = "9.0.1xx-preview1
(9.0-preview1 Runtime)" + AkaMsChannel = Some("9.0.1xx-preview1/daily") } { GitBranchName = "release/8.0.3xx" DisplayName = "8.0.3xx
(8.0 Runtime)" AkaMsChannel = Some("8.0.3xx/daily") } From 6e4a0539686e883a16f2b278121fe0c4eb3f30ba Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 31 Jan 2024 17:01:18 +0100 Subject: [PATCH 02/19] Delete dead code for Platform property (#18473) --- src/SourceBuild/content/Directory.Build.props | 1 - 1 file changed, 1 deletion(-) diff --git a/src/SourceBuild/content/Directory.Build.props b/src/SourceBuild/content/Directory.Build.props index 2f80065a8..3f80216de 100644 --- a/src/SourceBuild/content/Directory.Build.props +++ b/src/SourceBuild/content/Directory.Build.props @@ -36,7 +36,6 @@ $(OverrideTargetRid.Substring($(OverrideTargetRid.LastIndexOf('-'))).TrimStart('-')) x64 - $(TargetArchitecture) AnyCPU From d0f4aa844a4b50f411ddb315dc8c4796eefff961 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 31 Jan 2024 17:12:43 +0100 Subject: [PATCH 03/19] Set PortableBuild correctly for non source-only builds (#18474) --- src/SourceBuild/content/Directory.Build.props | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/SourceBuild/content/Directory.Build.props b/src/SourceBuild/content/Directory.Build.props index 3f80216de..2334ebb07 100644 --- a/src/SourceBuild/content/Directory.Build.props +++ b/src/SourceBuild/content/Directory.Build.props @@ -47,6 +47,9 @@ $(BuildRid) $(BuildRid) + + true + $(__PortableTargetOS)-$(TargetArchitecture) freebsd-$(TargetArchitecture) osx-$(TargetArchitecture) From 307bec6036b668361e5f74da009b25a529e9c48b Mon Sep 17 00:00:00 2001 From: Omair Majid Date: Wed, 31 Jan 2024 11:37:15 -0500 Subject: [PATCH 04/19] Allow .doc files as binaries in the VMR (#18475) --- src/VirtualMonoRepo/allowed-binaries.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/VirtualMonoRepo/allowed-binaries.txt b/src/VirtualMonoRepo/allowed-binaries.txt index 51ed434fb..56f66cfb8 100644 --- a/src/VirtualMonoRepo/allowed-binaries.txt +++ b/src/VirtualMonoRepo/allowed-binaries.txt @@ -1,4 +1,5 @@ *.bmp +*.doc *.docx *.gif *.ico From de345f1baaa42816bf4f9c40eab2e57cc1f1fb58 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 31 Jan 2024 17:55:48 +0100 Subject: [PATCH 05/19] [main] Update dependencies from dotnet/arcade (#18471) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- eng/common/templates/job/source-index-stage1.yml | 2 +- global.json | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index caf5d115d..e3aa92e6b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -201,18 +201,18 @@ - + https://github.com/dotnet/arcade - dd50030a0278e8c82f45624446fbec120b83c26b + b4e9225c6c2f9da42fbb611a5e8942a08476fe89 - + https://github.com/dotnet/arcade - dd50030a0278e8c82f45624446fbec120b83c26b + b4e9225c6c2f9da42fbb611a5e8942a08476fe89 - + https://github.com/dotnet/arcade - dd50030a0278e8c82f45624446fbec120b83c26b + b4e9225c6c2f9da42fbb611a5e8942a08476fe89 https://github.com/dotnet/arcade-services @@ -222,9 +222,9 @@ https://github.com/dotnet/arcade-services e9cac5ab2b545c66de5414b330d2187286d17194 - + https://github.com/dotnet/arcade - dd50030a0278e8c82f45624446fbec120b83c26b + b4e9225c6c2f9da42fbb611a5e8942a08476fe89 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 5afd175fa..4452af004 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 9.0.0-beta.24080.1 + 9.0.0-beta.24080.3 diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index 795233662..b5a3e5c4a 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -1,6 +1,6 @@ parameters: runAsPublic: false - sourceIndexPackageVersion: 1.0.1-20231213.4 + sourceIndexPackageVersion: 1.0.1-20240129.2 sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" preSteps: [] diff --git a/global.json b/global.json index 796b1c9e9..a693dacb8 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24080.1", - "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24080.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24080.3", + "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24080.3" } } From 3152bfc0241aef2a06b2b536fb32aaf95c034b06 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Wed, 31 Jan 2024 11:26:38 -0800 Subject: [PATCH 06/19] Propagate DotNetBuildSourceOnly to repo build invocations (#18479) --- src/SourceBuild/content/repo-projects/Directory.Build.props | 1 + 1 file changed, 1 insertion(+) diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.props b/src/SourceBuild/content/repo-projects/Directory.Build.props index 13c884b76..164f14df8 100644 --- a/src/SourceBuild/content/repo-projects/Directory.Build.props +++ b/src/SourceBuild/content/repo-projects/Directory.Build.props @@ -68,6 +68,7 @@ $(BuildArgs) /p:ArcadeBuildFromSource=true + $(BuildArgs) /p:DotNetBuildSourceOnly=true $(BuildArgs) /p:PreviouslySourceBuiltNupkgCacheDir="$(PrebuiltSourceBuiltPackagesPath)" $(BuildArgs) /p:ReferencePackageNupkgCacheDir="$(ReferencePackagesDir)" $(BuildArgs) /p:SourceBuildUseMonoRuntime=$(SourceBuildUseMonoRuntime) From 0355d2dd14a95fdc33d1c2c68c7501d999b4a69a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 31 Jan 2024 14:52:57 -0800 Subject: [PATCH 07/19] [main] Update dependencies from dotnet/test-templates (#18480) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e3aa92e6b..6f6bfc2de 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -114,14 +114,14 @@ https://github.com/dotnet/test-templates becc4bd157cd6608b51a5ffe414a5d2de6330272 - + https://github.com/dotnet/test-templates - 561fc241f4c574345364b52bc7eb857b997111ad + 4486ff28949aa10726517ddf7ecabedc2a7e1ceb - + https://github.com/dotnet/test-templates - 561fc241f4c574345364b52bc7eb857b997111ad + 4486ff28949aa10726517ddf7ecabedc2a7e1ceb diff --git a/eng/Versions.props b/eng/Versions.props index 4452af004..992342511 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 1.1.0-rc.24069.1 1.1.0-rc.24069.1 - 1.1.0-rc.24079.1 - 1.1.0-rc.24079.1 + 1.1.0-rc.24081.1 + 1.1.0-rc.24081.1 From 850f50167968d1c969ac56ac18697dd0f7742e3b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 1 Feb 2024 08:35:34 -0600 Subject: [PATCH 08/19] [main] Update dependencies from dotnet/aspire (#18252) Co-authored-by: dotnet-maestro[bot] Co-authored-by: Jose Perez Rodriguez --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 4 ++-- src/redist/targets/BundledManifests.targets | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6f6bfc2de..25405b3b7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -247,9 +247,9 @@ aren't shipping, or those extensions packages depend on aspnetcore packages that won't ship. However, given the cost of maintaining this coherency path is high. This being toolset means that aspire is responsible for its own coherency. --> - + https://github.com/dotnet/aspire - 66a1dd77e4077592a587c1429c8814d1057dc474 + 87d5246ddfc1fb9b07fcdf7b4b42830f67427ab9 diff --git a/eng/Versions.props b/eng/Versions.props index 992342511..15610fb7a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -251,8 +251,8 @@ - 8.0.100 - 8.0.0-preview.3.24060.4 + 9.0.100-preview.1 + 9.0.0-preview.1.24079.2 9.0.100-alpha.1 9.0.0-ci.net9.9818 34.99.0-preview.1.109 diff --git a/src/redist/targets/BundledManifests.targets b/src/redist/targets/BundledManifests.targets index f2522874c..b17e885e4 100644 --- a/src/redist/targets/BundledManifests.targets +++ b/src/redist/targets/BundledManifests.targets @@ -18,7 +18,7 @@ - + From 6e134b4cd9daceae6ab311806fb1b0ea7d27b9cb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 1 Feb 2024 15:34:23 +0000 Subject: [PATCH 09/19] [main] Update dependencies from dotnet/arcade (#18486) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- eng/common/sdk-task.ps1 | 2 +- eng/common/tools.ps1 | 4 ++-- global.json | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 25405b3b7..ce7239073 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -201,18 +201,18 @@ - + https://github.com/dotnet/arcade - b4e9225c6c2f9da42fbb611a5e8942a08476fe89 + 438a8e2488313fb3aa1b24a741a85c2669ee7e0d - + https://github.com/dotnet/arcade - b4e9225c6c2f9da42fbb611a5e8942a08476fe89 + 438a8e2488313fb3aa1b24a741a85c2669ee7e0d - + https://github.com/dotnet/arcade - b4e9225c6c2f9da42fbb611a5e8942a08476fe89 + 438a8e2488313fb3aa1b24a741a85c2669ee7e0d https://github.com/dotnet/arcade-services @@ -222,9 +222,9 @@ https://github.com/dotnet/arcade-services e9cac5ab2b545c66de5414b330d2187286d17194 - + https://github.com/dotnet/arcade - b4e9225c6c2f9da42fbb611a5e8942a08476fe89 + 438a8e2488313fb3aa1b24a741a85c2669ee7e0d https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 15610fb7a..f9a328776 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 9.0.0-beta.24080.3 + 9.0.0-beta.24081.4 diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index 73828dd30..091023970 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.8.1-2" -MemberType NoteProperty + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.8.5" -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 0da65b574..a8f8edb32 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -379,8 +379,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/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.8.1-2 - $defaultXCopyMSBuildVersion = '17.8.1-2' + # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.8.5 + $defaultXCopyMSBuildVersion = '17.8.5' if (!$vsRequirements) { if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') { diff --git a/global.json b/global.json index a693dacb8..fcce90311 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24080.3", - "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24080.3" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24081.4", + "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24081.4" } } From 6ac60ec11cc1f9d439d7a761ce1c2898a53aa9c5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 1 Feb 2024 16:17:14 +0000 Subject: [PATCH 10/19] [main] Update SDK diff exclusions (#18491) Co-authored-by: Matt Thalman --- .../assets/SdkFileDiffExclusions.txt | 10 +- .../baselines/ArtifactsSizes/centos.8-x64.txt | 130 +++++++++--------- 2 files changed, 74 insertions(+), 66 deletions(-) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkFileDiffExclusions.txt b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkFileDiffExclusions.txt index 4dfeb3da8..5b0f5d0e1 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkFileDiffExclusions.txt +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkFileDiffExclusions.txt @@ -130,4 +130,12 @@ msft,./sdk/x.y.z/runtimes/win/lib/netx.y/System.Drawing.Common.dll # runtime components in roslyn layout - https://github.com/dotnet/source-build/issues/4016 sb,./sdk/x.y.z/Roslyn/bincore/System.Collections.Immutable.dll -sb,./sdk/x.y.z/Roslyn/bincore/System.Reflection.Metadata.dll \ No newline at end of file +sb,./sdk/x.y.z/Roslyn/bincore/System.Reflection.Metadata.dll + +# https://github.com/dotnet/source-build/issues/4079 +sb,./sdk/x.y.z/*/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll +sb,./sdk/x.y.z/*/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll +sb,./sdk/x.y.z/*/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll +sb,./sdk/x.y.z/*/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll +sb,./sdk/x.y.z/*/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll +msft,./sdk/x.y.z/Extensions/*/* diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/ArtifactsSizes/centos.8-x64.txt b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/ArtifactsSizes/centos.8-x64.txt index 4f13a5499..d65a2f6a8 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/ArtifactsSizes/centos.8-x64.txt +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/ArtifactsSizes/centos.8-x64.txt @@ -1590,10 +1590,15 @@ sdk/x.y.z/cs/Microsoft.TestPlatform.Build.resources.dll: 5632 sdk/x.y.z/cs/Microsoft.TestPlatform.CommunicationUtilities.resources.dll: 6656 sdk/x.y.z/cs/Microsoft.TestPlatform.CoreUtilities.resources.dll: 6656 sdk/x.y.z/cs/Microsoft.TestPlatform.CrossPlatEngine.resources.dll: 10752 +sdk/x.y.z/cs/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll: 7168 +sdk/x.y.z/cs/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll: 5632 +sdk/x.y.z/cs/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll: 5632 sdk/x.y.z/cs/Microsoft.TestPlatform.Utilities.resources.dll: 5632 sdk/x.y.z/cs/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll: 6144 sdk/x.y.z/cs/Microsoft.VisualStudio.TestPlatform.Client.resources.dll: 5632 sdk/x.y.z/cs/Microsoft.VisualStudio.TestPlatform.Common.resources.dll: 10240 +sdk/x.y.z/cs/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll: 5120 +sdk/x.y.z/cs/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll: 8192 sdk/x.y.z/cs/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll: 13824 sdk/x.y.z/cs/MSBuild.resources.dll: 61952 sdk/x.y.z/cs/System.CommandLine.resources.dll: 8704 @@ -1628,10 +1633,15 @@ sdk/x.y.z/de/Microsoft.TestPlatform.Build.resources.dll: 5632 sdk/x.y.z/de/Microsoft.TestPlatform.CommunicationUtilities.resources.dll: 6656 sdk/x.y.z/de/Microsoft.TestPlatform.CoreUtilities.resources.dll: 6656 sdk/x.y.z/de/Microsoft.TestPlatform.CrossPlatEngine.resources.dll: 10752 +sdk/x.y.z/de/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll: 7168 +sdk/x.y.z/de/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll: 5632 +sdk/x.y.z/de/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll: 5632 sdk/x.y.z/de/Microsoft.TestPlatform.Utilities.resources.dll: 5632 sdk/x.y.z/de/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll: 6144 sdk/x.y.z/de/Microsoft.VisualStudio.TestPlatform.Client.resources.dll: 5632 sdk/x.y.z/de/Microsoft.VisualStudio.TestPlatform.Common.resources.dll: 10752 +sdk/x.y.z/de/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll: 5120 +sdk/x.y.z/de/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll: 8192 sdk/x.y.z/de/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll: 13824 sdk/x.y.z/de/MSBuild.resources.dll: 63488 sdk/x.y.z/de/System.CommandLine.resources.dll: 8704 @@ -2204,85 +2214,25 @@ sdk/x.y.z/es/Microsoft.TestPlatform.Build.resources.dll: 5632 sdk/x.y.z/es/Microsoft.TestPlatform.CommunicationUtilities.resources.dll: 6656 sdk/x.y.z/es/Microsoft.TestPlatform.CoreUtilities.resources.dll: 6656 sdk/x.y.z/es/Microsoft.TestPlatform.CrossPlatEngine.resources.dll: 11264 +sdk/x.y.z/es/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll: 7168 +sdk/x.y.z/es/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll: 5632 +sdk/x.y.z/es/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll: 5632 sdk/x.y.z/es/Microsoft.TestPlatform.Utilities.resources.dll: 5632 sdk/x.y.z/es/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll: 6144 sdk/x.y.z/es/Microsoft.VisualStudio.TestPlatform.Client.resources.dll: 5632 sdk/x.y.z/es/Microsoft.VisualStudio.TestPlatform.Common.resources.dll: 10752 +sdk/x.y.z/es/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll: 5120 +sdk/x.y.z/es/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll: 8192 sdk/x.y.z/es/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll: 13824 sdk/x.y.z/es/MSBuild.resources.dll: 62464 sdk/x.y.z/es/System.CommandLine.resources.dll: 8704 sdk/x.y.z/es/vstest.console.resources.dll: 41984 -sdk/x.y.z/Extensions/cs/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll: 7168 -sdk/x.y.z/Extensions/cs/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll: 5632 -sdk/x.y.z/Extensions/cs/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll: 5632 -sdk/x.y.z/Extensions/cs/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll: 5120 -sdk/x.y.z/Extensions/cs/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll: 8192 -sdk/x.y.z/Extensions/de/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll: 7168 -sdk/x.y.z/Extensions/de/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll: 5632 -sdk/x.y.z/Extensions/de/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll: 5632 -sdk/x.y.z/Extensions/de/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll: 5120 -sdk/x.y.z/Extensions/de/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll: 8192 -sdk/x.y.z/Extensions/es/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll: 7168 -sdk/x.y.z/Extensions/es/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll: 5632 -sdk/x.y.z/Extensions/es/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll: 5632 -sdk/x.y.z/Extensions/es/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll: 5120 -sdk/x.y.z/Extensions/es/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll: 8192 -sdk/x.y.z/Extensions/fr/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll: 7680 -sdk/x.y.z/Extensions/fr/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll: 5632 -sdk/x.y.z/Extensions/fr/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll: 5632 -sdk/x.y.z/Extensions/fr/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll: 5120 -sdk/x.y.z/Extensions/fr/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll: 8192 -sdk/x.y.z/Extensions/it/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll: 7680 -sdk/x.y.z/Extensions/it/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll: 5632 -sdk/x.y.z/Extensions/it/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll: 5632 -sdk/x.y.z/Extensions/it/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll: 5120 -sdk/x.y.z/Extensions/it/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll: 8192 -sdk/x.y.z/Extensions/ja/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll: 7680 -sdk/x.y.z/Extensions/ja/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll: 5632 -sdk/x.y.z/Extensions/ja/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll: 5632 -sdk/x.y.z/Extensions/ja/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll: 5120 -sdk/x.y.z/Extensions/ja/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll: 8704 -sdk/x.y.z/Extensions/ko/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll: 7680 -sdk/x.y.z/Extensions/ko/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll: 5632 -sdk/x.y.z/Extensions/ko/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll: 5632 -sdk/x.y.z/Extensions/ko/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll: 5120 -sdk/x.y.z/Extensions/ko/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll: 8192 sdk/x.y.z/Extensions/Microsoft.Diagnostics.NETCore.Client.dll: 382976 sdk/x.y.z/Extensions/Microsoft.TestPlatform.Extensions.BlameDataCollector.dll: 201728 sdk/x.y.z/Extensions/Microsoft.TestPlatform.Extensions.EventLogCollector.dll: 40448 sdk/x.y.z/Extensions/Microsoft.TestPlatform.TestHostRuntimeProvider.dll: 100864 sdk/x.y.z/Extensions/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll: 63488 sdk/x.y.z/Extensions/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll: 227328 -sdk/x.y.z/Extensions/pl/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll: 7168 -sdk/x.y.z/Extensions/pl/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll: 5632 -sdk/x.y.z/Extensions/pl/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll: 5632 -sdk/x.y.z/Extensions/pl/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll: 5120 -sdk/x.y.z/Extensions/pl/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll: 8192 -sdk/x.y.z/Extensions/pt-BR/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll: 7168 -sdk/x.y.z/Extensions/pt-BR/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll: 5632 -sdk/x.y.z/Extensions/pt-BR/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll: 5632 -sdk/x.y.z/Extensions/pt-BR/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll: 5120 -sdk/x.y.z/Extensions/pt-BR/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll: 8192 -sdk/x.y.z/Extensions/ru/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll: 8192 -sdk/x.y.z/Extensions/ru/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll: 5632 -sdk/x.y.z/Extensions/ru/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll: 5632 -sdk/x.y.z/Extensions/ru/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll: 5632 -sdk/x.y.z/Extensions/ru/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll: 9216 -sdk/x.y.z/Extensions/tr/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll: 7168 -sdk/x.y.z/Extensions/tr/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll: 5632 -sdk/x.y.z/Extensions/tr/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll: 5632 -sdk/x.y.z/Extensions/tr/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll: 5120 -sdk/x.y.z/Extensions/tr/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll: 8192 -sdk/x.y.z/Extensions/zh-Hans/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll: 7168 -sdk/x.y.z/Extensions/zh-Hans/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll: 5632 -sdk/x.y.z/Extensions/zh-Hans/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll: 5632 -sdk/x.y.z/Extensions/zh-Hans/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll: 5120 -sdk/x.y.z/Extensions/zh-Hans/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll: 7680 -sdk/x.y.z/Extensions/zh-Hant/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll: 7168 -sdk/x.y.z/Extensions/zh-Hant/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll: 5632 -sdk/x.y.z/Extensions/zh-Hant/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll: 5632 -sdk/x.y.z/Extensions/zh-Hant/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll: 5120 -sdk/x.y.z/Extensions/zh-Hant/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll: 7680 sdk/x.y.z/fr/dotnet.resources.dll: 197120 sdk/x.y.z/fr/Microsoft.Build.resources.dll: 108544 sdk/x.y.z/fr/Microsoft.Build.Tasks.Core.resources.dll: 161280 @@ -2303,10 +2253,15 @@ sdk/x.y.z/fr/Microsoft.TestPlatform.Build.resources.dll: 5632 sdk/x.y.z/fr/Microsoft.TestPlatform.CommunicationUtilities.resources.dll: 6656 sdk/x.y.z/fr/Microsoft.TestPlatform.CoreUtilities.resources.dll: 6656 sdk/x.y.z/fr/Microsoft.TestPlatform.CrossPlatEngine.resources.dll: 11264 +sdk/x.y.z/fr/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll: 7680 +sdk/x.y.z/fr/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll: 5632 +sdk/x.y.z/fr/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll: 5632 sdk/x.y.z/fr/Microsoft.TestPlatform.Utilities.resources.dll: 5632 sdk/x.y.z/fr/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll: 6144 sdk/x.y.z/fr/Microsoft.VisualStudio.TestPlatform.Client.resources.dll: 5632 sdk/x.y.z/fr/Microsoft.VisualStudio.TestPlatform.Common.resources.dll: 11264 +sdk/x.y.z/fr/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll: 5120 +sdk/x.y.z/fr/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll: 8192 sdk/x.y.z/fr/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll: 13824 sdk/x.y.z/fr/MSBuild.resources.dll: 61440 sdk/x.y.z/fr/System.CommandLine.resources.dll: 8704 @@ -2430,10 +2385,15 @@ sdk/x.y.z/it/Microsoft.TestPlatform.Build.resources.dll: 5632 sdk/x.y.z/it/Microsoft.TestPlatform.CommunicationUtilities.resources.dll: 6656 sdk/x.y.z/it/Microsoft.TestPlatform.CoreUtilities.resources.dll: 6656 sdk/x.y.z/it/Microsoft.TestPlatform.CrossPlatEngine.resources.dll: 10752 +sdk/x.y.z/it/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll: 7680 +sdk/x.y.z/it/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll: 5632 +sdk/x.y.z/it/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll: 5632 sdk/x.y.z/it/Microsoft.TestPlatform.Utilities.resources.dll: 5632 sdk/x.y.z/it/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll: 6144 sdk/x.y.z/it/Microsoft.VisualStudio.TestPlatform.Client.resources.dll: 5632 sdk/x.y.z/it/Microsoft.VisualStudio.TestPlatform.Common.resources.dll: 10752 +sdk/x.y.z/it/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll: 5120 +sdk/x.y.z/it/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll: 8192 sdk/x.y.z/it/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll: 13824 sdk/x.y.z/it/MSBuild.resources.dll: 61952 sdk/x.y.z/it/System.CommandLine.resources.dll: 8704 @@ -2458,10 +2418,15 @@ sdk/x.y.z/ja/Microsoft.TestPlatform.Build.resources.dll: 5632 sdk/x.y.z/ja/Microsoft.TestPlatform.CommunicationUtilities.resources.dll: 6656 sdk/x.y.z/ja/Microsoft.TestPlatform.CoreUtilities.resources.dll: 7168 sdk/x.y.z/ja/Microsoft.TestPlatform.CrossPlatEngine.resources.dll: 12288 +sdk/x.y.z/ja/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll: 7680 +sdk/x.y.z/ja/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll: 5632 +sdk/x.y.z/ja/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll: 5632 sdk/x.y.z/ja/Microsoft.TestPlatform.Utilities.resources.dll: 5632 sdk/x.y.z/ja/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll: 6656 sdk/x.y.z/ja/Microsoft.VisualStudio.TestPlatform.Client.resources.dll: 5632 sdk/x.y.z/ja/Microsoft.VisualStudio.TestPlatform.Common.resources.dll: 11264 +sdk/x.y.z/ja/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll: 5120 +sdk/x.y.z/ja/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll: 8704 sdk/x.y.z/ja/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll: 14336 sdk/x.y.z/ja/MSBuild.resources.dll: 68608 sdk/x.y.z/ja/System.CommandLine.resources.dll: 8704 @@ -2487,10 +2452,15 @@ sdk/x.y.z/ko/Microsoft.TestPlatform.Build.resources.dll: 5632 sdk/x.y.z/ko/Microsoft.TestPlatform.CommunicationUtilities.resources.dll: 6656 sdk/x.y.z/ko/Microsoft.TestPlatform.CoreUtilities.resources.dll: 6656 sdk/x.y.z/ko/Microsoft.TestPlatform.CrossPlatEngine.resources.dll: 11264 +sdk/x.y.z/ko/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll: 7680 +sdk/x.y.z/ko/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll: 5632 +sdk/x.y.z/ko/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll: 5632 sdk/x.y.z/ko/Microsoft.TestPlatform.Utilities.resources.dll: 5632 sdk/x.y.z/ko/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll: 6144 sdk/x.y.z/ko/Microsoft.VisualStudio.TestPlatform.Client.resources.dll: 5632 sdk/x.y.z/ko/Microsoft.VisualStudio.TestPlatform.Common.resources.dll: 10752 +sdk/x.y.z/ko/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll: 5120 +sdk/x.y.z/ko/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll: 8192 sdk/x.y.z/ko/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll: 13824 sdk/x.y.z/ko/MSBuild.resources.dll: 63488 sdk/x.y.z/ko/System.CommandLine.resources.dll: 8704 @@ -2755,10 +2725,15 @@ sdk/x.y.z/pl/Microsoft.TestPlatform.Build.resources.dll: 5632 sdk/x.y.z/pl/Microsoft.TestPlatform.CommunicationUtilities.resources.dll: 6656 sdk/x.y.z/pl/Microsoft.TestPlatform.CoreUtilities.resources.dll: 6656 sdk/x.y.z/pl/Microsoft.TestPlatform.CrossPlatEngine.resources.dll: 11264 +sdk/x.y.z/pl/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll: 7168 +sdk/x.y.z/pl/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll: 5632 +sdk/x.y.z/pl/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll: 5632 sdk/x.y.z/pl/Microsoft.TestPlatform.Utilities.resources.dll: 5632 sdk/x.y.z/pl/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll: 6144 sdk/x.y.z/pl/Microsoft.VisualStudio.TestPlatform.Client.resources.dll: 5632 sdk/x.y.z/pl/Microsoft.VisualStudio.TestPlatform.Common.resources.dll: 10752 +sdk/x.y.z/pl/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll: 5120 +sdk/x.y.z/pl/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll: 8192 sdk/x.y.z/pl/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll: 14336 sdk/x.y.z/pl/MSBuild.resources.dll: 63488 sdk/x.y.z/pl/System.CommandLine.resources.dll: 8704 @@ -2784,10 +2759,15 @@ sdk/x.y.z/pt-BR/Microsoft.TestPlatform.Build.resources.dll: 5632 sdk/x.y.z/pt-BR/Microsoft.TestPlatform.CommunicationUtilities.resources.dll: 6656 sdk/x.y.z/pt-BR/Microsoft.TestPlatform.CoreUtilities.resources.dll: 6656 sdk/x.y.z/pt-BR/Microsoft.TestPlatform.CrossPlatEngine.resources.dll: 10752 +sdk/x.y.z/pt-BR/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll: 7168 +sdk/x.y.z/pt-BR/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll: 5632 +sdk/x.y.z/pt-BR/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll: 5632 sdk/x.y.z/pt-BR/Microsoft.TestPlatform.Utilities.resources.dll: 5632 sdk/x.y.z/pt-BR/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll: 6144 sdk/x.y.z/pt-BR/Microsoft.VisualStudio.TestPlatform.Client.resources.dll: 5632 sdk/x.y.z/pt-BR/Microsoft.VisualStudio.TestPlatform.Common.resources.dll: 10752 +sdk/x.y.z/pt-BR/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll: 5120 +sdk/x.y.z/pt-BR/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll: 8192 sdk/x.y.z/pt-BR/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll: 13824 sdk/x.y.z/pt-BR/MSBuild.resources.dll: 60928 sdk/x.y.z/pt-BR/System.CommandLine.resources.dll: 8704 @@ -2888,10 +2868,15 @@ sdk/x.y.z/ru/Microsoft.TestPlatform.Build.resources.dll: 5632 sdk/x.y.z/ru/Microsoft.TestPlatform.CommunicationUtilities.resources.dll: 7168 sdk/x.y.z/ru/Microsoft.TestPlatform.CoreUtilities.resources.dll: 7168 sdk/x.y.z/ru/Microsoft.TestPlatform.CrossPlatEngine.resources.dll: 12800 +sdk/x.y.z/ru/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll: 8192 +sdk/x.y.z/ru/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll: 5632 +sdk/x.y.z/ru/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll: 5632 sdk/x.y.z/ru/Microsoft.TestPlatform.Utilities.resources.dll: 5632 sdk/x.y.z/ru/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll: 6656 sdk/x.y.z/ru/Microsoft.VisualStudio.TestPlatform.Client.resources.dll: 5632 sdk/x.y.z/ru/Microsoft.VisualStudio.TestPlatform.Common.resources.dll: 13312 +sdk/x.y.z/ru/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll: 5632 +sdk/x.y.z/ru/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll: 9216 sdk/x.y.z/ru/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll: 15872 sdk/x.y.z/ru/MSBuild.resources.dll: 79872 sdk/x.y.z/ru/System.CommandLine.resources.dll: 9216 @@ -4087,10 +4072,15 @@ sdk/x.y.z/tr/Microsoft.TestPlatform.Build.resources.dll: 5632 sdk/x.y.z/tr/Microsoft.TestPlatform.CommunicationUtilities.resources.dll: 6656 sdk/x.y.z/tr/Microsoft.TestPlatform.CoreUtilities.resources.dll: 6656 sdk/x.y.z/tr/Microsoft.TestPlatform.CrossPlatEngine.resources.dll: 10752 +sdk/x.y.z/tr/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll: 7168 +sdk/x.y.z/tr/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll: 5632 +sdk/x.y.z/tr/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll: 5632 sdk/x.y.z/tr/Microsoft.TestPlatform.Utilities.resources.dll: 5632 sdk/x.y.z/tr/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll: 6144 sdk/x.y.z/tr/Microsoft.VisualStudio.TestPlatform.Client.resources.dll: 5632 sdk/x.y.z/tr/Microsoft.VisualStudio.TestPlatform.Common.resources.dll: 10240 +sdk/x.y.z/tr/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll: 5120 +sdk/x.y.z/tr/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll: 8192 sdk/x.y.z/tr/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll: 13312 sdk/x.y.z/tr/MSBuild.resources.dll: 61440 sdk/x.y.z/tr/System.CommandLine.resources.dll: 8704 @@ -4121,10 +4111,15 @@ sdk/x.y.z/zh-Hans/Microsoft.TestPlatform.Build.resources.dll: 5632 sdk/x.y.z/zh-Hans/Microsoft.TestPlatform.CommunicationUtilities.resources.dll: 6144 sdk/x.y.z/zh-Hans/Microsoft.TestPlatform.CoreUtilities.resources.dll: 6656 sdk/x.y.z/zh-Hans/Microsoft.TestPlatform.CrossPlatEngine.resources.dll: 9728 +sdk/x.y.z/zh-Hans/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll: 7168 +sdk/x.y.z/zh-Hans/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll: 5632 +sdk/x.y.z/zh-Hans/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll: 5632 sdk/x.y.z/zh-Hans/Microsoft.TestPlatform.Utilities.resources.dll: 5632 sdk/x.y.z/zh-Hans/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll: 6144 sdk/x.y.z/zh-Hans/Microsoft.VisualStudio.TestPlatform.Client.resources.dll: 5120 sdk/x.y.z/zh-Hans/Microsoft.VisualStudio.TestPlatform.Common.resources.dll: 9728 +sdk/x.y.z/zh-Hans/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll: 5120 +sdk/x.y.z/zh-Hans/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll: 7680 sdk/x.y.z/zh-Hans/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll: 12800 sdk/x.y.z/zh-Hans/MSBuild.resources.dll: 53760 sdk/x.y.z/zh-Hans/System.CommandLine.resources.dll: 8704 @@ -4149,10 +4144,15 @@ sdk/x.y.z/zh-Hant/Microsoft.TestPlatform.Build.resources.dll: 5632 sdk/x.y.z/zh-Hant/Microsoft.TestPlatform.CommunicationUtilities.resources.dll: 6144 sdk/x.y.z/zh-Hant/Microsoft.TestPlatform.CoreUtilities.resources.dll: 6656 sdk/x.y.z/zh-Hant/Microsoft.TestPlatform.CrossPlatEngine.resources.dll: 10240 +sdk/x.y.z/zh-Hant/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll: 7168 +sdk/x.y.z/zh-Hant/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll: 5632 +sdk/x.y.z/zh-Hant/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll: 5632 sdk/x.y.z/zh-Hant/Microsoft.TestPlatform.Utilities.resources.dll: 5632 sdk/x.y.z/zh-Hant/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll: 6144 sdk/x.y.z/zh-Hant/Microsoft.VisualStudio.TestPlatform.Client.resources.dll: 5120 sdk/x.y.z/zh-Hant/Microsoft.VisualStudio.TestPlatform.Common.resources.dll: 9728 +sdk/x.y.z/zh-Hant/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll: 5120 +sdk/x.y.z/zh-Hant/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll: 7680 sdk/x.y.z/zh-Hant/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll: 12800 sdk/x.y.z/zh-Hant/MSBuild.resources.dll: 55296 sdk/x.y.z/zh-Hant/System.CommandLine.resources.dll: 8704 From ec43b539f470d42d76ec4f0c49fe1f06c7502292 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 1 Feb 2024 10:22:37 -0600 Subject: [PATCH 11/19] [main] Increase timeout for license scan (#18462) Co-authored-by: Matt Thalman --- .../LicenseScanTests.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/LicenseScanTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/LicenseScanTests.cs index b6f3655e2..3fd90f968 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/LicenseScanTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/LicenseScanTests.cs @@ -144,13 +144,16 @@ public class LicenseScanTests : TestBase { Assert.NotNull(Config.LicenseScanPath); + // Indicates how long until a timeout occurs for scanning a given file + const int FileScanTimeoutSeconds = 240; + string scancodeResultsPath = Path.Combine(LogsDirectory, "scancode-results.json"); // Scancode Doc: https://scancode-toolkit.readthedocs.io/en/latest/index.html string ignoreOptions = string.Join(" ", s_ignoredFilePatterns.Select(pattern => $"--ignore {pattern}")); ExecuteHelper.ExecuteProcessValidateExitCode( "scancode", - $"--license --processes 4 --strip-root --only-findings {ignoreOptions} --json-pp {scancodeResultsPath} {Config.LicenseScanPath}", + $"--license --processes 4 --timeout {FileScanTimeoutSeconds} --strip-root --only-findings {ignoreOptions} --json-pp {scancodeResultsPath} {Config.LicenseScanPath}", OutputHelper); JsonDocument doc = JsonDocument.Parse(File.ReadAllText(scancodeResultsPath)); From 7833b42f6a7bf116094530811828dd4a74eae0f4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 1 Feb 2024 08:33:06 -0800 Subject: [PATCH 12/19] [main] Update dependencies from dotnet/source-build-reference-packages (#18490) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ce7239073..0f4bbe339 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -230,9 +230,9 @@ https://github.com/dotnet/runtime ab1a8224cdf115b65e0db5dc88d11f205068f444 - + https://github.com/dotnet/source-build-reference-packages - 960c24c32a4bde8a83073f33fec25de7ec88a062 + 9a24a4491bd73c83a8e4ba2e185cd2cb9305af71 From c4da4e15c2e0c5b4d6be9ab4070406d0c4208e5d Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 1 Feb 2024 17:44:39 +0100 Subject: [PATCH 13/19] Support --source-build / -sb switches as well in the VMR (#18492) --- src/SourceBuild/content/build.sh | 40 ++++++++++++++++---------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/src/SourceBuild/content/build.sh b/src/SourceBuild/content/build.sh index e461d8f9a..02d4fa08a 100755 --- a/src/SourceBuild/content/build.sh +++ b/src/SourceBuild/content/build.sh @@ -10,34 +10,34 @@ set -e usage() { echo "Common settings:" - echo " --binaryLog Create MSBuild binary log (short: -bl)" - echo " --configuration Build configuration: 'Debug' or 'Release' (short: -c)" - echo " --verbosity Msbuild verbosity: q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic] (short: -v)" + echo " --binaryLog Create MSBuild binary log (short: -bl)" + echo " --configuration Build configuration: 'Debug' or 'Release' (short: -c)" + echo " --verbosity Msbuild verbosity: q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic] (short: -v)" echo "" echo "Actions:" - echo " --clean Clean the solution" - echo " --help Print help and exit (short: -h)" - echo " --test Run smoke tests (short: -t)" + echo " --clean Clean the solution" + echo " --help Print help and exit (short: -h)" + echo " --test Run smoke tests (short: -t)" echo "" echo "Source-only settings:" - echo " --source-only Source-build the solution (short: -so)" - echo " --online Build using online sources" - echo " --poison Build with poisoning checks" - echo " --release-manifest A JSON file, an alternative source of Source Link metadata" - echo " --source-repository Source Link repository URL, required when building from tarball" - echo " --source-version Source Link revision, required when building from tarball" - echo " --use-mono-runtime Output uses the mono runtime" - echo " --with-packages Use the specified directory of previously-built packages" - echo " --with-sdk Use the SDK in the specified directory for bootstrapping" + echo " --source-only, --source-build Source-build the solution (short: -so, -sb)" + echo " --online Build using online sources" + echo " --poison Build with poisoning checks" + echo " --release-manifest A JSON file, an alternative source of Source Link metadata" + echo " --source-repository Source Link repository URL, required when building from tarball" + echo " --source-version Source Link revision, required when building from tarball" + echo " --use-mono-runtime Output uses the mono runtime" + echo " --with-packages Use the specified directory of previously-built packages" + echo " --with-sdk Use the SDK in the specified directory for bootstrapping" echo "" echo "Advanced settings:" - echo " --ci Set when running on CI server" - echo " --clean-while-building Cleans each repo after building (reduces disk space usage, short: -cwb)" - echo " --excludeCIBinarylog Don't output binary log (short: -nobl)" - echo " --prepareMachine Prepare machine for CI run, clean up processes after build" + echo " --ci Set when running on CI server" + echo " --clean-while-building Cleans each repo after building (reduces disk space usage, short: -cwb)" + echo " --excludeCIBinarylog Don't output binary log (short: -nobl)" + echo " --prepareMachine Prepare machine for CI run, clean up processes after build" echo "" echo "Command line arguments not listed above are passed thru to msbuild." echo "Arguments can also be passed in with a single hyphen." @@ -117,7 +117,7 @@ while [[ $# > 0 ]]; do ;; # Source-only settings - -source-only|-so) + -source-only|-source-build|-so|-sb) sourceOnly=true properties="$properties /p:DotNetBuildSourceOnly=true" ;; From 238c141487590f410b342bce7aee3c1f1d9eff9f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 2 Feb 2024 00:36:43 +0000 Subject: [PATCH 14/19] [main] Update dependencies from dotnet/source-build-reference-packages (#18494) [main] Update dependencies from dotnet/source-build-reference-packages --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0f4bbe339..acf30536e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -230,9 +230,9 @@ https://github.com/dotnet/runtime ab1a8224cdf115b65e0db5dc88d11f205068f444 - + https://github.com/dotnet/source-build-reference-packages - 9a24a4491bd73c83a8e4ba2e185cd2cb9305af71 + 69b60d2af1775f374c91b3e52da02de6b7de1943 From cca2b7bedef771c45eec62492017dde51199378d Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Fri, 2 Feb 2024 01:13:03 -0500 Subject: [PATCH 15/19] Stop using OverrideTargetRid, use TargetOS/TargetArchitecture instead (#18476) --- eng/pipelines/templates/jobs/vmr-build.yml | 28 ++++++++++++------- eng/pipelines/templates/stages/vmr-build.yml | 13 +++++++++ .../templates/stages/vmr-cross-build.yml | 20 +++++++++---- src/SourceBuild/content/Directory.Build.props | 13 ++------- .../repo-projects/Directory.Build.props | 6 ---- .../content/repo-projects/aspnetcore.proj | 14 ++-------- .../content/repo-projects/emsdk.proj | 11 +------- .../content/repo-projects/installer.proj | 22 ++++++--------- .../content/repo-projects/runtime.proj | 22 ++++----------- .../content/repo-projects/sdk.proj | 13 ++------- 10 files changed, 68 insertions(+), 94 deletions(-) diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/eng/pipelines/templates/jobs/vmr-build.yml index ab41a1045..0f61dc489 100644 --- a/eng/pipelines/templates/jobs/vmr-build.yml +++ b/eng/pipelines/templates/jobs/vmr-build.yml @@ -65,7 +65,15 @@ parameters: type: string default: '' -- name: targetRid +- name: runTests + type: boolean + default: false + +- name: targetOS + type: string + default: '' + +- name: targetArchitecture type: string default: '' @@ -247,20 +255,20 @@ jobs: useDocker=true fi - if [[ ! -z '${{ parameters.targetRid }}' ]]; then - extraBuildProperties="--" - if [[ '${{ parameters.useMonoRuntime }}' == 'True' ]]; then - customEnvVars="$customEnvVars CROSSCOMPILE=1" - fi - extraBuildProperties="$extraBuildProperties /p:PortableBuild=true /p:DotNetBuildVertical=true /p:CrossBuild=true" + if [[ '${{ parameters.useMonoRuntime }}' == 'True' ]]; then + customEnvVars="$customEnvVars CROSSCOMPILE=1" fi if [[ ! -z '${{ parameters.crossRootFs }}' ]]; then customEnvVars="$customEnvVars ROOTFS_DIR=${{ parameters.crossRootFs}}" fi - if [[ ! -z '${{ parameters.targetRid }}' ]]; then - extraBuildProperties="$extraBuildProperties /p:OverrideTargetRid=${{ parameters.targetRid }}" + if [[ ! -z '${{ parameters.targetOS }}' ]]; then + extraBuildProperties="$extraBuildProperties /p:TargetOS=${{ parameters.targetOS }}" + fi + + if [[ ! -z '${{ parameters.targetArchitecture }}' ]]; then + extraBuildProperties="$extraBuildProperties /p:TargetArchitecture=${{ parameters.targetArchitecture }}" fi # Only use Docker stuff on Linux @@ -286,7 +294,7 @@ jobs: displayName: Build # Don't run tests if overriding RID, we don't support that for now - - ${{ if eq(parameters.targetRid, '') }}: + - ${{ if eq(parameters.runTests, 'True') }}: - script: | set -x diff --git a/eng/pipelines/templates/stages/vmr-build.yml b/eng/pipelines/templates/stages/vmr-build.yml index b5a2d47a9..1dd31827b 100644 --- a/eng/pipelines/templates/stages/vmr-build.yml +++ b/eng/pipelines/templates/stages/vmr-build.yml @@ -85,6 +85,7 @@ stages: enablePoison: false # 🚫 excludeOmniSharpTests: true # ✅ runOnline: true # ✅ + runTests: true # ✅ useMonoRuntime: false # 🚫 withPreviousSDK: false # 🚫 @@ -105,6 +106,7 @@ stages: enablePoison: false # 🚫 excludeOmniSharpTests: true # ✅ runOnline: true # ✅ + runTests: true # ✅ useMonoRuntime: false # 🚫 withPreviousSDK: false # 🚫 reuseBuildArtifactsFrom: CentOSStream8_Online_MsftSdk @@ -125,6 +127,7 @@ stages: enablePoison: true # ✅ excludeOmniSharpTests: true # ✅ runOnline: false # 🚫 + runTests: true # ✅ useMonoRuntime: false # 🚫 withPreviousSDK: true # ✅ @@ -145,6 +148,7 @@ stages: enablePoison: false # 🚫 excludeOmniSharpTests: true # ✅ runOnline: true # ✅ + runTests: true # ✅ useMonoRuntime: false # 🚫 withPreviousSDK: false # 🚫 @@ -163,6 +167,7 @@ stages: enablePoison: false # 🚫 excludeOmniSharpTests: true # ✅ runOnline: false # 🚫 + runTests: true # ✅ useMonoRuntime: false # 🚫 withPreviousSDK: false # 🚫 @@ -182,6 +187,7 @@ stages: enablePoison: false # 🚫 excludeOmniSharpTests: true # ✅ runOnline: true # ✅ + runTests: true # ✅ useMonoRuntime: false # 🚫 withPreviousSDK: true # ✅ @@ -201,6 +207,7 @@ stages: enablePoison: false # 🚫 excludeOmniSharpTests: true # ✅ runOnline: false # 🚫 + runTests: true # ✅ useMonoRuntime: false # 🚫 withPreviousSDK: true # ✅ @@ -219,6 +226,7 @@ stages: enablePoison: false # 🚫 excludeOmniSharpTests: true # ✅ runOnline: false # 🚫 + runTests: true # ✅ useMonoRuntime: true # ✅ withPreviousSDK: false # 🚫 @@ -237,6 +245,7 @@ stages: enablePoison: false # 🚫 excludeOmniSharpTests: false # 🚫 runOnline: false # 🚫 + runTests: true # ✅ useMonoRuntime: false # 🚫 withPreviousSDK: false # 🚫 @@ -255,6 +264,7 @@ stages: enablePoison: false # 🚫 excludeOmniSharpTests: false # 🚫 runOnline: false # 🚫 + runTests: true # ✅ useMonoRuntime: false # 🚫 withPreviousSDK: false # 🚫 @@ -273,6 +283,7 @@ stages: enablePoison: false # 🚫 excludeOmniSharpTests: false # 🚫 runOnline: false # 🚫 + runTests: true # ✅ useMonoRuntime: false # 🚫 withPreviousSDK: false # 🚫 @@ -289,6 +300,7 @@ stages: enablePoison: false # 🚫 excludeOmniSharpTests: false # 🚫 runOnline: false # 🚫 + runTests: true # ✅ useMonoRuntime: false # 🚫 withPreviousSDK: false # 🚫 @@ -307,6 +319,7 @@ stages: enablePoison: false # 🚫 excludeOmniSharpTests: false # 🚫 runOnline: false # 🚫 + runTests: true # ✅ useMonoRuntime: false # 🚫 withPreviousSDK: false # 🚫 reuseBuildArtifactsFrom: Fedora39_Offline_MsftSdk diff --git a/eng/pipelines/templates/stages/vmr-cross-build.yml b/eng/pipelines/templates/stages/vmr-cross-build.yml index 1b5657b8c..75028b3f1 100644 --- a/eng/pipelines/templates/stages/vmr-cross-build.yml +++ b/eng/pipelines/templates/stages/vmr-cross-build.yml @@ -88,7 +88,9 @@ stages: useMonoRuntime: true # ✅ withPreviousSDK: false # 🚫 crossRootFs: '/crossrootfs/x64' # 📝 - targetRid: 'linux-x64' # 📝 + runTests: false # 🚫 + targetOS: 'linux' # 📝 + targetArchitecture: 'x64' # 📝 - template: ../jobs/vmr-build.yml parameters: @@ -108,7 +110,9 @@ stages: useMonoRuntime: true # ✅ withPreviousSDK: false # 🚫 crossRootFs: '/crossrootfs/arm64' # 📝 - targetRid: 'linux-arm64' # 📝 + runTests: false # 🚫 + targetOS: 'linux' # 📝 + targetArchitecture: 'arm64' # 📝 - template: ../jobs/vmr-build.yml parameters: @@ -126,7 +130,9 @@ stages: runOnline: true # ✅ useMonoRuntime: true # ✅ withPreviousSDK: false # 🚫 - targetRid: 'osx-x64' # 📝 + runTests: false # 🚫 + targetOS: 'osx' # 📝 + targetArchitecture: 'x64' # 📝 - template: ../jobs/vmr-build.yml parameters: @@ -144,7 +150,9 @@ stages: runOnline: true # ✅ useMonoRuntime: true # ✅ withPreviousSDK: false # 🚫 - targetRid: 'osx-arm64' # 📝 + runTests: false # 🚫 + targetOS: 'osx' # 📝 + targetArchitecture: 'arm64' # 📝 - template: ../jobs/vmr-build.yml parameters: @@ -164,4 +172,6 @@ stages: useMonoRuntime: false # 🚫 withPreviousSDK: false # 🚫 crossRootFs: '/crossrootfs/arm64' # 📝 - targetRid: 'linux-arm64' # 📝 + runTests: false # 🚫 + targetOS: 'linux' # 📝 + targetArchitecture: 'arm64' # 📝 diff --git a/src/SourceBuild/content/Directory.Build.props b/src/SourceBuild/content/Directory.Build.props index 2334ebb07..2ab3da9ec 100644 --- a/src/SourceBuild/content/Directory.Build.props +++ b/src/SourceBuild/content/Directory.Build.props @@ -24,17 +24,7 @@ $(BuildArchitecture) - arm - armv6 - armel - arm64 - riscv64 - loongarch64 - s390x - ppc64le - - $(OverrideTargetRid.Substring($(OverrideTargetRid.LastIndexOf('-'))).TrimStart('-')) - x64 + $(BuildArchitecture) AnyCPU @@ -49,6 +39,7 @@ true + false $(__PortableTargetOS)-$(TargetArchitecture) freebsd-$(TargetArchitecture) diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.props b/src/SourceBuild/content/repo-projects/Directory.Build.props index 164f14df8..4a87ec572 100644 --- a/src/SourceBuild/content/repo-projects/Directory.Build.props +++ b/src/SourceBuild/content/repo-projects/Directory.Build.props @@ -82,12 +82,6 @@ $(AspNetRazorBuildServerLogDir)razor-build-server.log - - - $(OverrideTargetRid.Substring(0, $(OverrideTargetRid.LastIndexOf('-')))) - $(OverrideTargetRid.Substring($(OverrideTargetRid.LastIndexOf('-'))).TrimStart('-')) - - diff --git a/src/SourceBuild/content/repo-projects/aspnetcore.proj b/src/SourceBuild/content/repo-projects/aspnetcore.proj index 351d0763f..be3d4294c 100644 --- a/src/SourceBuild/content/repo-projects/aspnetcore.proj +++ b/src/SourceBuild/content/repo-projects/aspnetcore.proj @@ -9,8 +9,7 @@ $(FlagParameterPrefix)restore $(FlagParameterPrefix)all $(FlagParameterPrefix)pack - $(BuildArgs) $(FlagParameterPrefix)arch $(TargetArchitecture) - $(BuildArgs) $(FlagParameterPrefix)arch $(OverrideTargetArch) + $(BuildArgs) $(FlagParameterPrefix)arch $(TargetArchitecture) $(BuildArgs) $(FlagParameterPrefix)no-build-repo-tasks $(BuildArgs) $(FlagParameterPrefix)no-build-nodejs @@ -18,15 +17,8 @@ - $(TargetRid) - osx-$(TargetArchitecture) - freebsd-$(TargetArchitecture) - win-$(TargetArchitecture) - <_portableRidOverridden Condition="'$(TargetRid)' != '$(OverrideTargetRid)'">true - <_portableRidOverridden Condition="'$(TargetRid)' == '$(OverrideTargetRid)'">false - - $(BuildArgs) /p:PortableBuild=$(_portableRidOverridden) - $(BuildArgs) /p:TargetRuntimeIdentifier=$(OverrideTargetRid) + $(BuildArgs) /p:PortableBuild=$(PortableBuild) + $(BuildArgs) /p:TargetRuntimeIdentifier=$(TargetRid) diff --git a/src/SourceBuild/content/repo-projects/emsdk.proj b/src/SourceBuild/content/repo-projects/emsdk.proj index bc8f4c24f..df9c06326 100644 --- a/src/SourceBuild/content/repo-projects/emsdk.proj +++ b/src/SourceBuild/content/repo-projects/emsdk.proj @@ -1,19 +1,10 @@ - $(TargetRid) - osx-$(TargetArchitecture) - freebsd-$(TargetArchitecture) - win-$(TargetArchitecture) - - <_platformIndex>$(OverrideTargetRid.LastIndexOf('-')) - $(OverrideTargetRid.Substring(0, $(_platformIndex))) - $(OverrideTargetRid.Substring($(_platformIndex))) - $(ProjectDirectory)build$(ShellExtension) - $(BuildArgs) /p:PackageRid=$(OverrideTargetRid) + $(BuildArgs) /p:PackageRid=$(TargetRid) $(BuildArgs) /p:AssetManifestOS=$(TargetOS) $(BuildArgs) /p:PlatformName=$(TargetArch) $(BuildArgs) /p:ForceBuildManifestOnly=true diff --git a/src/SourceBuild/content/repo-projects/installer.proj b/src/SourceBuild/content/repo-projects/installer.proj index 19e5e88a2..bcc0fe5f7 100644 --- a/src/SourceBuild/content/repo-projects/installer.proj +++ b/src/SourceBuild/content/repo-projects/installer.proj @@ -1,15 +1,9 @@ - $(TargetRid) - osx-$(TargetArchitecture) - freebsd-$(TargetArchitecture) - win-$(TargetArchitecture) - $(OverrideTargetRid.Substring(0, $(OverrideTargetRid.IndexOf("-")))) - - - <_platformIndex>$(NETCoreSdkPortableRuntimeIdentifier.LastIndexOf('-')) - $(NETCoreSdkPortableRuntimeIdentifier.Substring(0, $(_platformIndex))) + + $(TargetOS) + $(TargetRid.Substring(0, $(TargetRid.IndexOf("-")))) $(ProjectDirectory)build$(ShellExtension) @@ -17,7 +11,7 @@ $(FlagParameterPrefix)pack $(FlagParameterPrefix)publish - $(BuildArgs) $(FlagParameterPrefix)runtime-id $(OverrideTargetRid) + $(BuildArgs) $(FlagParameterPrefix)runtime-id $(TargetRid) $(BuildArgs) /p:NETCoreAppMaximumVersion=99.9 $(BuildArgs) /p:OSName=$(OSNameOverride) - $(BuildArgs) /p:PortableOSName=$(PortableOS) - $(BuildArgs) /p:Rid=$(OverrideTargetRid) + $(BuildArgs) /p:PortableOSName=$(__PortableTargetOS) + $(BuildArgs) /p:Rid=$(TargetRid) $(BuildArgs) /p:DOTNET_INSTALL_DIR=$(DotNetRoot) - $(BuildArgs) /p:AspNetCoreInstallerRid=$(OverrideTargetRid) + $(BuildArgs) /p:AspNetCoreInstallerRid=$(TargetRid) $(BuildArgs) /p:PortableBuild=true - $(BuildArgs) /p:CoreSetupRid=$(OverrideTargetRid) + $(BuildArgs) /p:CoreSetupRid=$(TargetRid) $(BuildArgs) /p:PublicBaseURL=file:%2F%2F$(SourceBuiltAssetsDir) diff --git a/src/SourceBuild/content/repo-projects/runtime.proj b/src/SourceBuild/content/repo-projects/runtime.proj index 50754cee4..dc1110328 100644 --- a/src/SourceBuild/content/repo-projects/runtime.proj +++ b/src/SourceBuild/content/repo-projects/runtime.proj @@ -3,29 +3,17 @@ true - $(TargetRid) - osx-$(TargetArchitecture) - freebsd-$(TargetArchitecture) - win-$(TargetArchitecture) - - <_platformIndex>$(NETCoreSdkRuntimeIdentifier.LastIndexOf('-')) - $(NETCoreSdkRuntimeIdentifier.Substring(0, $(_platformIndex))) - - <_platformIndex>$(NETCoreSdkPortableRuntimeIdentifier.LastIndexOf('-')) - $(NETCoreSdkPortableRuntimeIdentifier.Substring(0, $(_platformIndex)))-$(TargetArchitecture) - $(ProjectDirectory)build$(ShellExtension) - $(BuildArgs) $(FlagParameterPrefix)arch $(OverrideTargetArch) - $(BuildArgs) $(FlagParameterPrefix)os $(OverrideTargetOS) - $(BuildArgs) /p:TargetRid=$(OverrideTargetRid) - $(BuildArgs) /p:RuntimeOS=$(RuntimeOS) - $(BuildArgs) /p:BaseOS=$(BaseOS) + $(BuildArgs) $(FlagParameterPrefix)arch $(TargetArchitecture) + $(BuildArgs) $(FlagParameterPrefix)os $(TargetOS) + $(BuildArgs) /p:TargetRid=$(TargetRid) + $(BuildArgs) /p:RuntimeOS=$(TargetOS) + $(BuildArgs) /p:BaseOS=$(PortableRid) - false true false diff --git a/src/SourceBuild/content/repo-projects/sdk.proj b/src/SourceBuild/content/repo-projects/sdk.proj index efb8eb4dc..b4b91ed27 100644 --- a/src/SourceBuild/content/repo-projects/sdk.proj +++ b/src/SourceBuild/content/repo-projects/sdk.proj @@ -3,21 +3,14 @@ true - $(TargetRid) - osx-$(TargetArchitecture) - freebsd-$(TargetArchitecture) - win-$(TargetArchitecture) - <_platformIndex>$(NETCoreSdkPortableRuntimeIdentifier.LastIndexOf('-')) <_baseOS>$(NETCoreSdkPortableRuntimeIdentifier.Substring(0, $(_platformIndex))) - <_baseOS Condition="'$(OverrideTargetOS)' != ''">$(OverrideTargetOS) - <_targetPortableArch>$(TargetArchitecture) - <_targetPortableArch Condition="'$(OverrideTargetArch)' != ''">$(OverrideTargetArch) + <_baseOS Condition="'$(PortableBuild)' == 'true'">$(TargetOS) $(BuildArgs) /p:PackageProjectUrl=https://github.com/dotnet/sdk - $(BuildArgs) /p:PortableRid=$(_baseOS)-$(_targetPortableArch) - $(BuildArgs) /p:TargetRid=$(OverrideTargetRid) + $(BuildArgs) /p:PortableRid=$(PortableRid) + $(BuildArgs) /p:TargetRid=$(TargetRid) $(BuildArgs) /p:NativeAotSupported=false From 728ae9e2de82dcc9cb3c104592afea83d46d67da Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Fri, 2 Feb 2024 12:57:27 +0100 Subject: [PATCH 16/19] Respect ci switch for source-only builds (#18497) --- src/SourceBuild/content/build.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/SourceBuild/content/build.sh b/src/SourceBuild/content/build.sh index 02d4fa08a..becd4547d 100755 --- a/src/SourceBuild/content/build.sh +++ b/src/SourceBuild/content/build.sh @@ -206,6 +206,10 @@ function Build { else + if [ "$ci" == "true" ]; then + properties="$properties /p:ContinuousIntegrationBuild=true" + fi + "$CLI_ROOT/dotnet" build-server shutdown if [ "$test" == "true" ]; then From db6f1a6e177875ae76b8195717ce5a0765ce5d46 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 2 Feb 2024 15:37:19 +0000 Subject: [PATCH 17/19] [main] Delete security-partner-dotnet pipeline (#18502) Co-authored-by: Michael Simons --- .../pipelines/security-partners-dotnet.yml | 32 ------------------- 1 file changed, 32 deletions(-) delete mode 100644 src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml diff --git a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml deleted file mode 100644 index 844f876f6..000000000 --- a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml +++ /dev/null @@ -1,32 +0,0 @@ -trigger: none - -variables: -- name: cfsNPMWarnLevel - value: none - -- name: cfsNugetWarnLevel - value: none - -- name: myGetWarnLevel - value: none - -- name: NuGetSecurityAnalysisWarningLevel - value: none - -jobs: -- template: ../../src/installer/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml - parameters: - architecture: x64 - excludeSdkContentTests: true - matrix: - Ubuntu2004-Offline: - _BootstrapPrep: true - _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04 - _EnablePoison: false - _ExcludeOmniSharpTests: false - _RunOnline: false - _WithPreviousSDK: false - name: Build_Tarball_x64 - pool: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 From d693228ff8022dbb5a7886d7cd45f09cde57c568 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Fri, 2 Feb 2024 18:38:41 +0100 Subject: [PATCH 18/19] Fix repo builds not getting propagated when using the minimal console log (#18501) Noticed in https://github.com/dotnet/installer/pull/18409 that errors aren't propagated which resulted in builds not to fail. The fix here is to use `OnError` in the correct target (but only when using the minimal console log feature) and not set `IgnoreStandardErrorWarningFormat=true` on the Exec task that invokes the repo build script. I also cleaned targets up as those introduced unnecessary complexity and logged in cases when they shouldn't (i.e. in dotnet.proj or package-source-build.proj). This affected runtime which errors after 30s of building because of RuntimeOS and BaseOS being passed in in-correctly. Regressed with https://github.com/dotnet/installer/commit/cca2b7bedef771c45eec62492017dde51199378d#diff-86602308e6bb519266bc2f224ea65e39589d273804d40ad0f9c6e0eea2a263dc. Fixed that in runtime.proj. Kudos to Alexander who made the fix. I just copied it in form his CI PR. --- .../repo-projects/Directory.Build.targets | 58 +++++++++---------- .../repo-projects/package-source-build.proj | 2 +- .../content/repo-projects/runtime.proj | 10 +++- .../content/repo-projects/sdk.proj | 5 -- .../source-build-reference-packages.proj | 2 +- 5 files changed, 39 insertions(+), 38 deletions(-) diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets index d96d9edab..f541430d6 100644 --- a/src/SourceBuild/content/repo-projects/Directory.Build.targets +++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets @@ -57,7 +57,6 @@ @@ -146,7 +145,6 @@ @@ -173,8 +171,7 @@ + Condition="'$(UpdateEngCommonFiles)' == 'true' or '$(DotNetBuildSourceOnly)' != 'true'"> @@ -187,7 +184,6 @@ @@ -268,31 +264,25 @@ StopOnFirstFailure="true" /> - + Outputs="$(BaseIntermediateOutputPath)Build.complete" + Condition="'$(BuildCommand)' != ''" + DependsOnTargets="BuildRepoReferences; + UpdateNuGetConfig; + UpdateGlobalJsonVersions; + CreateBuildInputProps; + UpdateEngCommonFiles; + SetSourceBuiltSdkOverrides"> - - - - - - - + + + + + - - - - - - - - - + EnvironmentVariables="@(EnvironmentVariables)" /> + + + + + + + + + + - + + + @@ -643,7 +644,6 @@ diff --git a/src/SourceBuild/content/repo-projects/package-source-build.proj b/src/SourceBuild/content/repo-projects/package-source-build.proj index 9703ad0c0..d95a7336f 100644 --- a/src/SourceBuild/content/repo-projects/package-source-build.proj +++ b/src/SourceBuild/content/repo-projects/package-source-build.proj @@ -13,7 +13,7 @@ + DependsOnTargets="CreateBuildInputProps;DetermineSourceBuiltSdkVersion"> diff --git a/src/SourceBuild/content/repo-projects/runtime.proj b/src/SourceBuild/content/repo-projects/runtime.proj index dc1110328..35bbd9b03 100644 --- a/src/SourceBuild/content/repo-projects/runtime.proj +++ b/src/SourceBuild/content/repo-projects/runtime.proj @@ -3,14 +3,20 @@ true + <_platformIndex>$(NETCoreSdkRuntimeIdentifier.LastIndexOf('-')) + $(NETCoreSdkRuntimeIdentifier.Substring(0, $(_platformIndex))) + + <_platformIndex>$(NETCoreSdkPortableRuntimeIdentifier.LastIndexOf('-')) + $(NETCoreSdkPortableRuntimeIdentifier.Substring(0, $(_platformIndex)))-$(TargetArchitecture) + $(ProjectDirectory)build$(ShellExtension) $(BuildArgs) $(FlagParameterPrefix)arch $(TargetArchitecture) $(BuildArgs) $(FlagParameterPrefix)os $(TargetOS) $(BuildArgs) /p:TargetRid=$(TargetRid) - $(BuildArgs) /p:RuntimeOS=$(TargetOS) - $(BuildArgs) /p:BaseOS=$(PortableRid) + $(BuildArgs) /p:RuntimeOS=$(RuntimeOS) + $(BuildArgs) /p:BaseOS=$(BaseOS) diff --git a/src/SourceBuild/content/repo-projects/sdk.proj b/src/SourceBuild/content/repo-projects/sdk.proj index b4b91ed27..69c6a2826 100644 --- a/src/SourceBuild/content/repo-projects/sdk.proj +++ b/src/SourceBuild/content/repo-projects/sdk.proj @@ -3,11 +3,6 @@ true - - <_platformIndex>$(NETCoreSdkPortableRuntimeIdentifier.LastIndexOf('-')) - <_baseOS>$(NETCoreSdkPortableRuntimeIdentifier.Substring(0, $(_platformIndex))) - <_baseOS Condition="'$(PortableBuild)' == 'true'">$(TargetOS) - $(BuildArgs) /p:PackageProjectUrl=https://github.com/dotnet/sdk $(BuildArgs) /p:PortableRid=$(PortableRid) $(BuildArgs) /p:TargetRid=$(TargetRid) diff --git a/src/SourceBuild/content/repo-projects/source-build-reference-packages.proj b/src/SourceBuild/content/repo-projects/source-build-reference-packages.proj index beeb213fd..a3bf43dae 100644 --- a/src/SourceBuild/content/repo-projects/source-build-reference-packages.proj +++ b/src/SourceBuild/content/repo-projects/source-build-reference-packages.proj @@ -20,7 +20,7 @@ + BeforeTargets="UpdateNuGetConfig"> From 7a829e58d30ff9b8de6d5c0a8c160059ff40c917 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 2 Feb 2024 18:49:22 +0100 Subject: [PATCH 19/19] [main] Update dependencies from dotnet/source-build-externals (#18499) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index acf30536e..841a929f8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -185,9 +185,9 @@ 643a0cb2966b097763158082a138189e22205d3b - + https://github.com/dotnet/source-build-externals - 9f553c88e8a6787c560ab3e7adec226311de7e2c + 949db2fd23b687c0d545e954943feada8b361ed6