Merge branch 'main' into version-feature-60
This commit is contained in:
Daniel Plaisted
GitHub
commit
5d414f0957
77 changed files with 1264 additions and 1048 deletions
|
|
@ -136,10 +136,10 @@ stages:
|
|||
pool:
|
||||
${{ if eq(variables['System.TeamProject'], 'public') }}:
|
||||
name: NetCore1ESPool-Public
|
||||
demands: ImageOverride -equals Build.Ubuntu.1604.Amd64.Open
|
||||
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
|
||||
${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
||||
name: NetCore1ESPool-Internal
|
||||
demands: ImageOverride -equals Build.Ubuntu.1604.Amd64
|
||||
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
|
||||
timeoutInMinutes: 180
|
||||
strategy:
|
||||
matrix:
|
||||
|
|
@ -301,10 +301,10 @@ stages:
|
|||
pool:
|
||||
${{ if eq(variables['System.TeamProject'], 'public') }}:
|
||||
name: NetCore1ESPool-Public
|
||||
demands: ImageOverride -equals Build.Ubuntu.1604.Amd64.Open
|
||||
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
|
||||
${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
||||
name: NetCore1ESPool-Internal
|
||||
demands: ImageOverride -equals Build.Ubuntu.1604.Amd64
|
||||
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
|
||||
timeoutInMinutes: 180
|
||||
strategy:
|
||||
matrix:
|
||||
|
|
|
|||
110
README.md
110
README.md
|
|
@ -127,21 +127,21 @@ We strongly recommend using `--skip-manifest-update` with `dotnet workload insta
|
|||
|
||||
Please 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.
|
||||
|
||||
| Platform | main<br>(7.0.x Runtime) | Release/6.0.1XX<br>(6.0.x Runtime) | Release/5.0.4XX<br>(5.0 Runtime) | Release/5.0.2XX<br>(5.0 Runtime) | Release/3.1.4XX<br>(3.1.x Runtime) |
|
||||
| :--------- | :----------: | :----------: | :----------: | :----------: | :----------: |
|
||||
| **Windows x64** | [![][win-x64-badge-main]][win-x64-version-main]<br>[Installer][win-x64-installer-main] - [Checksum][win-x64-installer-checksum-main]<br>[zip][win-x64-zip-main] - [Checksum][win-x64-zip-checksum-main] | [![][win-x64-badge-6.0.1XX]][win-x64-version-6.0.1XX]<br>[Installer][win-x64-installer-6.0.1XX] - [Checksum][win-x64-installer-checksum-6.0.1XX]<br>[zip][win-x64-zip-6.0.1XX] - [Checksum][win-x64-zip-checksum-6.0.1XX] | [![][win-x64-badge-5.0.4XX]][win-x64-version-5.0.4XX]<br>[Installer][win-x64-installer-5.0.4XX] - [Checksum][win-x64-installer-checksum-5.0.4XX]<br>[zip][win-x64-zip-5.0.4XX] - [Checksum][win-x64-zip-checksum-5.0.4XX] | [![][win-x64-badge-5.0.2XX]][win-x64-version-5.0.2XX]<br>[Installer][win-x64-installer-5.0.2XX] - [Checksum][win-x64-installer-checksum-5.0.2XX]<br>[zip][win-x64-zip-5.0.2XX] - [Checksum][win-x64-zip-checksum-5.0.2XX] | [![][win-x64-badge-3.1.4XX]][win-x64-version-3.1.4XX]<br>[Installer][win-x64-installer-3.1.4XX] - [Checksum][win-x64-installer-checksum-3.1.4XX]<br>[zip][win-x64-zip-3.1.4XX] - [Checksum][win-x64-zip-checksum-3.1.4XX] |
|
||||
| **Windows x86** | [![][win-x86-badge-main]][win-x86-version-main]<br>[Installer][win-x86-installer-main] - [Checksum][win-x86-installer-checksum-main]<br>[zip][win-x86-zip-main] - [Checksum][win-x86-zip-checksum-main] | [![][win-x86-badge-6.0.1XX]][win-x86-version-6.0.1XX]<br>[Installer][win-x86-installer-6.0.1XX] - [Checksum][win-x86-installer-checksum-6.0.1XX]<br>[zip][win-x86-zip-6.0.1XX] - [Checksum][win-x86-zip-checksum-6.0.1XX] | [![][win-x86-badge-5.0.4XX]][win-x86-version-5.0.4XX]<br>[Installer][win-x86-installer-5.0.4XX] - [Checksum][win-x86-installer-checksum-5.0.4XX]<br>[zip][win-x86-zip-5.0.4XX] - [Checksum][win-x86-zip-checksum-5.0.4XX] | [![][win-x86-badge-5.0.2XX]][win-x86-version-5.0.2XX]<br>[Installer][win-x86-installer-5.0.2XX] - [Checksum][win-x86-installer-checksum-5.0.2XX]<br>[zip][win-x86-zip-5.0.2XX] - [Checksum][win-x86-zip-checksum-5.0.2XX] | [![][win-x86-badge-3.1.4XX]][win-x86-version-3.1.4XX]<br>[Installer][win-x86-installer-3.1.4XX] - [Checksum][win-x86-installer-checksum-3.1.4XX]<br>[zip][win-x86-zip-3.1.4XX] - [Checksum][win-x86-zip-checksum-3.1.4XX] |
|
||||
| **Windows arm** | **N/A** | **N/A** | **N/A** | **N/A** | [![][win-arm-badge-3.1.4XX]][win-arm-version-3.1.4XX]<br>[zip][win-arm-zip-3.1.4XX] - [Checksum][win-arm-zip-checksum-3.1.4XX] |
|
||||
| **Windows arm64** | [![][win-arm64-badge-main]][win-arm64-version-main]<br>[Installer][win-arm64-installer-main] - [Checksum][win-arm64-installer-checksum-main]<br>[zip][win-arm64-zip-main] | [![][win-arm64-badge-6.0.1XX]][win-arm64-version-6.0.1XX]<br>[Installer][win-arm64-installer-6.0.1XX] - [Checksum][win-arm64-installer-checksum-6.0.1XX]<br>[zip][win-arm64-zip-6.0.1XX] | [![][win-arm64-badge-5.0.4XX]][win-arm64-version-5.0.4XX]<br>[Installer][win-arm64-installer-5.0.4XX] - [Checksum][win-arm64-installer-checksum-5.0.4XX]<br>[zip][win-arm64-zip-5.0.4XX] | [![][win-arm64-badge-5.0.2XX]][win-arm64-version-5.0.2XX]<br>[Installer][win-arm64-installer-5.0.2XX] - [Checksum][win-arm64-installer-checksum-5.0.2XX]<br>[zip][win-arm64-zip-5.0.2XX] | **N/A** |
|
||||
| **macOS x64** | [![][osx-x64-badge-main]][osx-x64-version-main]<br>[Installer][osx-x64-installer-main] - [Checksum][osx-x64-installer-checksum-main]<br>[tar.gz][osx-x64-targz-main] - [Checksum][osx-x64-targz-checksum-main] | [![][osx-x64-badge-6.0.1XX]][osx-x64-version-6.0.1XX]<br>[Installer][osx-x64-installer-6.0.1XX] - [Checksum][osx-x64-installer-checksum-6.0.1XX]<br>[tar.gz][osx-x64-targz-6.0.1XX] - [Checksum][osx-x64-targz-checksum-6.0.1XX] | [![][osx-x64-badge-5.0.4XX]][osx-x64-version-5.0.4XX]<br>[Installer][osx-x64-installer-5.0.4XX] - [Checksum][osx-x64-installer-checksum-5.0.4XX]<br>[tar.gz][osx-x64-targz-5.0.4XX] - [Checksum][osx-x64-targz-checksum-5.0.4XX] | [![][osx-x64-badge-5.0.2XX]][osx-x64-version-5.0.2XX]<br>[Installer][osx-x64-installer-5.0.2XX] - [Checksum][osx-x64-installer-checksum-5.0.2XX]<br>[tar.gz][osx-x64-targz-5.0.2XX] - [Checksum][osx-x64-targz-checksum-5.0.2XX] | [![][osx-x64-badge-3.1.4XX]][osx-x64-version-3.1.4XX]<br>[Installer][osx-x64-installer-3.1.4XX] - [Checksum][osx-x64-installer-checksum-3.1.4XX]<br>[tar.gz][osx-x64-targz-3.1.4XX] - [Checksum][osx-x64-targz-checksum-3.1.4XX] |
|
||||
| **macOS arm64** | [![][osx-arm64-badge-main]][osx-arm64-version-main]<br>[Installer][osx-arm64-installer-main] - [Checksum][osx-arm64-installer-checksum-main]<br>[tar.gz][osx-arm64-targz-main] - [Checksum][osx-arm64-targz-checksum-main] | [![][osx-arm64-badge-6.0.1XX]][osx-arm64-version-6.0.1XX]<br>[Installer][osx-arm64-installer-6.0.1XX] - [Checksum][osx-arm64-installer-checksum-6.0.1XX]<br>[tar.gz][osx-arm64-targz-6.0.1XX] - [Checksum][osx-arm64-targz-checksum-6.0.1XX] | **N/A** | **N/A** | **N/A** |
|
||||
| **Linux x64** | [![][linux-badge-main]][linux-version-main]<br>[DEB Installer][linux-DEB-installer-main] - [Checksum][linux-DEB-installer-checksum-main]<br>[RPM Installer][linux-RPM-installer-main] - [Checksum][linux-RPM-installer-checksum-main]<br>_see installer note below_<sup>1</sup><br>[tar.gz][linux-targz-main] - [Checksum][linux-targz-checksum-main] | [![][linux-badge-6.0.1XX]][linux-version-6.0.1XX]<br>[DEB Installer][linux-DEB-installer-6.0.1XX] - [Checksum][linux-DEB-installer-checksum-6.0.1XX]<br>[RPM Installer][linux-RPM-installer-6.0.1XX] - [Checksum][linux-RPM-installer-checksum-6.0.1XX]<br>_see installer note below_<sup>1</sup><br>[tar.gz][linux-targz-6.0.1XX] - [Checksum][linux-targz-checksum-6.0.1XX] | [![][linux-badge-5.0.4XX]][linux-version-5.0.4XX]<br>[DEB Installer][linux-DEB-installer-5.0.4XX] - [Checksum][linux-DEB-installer-checksum-5.0.4XX]<br>[RPM Installer][linux-RPM-installer-5.0.4XX] - [Checksum][linux-RPM-installer-checksum-5.0.4XX]<br>_see installer note below_<sup>1</sup><br>[tar.gz][linux-targz-5.0.4XX] - [Checksum][linux-targz-checksum-5.0.4XX] | [![][linux-badge-5.0.2XX]][linux-version-5.0.2XX]<br>[DEB Installer][linux-DEB-installer-5.0.2XX] - [Checksum][linux-DEB-installer-checksum-5.0.2XX]<br>[RPM Installer][linux-RPM-installer-5.0.2XX] - [Checksum][linux-RPM-installer-checksum-5.0.2XX]<br>_see installer note below_<sup>1</sup><br>[tar.gz][linux-targz-5.0.2XX] - [Checksum][linux-targz-checksum-5.0.2XX] | [![][linux-badge-3.1.4XX]][linux-version-3.1.4XX]<br>[DEB Installer][linux-DEB-installer-3.1.4XX] - [Checksum][linux-DEB-installer-checksum-3.1.4XX]<br>[RPM Installer][linux-RPM-installer-3.1.4XX] - [Checksum][linux-RPM-installer-checksum-3.1.4XX]<br>_see installer note below_<sup>1</sup><br>[tar.gz][linux-targz-3.1.4XX] - [Checksum][linux-targz-checksum-3.1.4XX] |
|
||||
| **Linux arm** | [![][linux-arm-badge-main]][linux-arm-version-main]<br>[tar.gz][linux-arm-targz-main] - [Checksum][linux-arm-targz-checksum-main] | [![][linux-arm-badge-6.0.1XX]][linux-arm-version-6.0.1XX]<br>[tar.gz][linux-arm-targz-6.0.1XX] - [Checksum][linux-arm-targz-checksum-6.0.1XX] | [![][linux-arm-badge-5.0.4XX]][linux-arm-version-5.0.4XX]<br>[tar.gz][linux-arm-targz-5.0.4XX] - [Checksum][linux-arm-targz-checksum-5.0.4XX] | [![][linux-arm-badge-5.0.2XX]][linux-arm-version-5.0.2XX]<br>[tar.gz][linux-arm-targz-5.0.2XX] - [Checksum][linux-arm-targz-checksum-5.0.2XX] | [![][linux-arm-badge-3.1.4XX]][linux-arm-version-3.1.4XX]<br>[tar.gz][linux-arm-targz-3.1.4XX] - [Checksum][linux-arm-targz-checksum-3.1.4XX] |
|
||||
| **Linux arm64** | [![][linux-arm64-badge-main]][linux-arm64-version-main]<br>[tar.gz][linux-arm64-targz-main] - [Checksum][linux-arm64-targz-checksum-main] | [![][linux-arm64-badge-6.0.1XX]][linux-arm64-version-6.0.1XX]<br>[tar.gz][linux-arm64-targz-6.0.1XX] - [Checksum][linux-arm64-targz-checksum-6.0.1XX] | [![][linux-arm64-badge-5.0.4XX]][linux-arm64-version-5.0.4XX]<br>[tar.gz][linux-arm64-targz-5.0.4XX] - [Checksum][linux-arm64-targz-checksum-5.0.4XX] | [![][linux-arm64-badge-5.0.2XX]][linux-arm64-version-5.0.2XX]<br>[tar.gz][linux-arm64-targz-5.0.2XX] - [Checksum][linux-arm64-targz-checksum-5.0.2XX] | [![][linux-arm64-badge-3.1.4XX]][linux-arm64-version-3.1.4XX]<br>[tar.gz][linux-arm64-targz-3.1.4XX] - [Checksum][linux-arm64-targz-checksum-3.1.4XX] |
|
||||
| **Linux-musl-x64** | [![][linux-musl-x64-badge-main]][linux-musl-x64-version-main]<br>[tar.gz][linux-musl-x64-targz-main] - [Checksum][linux-musl-x64-targz-checksum-main] | [![][linux-musl-x64-badge-6.0.1XX]][linux-musl-x64-version-6.0.1XX]<br>[tar.gz][linux-musl-x64-targz-6.0.1XX] - [Checksum][linux-musl-x64-targz-checksum-6.0.1XX] | [![][linux-musl-x64-badge-5.0.4XX]][linux-musl-x64-version-5.0.4XX]<br>[tar.gz][linux-musl-x64-targz-5.0.4XX] - [Checksum][linux-musl-x64-targz-checksum-5.0.4XX] | [![][linux-musl-x64-badge-5.0.2XX]][linux-musl-x64-version-5.0.2XX]<br>[tar.gz][linux-musl-x64-targz-5.0.2XX] - [Checksum][linux-musl-x64-targz-checksum-5.0.2XX] | [![][linux-musl-x64-badge-3.1.4XX]][linux-musl-x64-version-3.1.4XX]<br>[tar.gz][linux-musl-x64-targz-3.1.4XX] - [Checksum][linux-musl-x64-targz-checksum-3.1.4XX] |
|
||||
| **Linux-musl-arm** | [![][linux-musl-arm-badge-main]][linux-musl-arm-version-main]<br>[tar.gz][linux-musl-arm-targz-main] - [Checksum][linux-musl-arm-targz-checksum-main] | [![][linux-musl-arm-badge-6.0.1XX]][linux-musl-arm-version-6.0.1XX]<br>[tar.gz][linux-musl-arm-targz-6.0.1XX] - [Checksum][linux-musl-arm-targz-checksum-6.0.1XX] | [![][linux-musl-arm-badge-5.0.4XX]][linux-musl-arm-version-5.0.4XX]<br>[tar.gz][linux-musl-arm-targz-5.0.4XX] - [Checksum][linux-musl-arm-targz-checksum-5.0.4XX] | [![][linux-musl-arm-badge-5.0.2XX]][linux-musl-arm-version-5.0.2XX]<br>[tar.gz][linux-musl-arm-targz-5.0.2XX] - [Checksum][linux-musl-arm-targz-checksum-5.0.2XX] | **N/A** |
|
||||
| **Linux-musl-arm64** | [![][linux-musl-arm64-badge-main]][linux-musl-arm64-version-main]<br>[tar.gz][linux-musl-arm64-targz-main] - [Checksum][linux-musl-arm64-targz-checksum-main] | [![][linux-musl-arm64-badge-6.0.1XX]][linux-musl-arm64-version-6.0.1XX]<br>[tar.gz][linux-musl-arm64-targz-6.0.1XX] - [Checksum][linux-musl-arm64-targz-checksum-6.0.1XX] | [![][linux-musl-arm64-badge-5.0.4XX]][linux-musl-arm64-version-5.0.4XX]<br>[tar.gz][linux-musl-arm64-targz-5.0.4XX] - [Checksum][linux-musl-arm64-targz-checksum-5.0.4XX] | [![][linux-musl-arm64-badge-5.0.2XX]][linux-musl-arm64-version-5.0.2XX]<br>[tar.gz][linux-musl-arm64-targz-5.0.2XX] - [Checksum][linux-musl-arm64-targz-checksum-5.0.2XX] | **N/A** |
|
||||
| **RHEL 6** | **N/A** | **N/A** | **N/A** | **N/A** | [![][rhel-6-badge-3.1.4XX]][rhel-6-version-3.1.4XX]<br>[tar.gz][rhel-6-targz-3.1.4XX] - [Checksum][rhel-6-targz-checksum-3.1.4XX] |
|
||||
| Platform | main<br>(7.0.x Runtime) | Release/6.0.2XX<br>(6.0.x Runtime) | Release/6.0.1XX<br>(6.0.x Runtime) | Release/5.0.4XX<br>(5.0 Runtime) | Release/5.0.2XX<br>(5.0 Runtime) | Release/3.1.4XX<br>(3.1.x Runtime) |
|
||||
| :--------- | :----------: | :----------: | :----------: | :----------: | :----------: | :----------: |
|
||||
| **Windows x64** | [![][win-x64-badge-main]][win-x64-version-main]<br>[Installer][win-x64-installer-main] - [Checksum][win-x64-installer-checksum-main]<br>[zip][win-x64-zip-main] - [Checksum][win-x64-zip-checksum-main] | [![][win-x64-badge-6.0.2XX]][win-x64-version-6.0.2XX]<br>[Installer][win-x64-installer-6.0.2XX] - [Checksum][win-x64-installer-checksum-6.0.2XX]<br>[zip][win-x64-zip-6.0.2XX] - [Checksum][win-x64-zip-checksum-6.0.2XX] | [![][win-x64-badge-6.0.1XX]][win-x64-version-6.0.1XX]<br>[Installer][win-x64-installer-6.0.1XX] - [Checksum][win-x64-installer-checksum-6.0.1XX]<br>[zip][win-x64-zip-6.0.1XX] - [Checksum][win-x64-zip-checksum-6.0.1XX] | [![][win-x64-badge-5.0.4XX]][win-x64-version-5.0.4XX]<br>[Installer][win-x64-installer-5.0.4XX] - [Checksum][win-x64-installer-checksum-5.0.4XX]<br>[zip][win-x64-zip-5.0.4XX] - [Checksum][win-x64-zip-checksum-5.0.4XX] | [![][win-x64-badge-5.0.2XX]][win-x64-version-5.0.2XX]<br>[Installer][win-x64-installer-5.0.2XX] - [Checksum][win-x64-installer-checksum-5.0.2XX]<br>[zip][win-x64-zip-5.0.2XX] - [Checksum][win-x64-zip-checksum-5.0.2XX] | [![][win-x64-badge-3.1.4XX]][win-x64-version-3.1.4XX]<br>[Installer][win-x64-installer-3.1.4XX] - [Checksum][win-x64-installer-checksum-3.1.4XX]<br>[zip][win-x64-zip-3.1.4XX] - [Checksum][win-x64-zip-checksum-3.1.4XX] |
|
||||
| **Windows x86** | [![][win-x86-badge-main]][win-x86-version-main]<br>[Installer][win-x86-installer-main] - [Checksum][win-x86-installer-checksum-main]<br>[zip][win-x86-zip-main] - [Checksum][win-x86-zip-checksum-main] | [![][win-x86-badge-6.0.2XX]][win-x86-version-6.0.2XX]<br>[Installer][win-x86-installer-6.0.2XX] - [Checksum][win-x86-installer-checksum-6.0.2XX]<br>[zip][win-x86-zip-6.0.2XX] - [Checksum][win-x86-zip-checksum-6.0.2XX] | [![][win-x86-badge-6.0.1XX]][win-x86-version-6.0.1XX]<br>[Installer][win-x86-installer-6.0.1XX] - [Checksum][win-x86-installer-checksum-6.0.1XX]<br>[zip][win-x86-zip-6.0.1XX] - [Checksum][win-x86-zip-checksum-6.0.1XX] | [![][win-x86-badge-5.0.4XX]][win-x86-version-5.0.4XX]<br>[Installer][win-x86-installer-5.0.4XX] - [Checksum][win-x86-installer-checksum-5.0.4XX]<br>[zip][win-x86-zip-5.0.4XX] - [Checksum][win-x86-zip-checksum-5.0.4XX] | [![][win-x86-badge-5.0.2XX]][win-x86-version-5.0.2XX]<br>[Installer][win-x86-installer-5.0.2XX] - [Checksum][win-x86-installer-checksum-5.0.2XX]<br>[zip][win-x86-zip-5.0.2XX] - [Checksum][win-x86-zip-checksum-5.0.2XX] | [![][win-x86-badge-3.1.4XX]][win-x86-version-3.1.4XX]<br>[Installer][win-x86-installer-3.1.4XX] - [Checksum][win-x86-installer-checksum-3.1.4XX]<br>[zip][win-x86-zip-3.1.4XX] - [Checksum][win-x86-zip-checksum-3.1.4XX] |
|
||||
| **Windows arm** | **N/A** | **N/A** | **N/A** | **N/A** | **N/A** | [![][win-arm-badge-3.1.4XX]][win-arm-version-3.1.4XX]<br>[zip][win-arm-zip-3.1.4XX] - [Checksum][win-arm-zip-checksum-3.1.4XX] |
|
||||
| **Windows arm64** | [![][win-arm64-badge-main]][win-arm64-version-main]<br>[Installer][win-arm64-installer-main] - [Checksum][win-arm64-installer-checksum-main]<br>[zip][win-arm64-zip-main] | [![][win-arm64-badge-6.0.2XX]][win-arm64-version-6.0.2XX]<br>[Installer][win-arm64-installer-6.0.2XX] - [Checksum][win-arm64-installer-checksum-6.0.2XX]<br>[zip][win-arm64-zip-6.0.2XX] | [![][win-arm64-badge-6.0.1XX]][win-arm64-version-6.0.1XX]<br>[Installer][win-arm64-installer-6.0.1XX] - [Checksum][win-arm64-installer-checksum-6.0.1XX]<br>[zip][win-arm64-zip-6.0.1XX] | [![][win-arm64-badge-5.0.4XX]][win-arm64-version-5.0.4XX]<br>[Installer][win-arm64-installer-5.0.4XX] - [Checksum][win-arm64-installer-checksum-5.0.4XX]<br>[zip][win-arm64-zip-5.0.4XX] | [![][win-arm64-badge-5.0.2XX]][win-arm64-version-5.0.2XX]<br>[Installer][win-arm64-installer-5.0.2XX] - [Checksum][win-arm64-installer-checksum-5.0.2XX]<br>[zip][win-arm64-zip-5.0.2XX] | **N/A** |
|
||||
| **macOS x64** | [![][osx-x64-badge-main]][osx-x64-version-main]<br>[Installer][osx-x64-installer-main] - [Checksum][osx-x64-installer-checksum-main]<br>[tar.gz][osx-x64-targz-main] - [Checksum][osx-x64-targz-checksum-main] | [![][osx-x64-badge-6.0.2XX]][osx-x64-version-6.0.2XX]<br>[Installer][osx-x64-installer-6.0.2XX] - [Checksum][osx-x64-installer-checksum-6.0.2XX]<br>[tar.gz][osx-x64-targz-6.0.2XX] - [Checksum][osx-x64-targz-checksum-6.0.2XX] | [![][osx-x64-badge-6.0.1XX]][osx-x64-version-6.0.1XX]<br>[Installer][osx-x64-installer-6.0.1XX] - [Checksum][osx-x64-installer-checksum-6.0.1XX]<br>[tar.gz][osx-x64-targz-6.0.1XX] - [Checksum][osx-x64-targz-checksum-6.0.1XX] | [![][osx-x64-badge-5.0.4XX]][osx-x64-version-5.0.4XX]<br>[Installer][osx-x64-installer-5.0.4XX] - [Checksum][osx-x64-installer-checksum-5.0.4XX]<br>[tar.gz][osx-x64-targz-5.0.4XX] - [Checksum][osx-x64-targz-checksum-5.0.4XX] | [![][osx-x64-badge-5.0.2XX]][osx-x64-version-5.0.2XX]<br>[Installer][osx-x64-installer-5.0.2XX] - [Checksum][osx-x64-installer-checksum-5.0.2XX]<br>[tar.gz][osx-x64-targz-5.0.2XX] - [Checksum][osx-x64-targz-checksum-5.0.2XX] | [![][osx-x64-badge-3.1.4XX]][osx-x64-version-3.1.4XX]<br>[Installer][osx-x64-installer-3.1.4XX] - [Checksum][osx-x64-installer-checksum-3.1.4XX]<br>[tar.gz][osx-x64-targz-3.1.4XX] - [Checksum][osx-x64-targz-checksum-3.1.4XX] |
|
||||
| **macOS arm64** | [![][osx-arm64-badge-main]][osx-arm64-version-main]<br>[Installer][osx-arm64-installer-main] - [Checksum][osx-arm64-installer-checksum-main]<br>[tar.gz][osx-arm64-targz-main] - [Checksum][osx-arm64-targz-checksum-main] | [![][osx-arm64-badge-6.0.2XX]][osx-arm64-version-6.0.2XX]<br>[Installer][osx-arm64-installer-6.0.2XX] - [Checksum][osx-arm64-installer-checksum-6.0.2XX]<br>[tar.gz][osx-arm64-targz-6.0.2XX] - [Checksum][osx-arm64-targz-checksum-6.0.2XX] | [![][osx-arm64-badge-6.0.1XX]][osx-arm64-version-6.0.1XX]<br>[Installer][osx-arm64-installer-6.0.1XX] - [Checksum][osx-arm64-installer-checksum-6.0.1XX]<br>[tar.gz][osx-arm64-targz-6.0.1XX] - [Checksum][osx-arm64-targz-checksum-6.0.1XX] | **N/A** | **N/A** | **N/A** |
|
||||
| **Linux x64** | [![][linux-badge-main]][linux-version-main]<br>[DEB Installer][linux-DEB-installer-main] - [Checksum][linux-DEB-installer-checksum-main]<br>[RPM Installer][linux-RPM-installer-main] - [Checksum][linux-RPM-installer-checksum-main]<br>_see installer note below_<sup>1</sup><br>[tar.gz][linux-targz-main] - [Checksum][linux-targz-checksum-main] | [![][linux-badge-6.0.2XX]][linux-version-6.0.2XX]<br>[DEB Installer][linux-DEB-installer-6.0.2XX] - [Checksum][linux-DEB-installer-checksum-6.0.2XX]<br>[RPM Installer][linux-RPM-installer-6.0.2XX] - [Checksum][linux-RPM-installer-checksum-6.0.2XX]<br>_see installer note below_<sup>1</sup><br>[tar.gz][linux-targz-6.0.2XX] - [Checksum][linux-targz-checksum-6.0.2XX] | [![][linux-badge-6.0.1XX]][linux-version-6.0.1XX]<br>[DEB Installer][linux-DEB-installer-6.0.1XX] - [Checksum][linux-DEB-installer-checksum-6.0.1XX]<br>[RPM Installer][linux-RPM-installer-6.0.1XX] - [Checksum][linux-RPM-installer-checksum-6.0.1XX]<br>_see installer note below_<sup>1</sup><br>[tar.gz][linux-targz-6.0.1XX] - [Checksum][linux-targz-checksum-6.0.1XX] | [![][linux-badge-5.0.4XX]][linux-version-5.0.4XX]<br>[DEB Installer][linux-DEB-installer-5.0.4XX] - [Checksum][linux-DEB-installer-checksum-5.0.4XX]<br>[RPM Installer][linux-RPM-installer-5.0.4XX] - [Checksum][linux-RPM-installer-checksum-5.0.4XX]<br>_see installer note below_<sup>1</sup><br>[tar.gz][linux-targz-5.0.4XX] - [Checksum][linux-targz-checksum-5.0.4XX] | [![][linux-badge-5.0.2XX]][linux-version-5.0.2XX]<br>[DEB Installer][linux-DEB-installer-5.0.2XX] - [Checksum][linux-DEB-installer-checksum-5.0.2XX]<br>[RPM Installer][linux-RPM-installer-5.0.2XX] - [Checksum][linux-RPM-installer-checksum-5.0.2XX]<br>_see installer note below_<sup>1</sup><br>[tar.gz][linux-targz-5.0.2XX] - [Checksum][linux-targz-checksum-5.0.2XX] | [![][linux-badge-3.1.4XX]][linux-version-3.1.4XX]<br>[DEB Installer][linux-DEB-installer-3.1.4XX] - [Checksum][linux-DEB-installer-checksum-3.1.4XX]<br>[RPM Installer][linux-RPM-installer-3.1.4XX] - [Checksum][linux-RPM-installer-checksum-3.1.4XX]<br>_see installer note below_<sup>1</sup><br>[tar.gz][linux-targz-3.1.4XX] - [Checksum][linux-targz-checksum-3.1.4XX] |
|
||||
| **Linux arm** | [![][linux-arm-badge-main]][linux-arm-version-main]<br>[tar.gz][linux-arm-targz-main] - [Checksum][linux-arm-targz-checksum-main] | [![][linux-arm-badge-6.0.2XX]][linux-arm-version-6.0.2XX]<br>[tar.gz][linux-arm-targz-6.0.2XX] - [Checksum][linux-arm-targz-checksum-6.0.2XX] | [![][linux-arm-badge-6.0.1XX]][linux-arm-version-6.0.1XX]<br>[tar.gz][linux-arm-targz-6.0.1XX] - [Checksum][linux-arm-targz-checksum-6.0.1XX] | [![][linux-arm-badge-5.0.4XX]][linux-arm-version-5.0.4XX]<br>[tar.gz][linux-arm-targz-5.0.4XX] - [Checksum][linux-arm-targz-checksum-5.0.4XX] | [![][linux-arm-badge-5.0.2XX]][linux-arm-version-5.0.2XX]<br>[tar.gz][linux-arm-targz-5.0.2XX] - [Checksum][linux-arm-targz-checksum-5.0.2XX] | [![][linux-arm-badge-3.1.4XX]][linux-arm-version-3.1.4XX]<br>[tar.gz][linux-arm-targz-3.1.4XX] - [Checksum][linux-arm-targz-checksum-3.1.4XX] |
|
||||
| **Linux arm64** | [![][linux-arm64-badge-main]][linux-arm64-version-main]<br>[tar.gz][linux-arm64-targz-main] - [Checksum][linux-arm64-targz-checksum-main] | [![][linux-arm64-badge-6.0.2XX]][linux-arm64-version-6.0.2XX]<br>[tar.gz][linux-arm64-targz-6.0.2XX] - [Checksum][linux-arm64-targz-checksum-6.0.2XX] | [![][linux-arm64-badge-6.0.1XX]][linux-arm64-version-6.0.1XX]<br>[tar.gz][linux-arm64-targz-6.0.1XX] - [Checksum][linux-arm64-targz-checksum-6.0.1XX] | [![][linux-arm64-badge-5.0.4XX]][linux-arm64-version-5.0.4XX]<br>[tar.gz][linux-arm64-targz-5.0.4XX] - [Checksum][linux-arm64-targz-checksum-5.0.4XX] | [![][linux-arm64-badge-5.0.2XX]][linux-arm64-version-5.0.2XX]<br>[tar.gz][linux-arm64-targz-5.0.2XX] - [Checksum][linux-arm64-targz-checksum-5.0.2XX] | [![][linux-arm64-badge-3.1.4XX]][linux-arm64-version-3.1.4XX]<br>[tar.gz][linux-arm64-targz-3.1.4XX] - [Checksum][linux-arm64-targz-checksum-3.1.4XX] |
|
||||
| **Linux-musl-x64** | [![][linux-musl-x64-badge-main]][linux-musl-x64-version-main]<br>[tar.gz][linux-musl-x64-targz-main] - [Checksum][linux-musl-x64-targz-checksum-main] | [![][linux-musl-x64-badge-6.0.2XX]][linux-musl-x64-version-6.0.2XX]<br>[tar.gz][linux-musl-x64-targz-6.0.2XX] - [Checksum][linux-musl-x64-targz-checksum-6.0.2XX] | [![][linux-musl-x64-badge-6.0.1XX]][linux-musl-x64-version-6.0.1XX]<br>[tar.gz][linux-musl-x64-targz-6.0.1XX] - [Checksum][linux-musl-x64-targz-checksum-6.0.1XX] | [![][linux-musl-x64-badge-5.0.4XX]][linux-musl-x64-version-5.0.4XX]<br>[tar.gz][linux-musl-x64-targz-5.0.4XX] - [Checksum][linux-musl-x64-targz-checksum-5.0.4XX] | [![][linux-musl-x64-badge-5.0.2XX]][linux-musl-x64-version-5.0.2XX]<br>[tar.gz][linux-musl-x64-targz-5.0.2XX] - [Checksum][linux-musl-x64-targz-checksum-5.0.2XX] | [![][linux-musl-x64-badge-3.1.4XX]][linux-musl-x64-version-3.1.4XX]<br>[tar.gz][linux-musl-x64-targz-3.1.4XX] - [Checksum][linux-musl-x64-targz-checksum-3.1.4XX] |
|
||||
| **Linux-musl-arm** | [![][linux-musl-arm-badge-main]][linux-musl-arm-version-main]<br>[tar.gz][linux-musl-arm-targz-main] - [Checksum][linux-musl-arm-targz-checksum-main] | [![][linux-musl-arm-badge-6.0.2XX]][linux-musl-arm-version-6.0.2XX]<br>[tar.gz][linux-musl-arm-targz-6.0.2XX] - [Checksum][linux-musl-arm-targz-checksum-6.0.2XX] | [![][linux-musl-arm-badge-6.0.1XX]][linux-musl-arm-version-6.0.1XX]<br>[tar.gz][linux-musl-arm-targz-6.0.1XX] - [Checksum][linux-musl-arm-targz-checksum-6.0.1XX] | [![][linux-musl-arm-badge-5.0.4XX]][linux-musl-arm-version-5.0.4XX]<br>[tar.gz][linux-musl-arm-targz-5.0.4XX] - [Checksum][linux-musl-arm-targz-checksum-5.0.4XX] | [![][linux-musl-arm-badge-5.0.2XX]][linux-musl-arm-version-5.0.2XX]<br>[tar.gz][linux-musl-arm-targz-5.0.2XX] - [Checksum][linux-musl-arm-targz-checksum-5.0.2XX] | **N/A** |
|
||||
| **Linux-musl-arm64** | [![][linux-musl-arm64-badge-main]][linux-musl-arm64-version-main]<br>[tar.gz][linux-musl-arm64-targz-main] - [Checksum][linux-musl-arm64-targz-checksum-main] | [![][linux-musl-arm64-badge-6.0.2XX]][linux-musl-arm64-version-6.0.2XX]<br>[tar.gz][linux-musl-arm64-targz-6.0.2XX] - [Checksum][linux-musl-arm64-targz-checksum-6.0.2XX] | [![][linux-musl-arm64-badge-6.0.1XX]][linux-musl-arm64-version-6.0.1XX]<br>[tar.gz][linux-musl-arm64-targz-6.0.1XX] - [Checksum][linux-musl-arm64-targz-checksum-6.0.1XX] | [![][linux-musl-arm64-badge-5.0.4XX]][linux-musl-arm64-version-5.0.4XX]<br>[tar.gz][linux-musl-arm64-targz-5.0.4XX] - [Checksum][linux-musl-arm64-targz-checksum-5.0.4XX] | [![][linux-musl-arm64-badge-5.0.2XX]][linux-musl-arm64-version-5.0.2XX]<br>[tar.gz][linux-musl-arm64-targz-5.0.2XX] - [Checksum][linux-musl-arm64-targz-checksum-5.0.2XX] | **N/A** |
|
||||
| **RHEL 6** | **N/A** | **N/A** | **N/A** | **N/A** | **N/A** | [![][rhel-6-badge-3.1.4XX]][rhel-6-version-3.1.4XX]<br>[tar.gz][rhel-6-targz-3.1.4XX] - [Checksum][rhel-6-targz-checksum-3.1.4XX] |
|
||||
|
||||
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:
|
||||
|
|
@ -157,6 +157,13 @@ Reference notes:
|
|||
[win-x64-zip-main]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-win-x64.zip
|
||||
[win-x64-zip-checksum-main]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-win-x64.zip.sha
|
||||
|
||||
[win-x64-badge-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/win_x64_Release_version_badge.svg
|
||||
[win-x64-version-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/productCommit-win-x64.txt
|
||||
[win-x64-installer-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-win-x64.exe
|
||||
[win-x64-installer-checksum-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-win-x64.exe.sha
|
||||
[win-x64-zip-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-win-x64.zip
|
||||
[win-x64-zip-checksum-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-win-x64.zip.sha
|
||||
|
||||
[win-x64-badge-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/win_x64_Release_version_badge.svg
|
||||
[win-x64-version-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/productCommit-win-x64.txt
|
||||
[win-x64-installer-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/dotnet-sdk-win-x64.exe
|
||||
|
|
@ -192,6 +199,13 @@ Reference notes:
|
|||
[win-x86-zip-main]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-win-x86.zip
|
||||
[win-x86-zip-checksum-main]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-win-x86.zip.sha
|
||||
|
||||
[win-x86-badge-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/win_x86_Release_version_badge.svg
|
||||
[win-x86-version-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/productCommit-win-x86.txt
|
||||
[win-x86-installer-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-win-x86.exe
|
||||
[win-x86-installer-checksum-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-win-x86.exe.sha
|
||||
[win-x86-zip-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-win-x86.zip
|
||||
[win-x86-zip-checksum-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-win-x86.zip.sha
|
||||
|
||||
[win-x86-badge-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/win_x86_Release_version_badge.svg
|
||||
[win-x86-version-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/productCommit-win-x86.txt
|
||||
[win-x86-installer-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/dotnet-sdk-win-x86.exe
|
||||
|
|
@ -227,6 +241,13 @@ Reference notes:
|
|||
[osx-x64-targz-main]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-osx-x64.tar.gz
|
||||
[osx-x64-targz-checksum-main]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-osx-x64.pkg.tar.gz.sha
|
||||
|
||||
[osx-x64-badge-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/osx_x64_Release_version_badge.svg
|
||||
[osx-x64-version-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/productCommit-osx-x64.txt
|
||||
[osx-x64-installer-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-osx-x64.pkg
|
||||
[osx-x64-installer-checksum-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-osx-x64.pkg.sha
|
||||
[osx-x64-targz-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-osx-x64.tar.gz
|
||||
[osx-x64-targz-checksum-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-osx-x64.pkg.tar.gz.sha
|
||||
|
||||
[osx-x64-badge-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/osx_x64_Release_version_badge.svg
|
||||
[osx-x64-version-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/productCommit-osx-x64.txt
|
||||
[osx-x64-installer-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/dotnet-sdk-osx-x64.pkg
|
||||
|
|
@ -262,6 +283,13 @@ Reference notes:
|
|||
[osx-arm64-targz-main]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-osx-arm64.tar.gz
|
||||
[osx-arm64-targz-checksum-main]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-osx-arm64.pkg.tar.gz.sha
|
||||
|
||||
[osx-arm64-badge-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/osx_arm64_Release_version_badge.svg
|
||||
[osx-arm64-version-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/productCommit-osx-arm64.txt
|
||||
[osx-arm64-installer-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-osx-arm64.pkg
|
||||
[osx-arm64-installer-checksum-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-osx-arm64.pkg.sha
|
||||
[osx-arm64-targz-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-osx-arm64.tar.gz
|
||||
[osx-arm64-targz-checksum-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-osx-arm64.pkg.tar.gz.sha
|
||||
|
||||
[osx-arm64-badge-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/osx_arm64_Release_version_badge.svg
|
||||
[osx-arm64-version-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/productCommit-osx-arm64.txt
|
||||
[osx-arm64-installer-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/dotnet-sdk-osx-arm64.pkg
|
||||
|
|
@ -278,6 +306,15 @@ Reference notes:
|
|||
[linux-targz-main]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-linux-x64.tar.gz
|
||||
[linux-targz-checksum-main]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-linux-x64.tar.gz.sha
|
||||
|
||||
[linux-badge-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/linux_x64_Release_version_badge.svg
|
||||
[linux-version-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/productCommit-linux-x64.txt
|
||||
[linux-DEB-installer-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-x64.deb
|
||||
[linux-DEB-installer-checksum-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-x64.deb.sha
|
||||
[linux-RPM-installer-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-x64.rpm
|
||||
[linux-RPM-installer-checksum-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-x64.rpm.sha
|
||||
[linux-targz-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-linux-x64.tar.gz
|
||||
[linux-targz-checksum-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-linux-x64.tar.gz.sha
|
||||
|
||||
[linux-badge-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/linux_x64_Release_version_badge.svg
|
||||
[linux-version-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/productCommit-linux-x64.txt
|
||||
[linux-DEB-installer-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/dotnet-sdk-x64.deb
|
||||
|
|
@ -319,6 +356,11 @@ Reference notes:
|
|||
[linux-arm-targz-main]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-linux-arm.tar.gz
|
||||
[linux-arm-targz-checksum-main]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-linux-arm.tar.gz.sha
|
||||
|
||||
[linux-arm-badge-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/linux_arm_Release_version_badge.svg
|
||||
[linux-arm-version-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/productCommit-linux-arm.txt
|
||||
[linux-arm-targz-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-linux-arm.tar.gz
|
||||
[linux-arm-targz-checksum-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-linux-arm.tar.gz.sha
|
||||
|
||||
[linux-arm-badge-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/linux_arm_Release_version_badge.svg
|
||||
[linux-arm-version-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/productCommit-linux-arm.txt
|
||||
[linux-arm-targz-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/dotnet-sdk-linux-arm.tar.gz
|
||||
|
|
@ -344,6 +386,11 @@ Reference notes:
|
|||
[linux-arm64-targz-main]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-linux-arm64.tar.gz
|
||||
[linux-arm64-targz-checksum-main]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-linux-arm64.tar.gz.sha
|
||||
|
||||
[linux-arm64-badge-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/linux_arm64_Release_version_badge.svg
|
||||
[linux-arm64-version-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/productCommit-linux-arm64.txt
|
||||
[linux-arm64-targz-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-linux-arm64.tar.gz
|
||||
[linux-arm64-targz-checksum-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-linux-arm64.tar.gz.sha
|
||||
|
||||
[linux-arm64-badge-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/linux_arm64_Release_version_badge.svg
|
||||
[linux-arm64-version-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/productCommit-linux-arm64.txt
|
||||
[linux-arm64-targz-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/dotnet-sdk-linux-arm64.tar.gz
|
||||
|
|
@ -369,6 +416,11 @@ Reference notes:
|
|||
[rhel-6-targz-main]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-rhel.6-x64.tar.gz
|
||||
[rhel-6-targz-checksum-main]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-rhel.6-x64.tar.gz.sha
|
||||
|
||||
[rhel-6-badge-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/rhel.6_x64_Release_version_badge.svg
|
||||
[rhel-6-version-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/productCommit-rhel.6-x64.txt
|
||||
[rhel-6-targz-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-rhel.6-x64.tar.gz
|
||||
[rhel-6-targz-checksum-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-rhel.6-x64.tar.gz.sha
|
||||
|
||||
[rhel-6-badge-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/rhel.6_x64_Release_version_badge.svg
|
||||
[rhel-6-version-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/productCommit-rhel.6-x64.txt
|
||||
[rhel-6-targz-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/dotnet-sdk-rhel.6-x64.tar.gz
|
||||
|
|
@ -394,6 +446,11 @@ Reference notes:
|
|||
[linux-musl-x64-targz-main]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-linux-musl-x64.tar.gz
|
||||
[linux-musl-x64-targz-checksum-main]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-linux-musl-x64.tar.gz.sha
|
||||
|
||||
[linux-musl-x64-badge-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/linux_musl_x64_Release_version_badge.svg
|
||||
[linux-musl-x64-version-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/productCommit-linux-musl-x64.txt
|
||||
[linux-musl-x64-targz-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-linux-musl-x64.tar.gz
|
||||
[linux-musl-x64-targz-checksum-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-linux-musl-x64.tar.gz.sha
|
||||
|
||||
[linux-musl-x64-badge-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/linux_musl_x64_Release_version_badge.svg
|
||||
[linux-musl-x64-version-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/productCommit-linux-musl-x64.txt
|
||||
[linux-musl-x64-targz-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/dotnet-sdk-linux-musl-x64.tar.gz
|
||||
|
|
@ -419,6 +476,11 @@ Reference notes:
|
|||
[linux-musl-arm-targz-main]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-linux-musl-arm.tar.gz
|
||||
[linux-musl-arm-targz-checksum-main]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-linux-musl-arm.tar.gz.sha
|
||||
|
||||
[linux-musl-arm-badge-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/linux_musl_arm_Release_version_badge.svg
|
||||
[linux-musl-arm-version-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/productCommit-linux-musl-arm.txt
|
||||
[linux-musl-arm-targz-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-linux-musl-arm.tar.gz
|
||||
[linux-musl-arm-targz-checksum-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-linux-musl-arm.tar.gz.sha
|
||||
|
||||
[linux-musl-arm-badge-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/linux_musl_arm_Release_version_badge.svg
|
||||
[linux-musl-arm-version-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/productCommit-linux-musl-arm.txt
|
||||
[linux-musl-arm-targz-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/dotnet-sdk-linux-musl-arm.tar.gz
|
||||
|
|
@ -439,6 +501,11 @@ Reference notes:
|
|||
[linux-musl-arm64-targz-main]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-linux-musl-arm64.tar.gz
|
||||
[linux-musl-arm64-targz-checksum-main]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-linux-musl-arm64.tar.gz.sha
|
||||
|
||||
[linux-musl-arm64-badge-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/linux_musl_arm64_Release_version_badge.svg
|
||||
[linux-musl-arm64-version-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/productCommit-linux-musl-arm64.txt
|
||||
[linux-musl-arm64-targz-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-linux-musl-arm64.tar.gz
|
||||
[linux-musl-arm64-targz-checksum-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-linux-musl-arm64.tar.gz.sha
|
||||
|
||||
[linux-musl-arm64-badge-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/linux_musl_arm64_Release_version_badge.svg
|
||||
[linux-musl-arm64-version-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/productCommit-linux-musl-arm64.txt
|
||||
[linux-musl-arm64-targz-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/dotnet-sdk-linux-musl-arm64.tar.gz
|
||||
|
|
@ -459,6 +526,11 @@ Reference notes:
|
|||
[win-arm-zip-main]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-win-arm.zip
|
||||
[win-arm-zip-checksum-main]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-win-arm.zip.sha
|
||||
|
||||
[win-arm-badge-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/win_arm_Release_version_badge.svg
|
||||
[win-arm-version-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/productCommit-win-arm.txt
|
||||
[win-arm-zip-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-win-arm.zip
|
||||
[win-arm-zip-checksum-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-win-arm.zip.sha
|
||||
|
||||
[win-arm-badge-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/win_arm_Release_version_badge.svg
|
||||
[win-arm-version-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/productCommit-win-arm.txt
|
||||
[win-arm-zip-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/dotnet-sdk-win-arm.zip
|
||||
|
|
@ -486,6 +558,13 @@ Reference notes:
|
|||
[win-arm64-zip-main]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-win-arm64.zip
|
||||
[win-arm64-zip-checksum-main]: https://aka.ms/dotnet/7.0.1xx/daily/dotnet-sdk-win-arm64.zip.sha
|
||||
|
||||
[win-arm64-badge-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/win_arm64_Release_version_badge.svg
|
||||
[win-arm64-version-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/productCommit-win-arm64.txt
|
||||
[win-arm64-installer-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-win-arm64.exe
|
||||
[win-arm64-installer-checksum-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-win-arm64.exe.sha
|
||||
[win-arm64-zip-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-win-arm64.zip
|
||||
[win-arm64-zip-checksum-6.0.2XX]: https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-win-arm64.zip.sha
|
||||
|
||||
[win-arm64-badge-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/win_arm64_Release_version_badge.svg
|
||||
[win-arm64-version-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/productCommit-win-arm64.txt
|
||||
[win-arm64-installer-6.0.1XX]: https://aka.ms/dotnet/6.0.1xx/daily/dotnet-sdk-win-arm64.exe
|
||||
|
|
@ -509,7 +588,6 @@ Reference notes:
|
|||
|
||||
[sdk-shas-2.2.1XX]: https://github.com/dotnet/versions/tree/master/build-info/dotnet/product/cli/release/2.2#built-repositories
|
||||
|
||||
|
||||
Looking for dotnet-install sources?
|
||||
-----------------------------------
|
||||
|
||||
|
|
|
|||
2
build.sh
2
build.sh
|
|
@ -53,5 +53,5 @@ dockerbuild()
|
|||
if [ ! -z "$BUILD_IN_DOCKER" ]; then
|
||||
dockerbuild $args
|
||||
else
|
||||
sudo $DIR/run-build.sh $args
|
||||
$DIR/run-build.sh $args
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -9,10 +9,10 @@
|
|||
Basically: In this file, choose the highest version when resolving merge conflicts.
|
||||
-->
|
||||
<PropertyGroup>
|
||||
<MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>10.0.17763.21</MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>
|
||||
<MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>10.0.18362.21</MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>
|
||||
<MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>10.0.19041.21</MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>
|
||||
<MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>10.0.20348.21</MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>
|
||||
<MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>10.0.22000.21</MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>
|
||||
<MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>10.0.17763.22</MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>
|
||||
<MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>10.0.18362.22</MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>
|
||||
<MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>10.0.19041.22</MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>
|
||||
<MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>10.0.20348.22</MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>
|
||||
<MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>10.0.22000.22</MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,46 +1,46 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Dependencies>
|
||||
<ProductDependencies>
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="7.0.0-alpha.1.21561.11" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="7.0.0-alpha.1.21627.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
||||
<Sha>0ba1c9c58bfdaa964bd88d729a2ccab3da55380d</Sha>
|
||||
<Sha>30b4a6548f27f9bd2c0b9b4e1779566bc99aa0da</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.0-alpha.1.21561.11" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.0-alpha.1.21627.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
||||
<Sha>0ba1c9c58bfdaa964bd88d729a2ccab3da55380d</Sha>
|
||||
<Sha>30b4a6548f27f9bd2c0b9b4e1779566bc99aa0da</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.0-alpha.1.21561.11" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.0-alpha.1.21627.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
||||
<Sha>0ba1c9c58bfdaa964bd88d729a2ccab3da55380d</Sha>
|
||||
<Sha>30b4a6548f27f9bd2c0b9b4e1779566bc99aa0da</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="7.0.0-alpha.1.21561.11" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="7.0.0-alpha.1.21627.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
||||
<Sha>0ba1c9c58bfdaa964bd88d729a2ccab3da55380d</Sha>
|
||||
<Sha>30b4a6548f27f9bd2c0b9b4e1779566bc99aa0da</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.0-alpha.1.21561.18" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.0-alpha.1.21628.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>5fa6dd364982be4ffd83358adbf130d88049c72a</Sha>
|
||||
<Sha>bdc6ad73834a13e80f131e402e883903c31ea172</Sha>
|
||||
<SourceBuildTarball RepoName="runtime" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-alpha.1.21561.18" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-alpha.1.21628.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>5fa6dd364982be4ffd83358adbf130d88049c72a</Sha>
|
||||
<Sha>bdc6ad73834a13e80f131e402e883903c31ea172</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.7.0" Version="7.0.0-alpha.1.21561.18" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.7.0" Version="7.0.0-alpha.1.21628.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>5fa6dd364982be4ffd83358adbf130d88049c72a</Sha>
|
||||
<Sha>bdc6ad73834a13e80f131e402e883903c31ea172</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0-alpha.1.21561.18" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0-alpha.1.21628.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>5fa6dd364982be4ffd83358adbf130d88049c72a</Sha>
|
||||
<Sha>bdc6ad73834a13e80f131e402e883903c31ea172</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="7.0.0-alpha.1.21561.18" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="7.0.0-alpha.1.21628.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>5fa6dd364982be4ffd83358adbf130d88049c72a</Sha>
|
||||
<Sha>bdc6ad73834a13e80f131e402e883903c31ea172</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="7.0.0-alpha.1.21561.18" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="7.0.0-alpha.1.21628.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>5fa6dd364982be4ffd83358adbf130d88049c72a</Sha>
|
||||
<Sha>bdc6ad73834a13e80f131e402e883903c31ea172</Sha>
|
||||
</Dependency>
|
||||
<!-- Change blob version in GenerateLayout.targets if this is unpinned to service targeting pack -->
|
||||
<!-- No new netstandard.library planned for 3.1 timeframe at this time. -->
|
||||
|
|
@ -48,74 +48,74 @@
|
|||
<Uri>https://github.com/dotnet/core-setup</Uri>
|
||||
<Sha>7d57652f33493fa022125b7f63aad0d70c52d810</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.Platforms" Version="7.0.0-alpha.1.21561.18" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.Platforms" Version="7.0.0-alpha.1.21628.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>5fa6dd364982be4ffd83358adbf130d88049c72a</Sha>
|
||||
<Sha>bdc6ad73834a13e80f131e402e883903c31ea172</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.0-alpha.1.21561.9" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.0-alpha.1.21628.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>bc118a35bd662a48881975cfc293ee4c4bada01c</Sha>
|
||||
<Sha>cf03093f2431b12a3c5d8fe2539e3ce5e7503056</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="7.0.0-alpha.1.21561.9" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="7.0.0-alpha.1.21628.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>bc118a35bd662a48881975cfc293ee4c4bada01c</Sha>
|
||||
<Sha>cf03093f2431b12a3c5d8fe2539e3ce5e7503056</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="7.0.0-alpha.1.21561.9" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="7.0.0-alpha.1.21628.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>bc118a35bd662a48881975cfc293ee4c4bada01c</Sha>
|
||||
<Sha>cf03093f2431b12a3c5d8fe2539e3ce5e7503056</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0" Version="7.0.0-alpha.1.21561.9" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0" Version="7.0.0-alpha.1.21628.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>bc118a35bd662a48881975cfc293ee4c4bada01c</Sha>
|
||||
<Sha>cf03093f2431b12a3c5d8fe2539e3ce5e7503056</Sha>
|
||||
<SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="dotnet-dev-certs" Version="7.0.0-alpha.1.21561.9" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="dotnet-dev-certs" Version="7.0.0-alpha.1.21628.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>bc118a35bd662a48881975cfc293ee4c4bada01c</Sha>
|
||||
<Sha>cf03093f2431b12a3c5d8fe2539e3ce5e7503056</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="dotnet-user-secrets" Version="7.0.0-alpha.1.21561.9" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="dotnet-user-secrets" Version="7.0.0-alpha.1.21628.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>bc118a35bd662a48881975cfc293ee4c4bada01c</Sha>
|
||||
<Sha>cf03093f2431b12a3c5d8fe2539e3ce5e7503056</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.21552.1">
|
||||
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.21622.1">
|
||||
<Uri>https://github.com/dotnet/test-templates</Uri>
|
||||
<Sha>60b6eefb3eb13f1e90e656fb28f96d838e06c5cb</Sha>
|
||||
<Sha>aef25c8e45e2ab42294cef1b37e3657c118d74b7</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.5.0" Version="1.0.2-beta4.21552.1">
|
||||
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.5.0" Version="1.0.2-beta4.21622.1">
|
||||
<Uri>https://github.com/dotnet/test-templates</Uri>
|
||||
<Sha>60b6eefb3eb13f1e90e656fb28f96d838e06c5cb</Sha>
|
||||
<Sha>aef25c8e45e2ab42294cef1b37e3657c118d74b7</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.6.0" Version="1.0.2-beta4.21552.1">
|
||||
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.6.0" Version="1.0.2-beta4.21622.1">
|
||||
<Uri>https://github.com/dotnet/test-templates</Uri>
|
||||
<Sha>60b6eefb3eb13f1e90e656fb28f96d838e06c5cb</Sha>
|
||||
<Sha>aef25c8e45e2ab42294cef1b37e3657c118d74b7</Sha>
|
||||
<SourceBuild RepoName="test-templates" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.100-alpha.1.21554.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.100-alpha.1.21628.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/templating</Uri>
|
||||
<Sha>7669cc78ac5d15ad0ee5b68e65d7d6f753fe918b</Sha>
|
||||
<Sha>e3cb3f7692212a4ae4e18d022fe722e92caba5ef</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.100-alpha.1.21554.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.100-alpha.1.21628.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/templating</Uri>
|
||||
<Sha>7669cc78ac5d15ad0ee5b68e65d7d6f753fe918b</Sha>
|
||||
<Sha>e3cb3f7692212a4ae4e18d022fe722e92caba5ef</Sha>
|
||||
<SourceBuild RepoName="templating" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.100-alpha.1.21562.5">
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.100-alpha.1.21629.4">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>db6dfb2d5b88cda7e7bcee95cc17f7774ea84a45</Sha>
|
||||
<Sha>31d4db7dc94bb2f1f4d0ef84ebf158d61f2a7c4f</Sha>
|
||||
<SourceBuild RepoName="sdk" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.100-alpha.1.21562.5">
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.100-alpha.1.21629.4">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>db6dfb2d5b88cda7e7bcee95cc17f7774ea84a45</Sha>
|
||||
<Sha>31d4db7dc94bb2f1f4d0ef84ebf158d61f2a7c4f</Sha>
|
||||
</Dependency>
|
||||
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
|
||||
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.0-alpha.1.21561.9" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.0-alpha.1.21627.16" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Uri>https://github.com/dotnet/winforms</Uri>
|
||||
<Sha>7ce653ce1d831ba80dd02882745b6b3b28053f6c</Sha>
|
||||
<Sha>9a23e3fd56cb9f7bdfed821240cf1975d6efe65e</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="7.0.0-alpha.1.21561.9" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="7.0.0-alpha.1.21627.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Uri>https://github.com/dotnet/wpf</Uri>
|
||||
<Sha>6031b232f379ac75b8d7d315048b9d47afa87e15</Sha>
|
||||
<Sha>62129e5739fcbdb35fb64598bc57cd1a01620f81</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.0.0-beta.21522.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/fsharp</Uri>
|
||||
|
|
@ -126,25 +126,25 @@
|
|||
<Sha>6d626ff0752a77d339f609b4d361787dc9ca93a5</Sha>
|
||||
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.1.0-preview-20211109-03" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.2.0-preview-20211223-02" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/microsoft/vstest</Uri>
|
||||
<Sha>1dc3ba2e137b3cdaada4edfb41210b2b0237c428</Sha>
|
||||
<Sha>aead1740e3b06a784f3da53ff1525badedef0c78</Sha>
|
||||
<SourceBuildTarball RepoName="vstest" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.21561.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.21628.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/linker</Uri>
|
||||
<Sha>1d47968b26535eae0ab4b0463efdcd6f13178193</Sha>
|
||||
<Sha>e48859c88826f2cead6f5a7426c65391ad62a659</Sha>
|
||||
<SourceBuild RepoName="linker" ManagedOnly="true" />
|
||||
<RepoName>linker</RepoName>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.1-1.21561.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.1-1.21619.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/roslyn</Uri>
|
||||
<Sha>add472bbed002fcea9232e89793d0762cc71c5cf</Sha>
|
||||
<Sha>4bc1f9a38a54283007b9ba142f032ddc2e111cf4</Sha>
|
||||
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Build" Version="17.1.0-preview-21559-03" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.Build" Version="17.1.0-preview-21613-01" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/msbuild</Uri>
|
||||
<Sha>2b604c3a38772f7d70b369e0ad0da32257ed1b35</Sha>
|
||||
<Sha>efea551540e0a8cea8b4b35818d93972027fee7e</Sha>
|
||||
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="NuGet.Build.Tasks" Version="6.0.0-rc.278" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
|
|
@ -161,9 +161,9 @@
|
|||
<Uri>https://github.com/aspnet/xdt</Uri>
|
||||
<Sha>c01a538851a8ab1a1fbeb2e6243f391fff7587b4</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-7.0.100" Version="7.0.0-alpha.1.21560.2" CoherentParentDependency="VS.Redist.Common.NetCore.SharedFramework.x64.7.0">
|
||||
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-7.0.100" Version="7.0.0-alpha.1.21601.1" CoherentParentDependency="VS.Redist.Common.NetCore.SharedFramework.x64.7.0">
|
||||
<Uri>https://github.com/dotnet/emsdk</Uri>
|
||||
<Sha>24412d4288fda1d3c9fed49a7961bb4c476c0ce6</Sha>
|
||||
<Sha>4eb953d7051890da4f36167125c6b41e06d7f56d</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build" Version="0.1.0-alpha.1.21475.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/source-build</Uri>
|
||||
|
|
@ -172,33 +172,33 @@
|
|||
</Dependency>
|
||||
</ProductDependencies>
|
||||
<ToolsetDependencies>
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21559.3">
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21628.1">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>fecf65bedcee9036b8ba9d8d7feef5413f294914</Sha>
|
||||
<Sha>a248c67a80f8ec9d10872e88729de0d070f3d64e</Sha>
|
||||
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.21559.3">
|
||||
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.21628.1">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>fecf65bedcee9036b8ba9d8d7feef5413f294914</Sha>
|
||||
<Sha>a248c67a80f8ec9d10872e88729de0d070f3d64e</Sha>
|
||||
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.21559.3">
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.21628.1">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>fecf65bedcee9036b8ba9d8d7feef5413f294914</Sha>
|
||||
<Sha>a248c67a80f8ec9d10872e88729de0d070f3d64e</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="6.0.0-alpha.1.21521.1">
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="7.0.0-alpha.1.21628.1">
|
||||
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
|
||||
<Sha>fc184172bf8144f7c91a7bc0226b7d90c5821576</Sha>
|
||||
<Sha>2f4e9eb4da9d3eb5d9c4346e0b11449a2995f0f3</Sha>
|
||||
<SourceBuildTarball RepoName="source-build-reference-packages" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.SourceLink.GitHub" Version="1.1.0-beta-21551-02" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
|
||||
<Dependency Name="Microsoft.SourceLink.GitHub" Version="1.2.0-beta-21620-02" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
|
||||
<Uri>https://github.com/dotnet/sourcelink</Uri>
|
||||
<Sha>02a36d32650b2dbeabb3f5fb318461557c89014d</Sha>
|
||||
<Sha>392126dabae557bf0664f599b5469ccc6d1dfcd8</Sha>
|
||||
<SourceBuild RepoName="sourcelink" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.21518.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
|
||||
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.21624.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
|
||||
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
|
||||
<Sha>8bf78e6a8537ba89c23fbd1f2f219e5ab4d2a812</Sha>
|
||||
<Sha>83b25ddf3bb32541ae885e9f3b2e8503e4488902</Sha>
|
||||
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
</ToolsetDependencies>
|
||||
|
|
|
|||
|
|
@ -18,26 +18,32 @@
|
|||
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
|
||||
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
|
||||
</PropertyGroup>
|
||||
<!-- Restore feeds -->
|
||||
<PropertyGroup Label="Restore feeds">
|
||||
<!-- In an orchestrated build, this may be overridden to other Azure feeds. -->
|
||||
<DotNetAssetRootUrl Condition="'$(DotNetAssetRootUrl)'==''">https://dotnetbuilds.blob.core.windows.net/public/</DotNetAssetRootUrl>
|
||||
<DotNetPrivateAssetRootUrl Condition="'$(DotNetPrivateAssetRootUrl)'==''">https://dotnetclimsrc.blob.core.windows.net/dotnet/</DotNetPrivateAssetRootUrl>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/arcade -->
|
||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.21559.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.21628.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/winforms -->
|
||||
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>7.0.0-alpha.1.21561.9</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
|
||||
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>7.0.0-alpha.1.21627.16</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/wpf -->
|
||||
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>7.0.0-alpha.1.21561.9</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
|
||||
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>7.0.0-alpha.1.21627.4</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/templating -->
|
||||
<MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.100-alpha.1.21554.1</MicrosoftDotNetCommonItemTemplatesPackageVersion>
|
||||
<MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.100-alpha.1.21628.1</MicrosoftDotNetCommonItemTemplatesPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/test-templates -->
|
||||
<MicrosoftDotNetTestProjectTemplates50PackageVersion>1.0.2-beta4.21552.1</MicrosoftDotNetTestProjectTemplates50PackageVersion>
|
||||
<MicrosoftDotNetTestProjectTemplates60PackageVersion>1.0.2-beta4.21552.1</MicrosoftDotNetTestProjectTemplates60PackageVersion>
|
||||
<MicrosoftDotNetTestProjectTemplates50PackageVersion>1.0.2-beta4.21622.1</MicrosoftDotNetTestProjectTemplates50PackageVersion>
|
||||
<MicrosoftDotNetTestProjectTemplates60PackageVersion>1.0.2-beta4.21622.1</MicrosoftDotNetTestProjectTemplates60PackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- NUnit3.DotNetNew.Template versions do not 'flow in' -->
|
||||
|
|
@ -45,44 +51,44 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
|
||||
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>7.0.0-alpha.1.21561.9</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefPackageVersion>7.0.0-alpha.1.21561.9</MicrosoftAspNetCoreAppRefPackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefInternalPackageVersion>7.0.0-alpha.1.21561.9</MicrosoftAspNetCoreAppRefInternalPackageVersion>
|
||||
<VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>7.0.0-alpha.1.21561.9</VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>
|
||||
<dotnetdevcertsPackageVersion>7.0.0-alpha.1.21561.9</dotnetdevcertsPackageVersion>
|
||||
<dotnetusersecretsPackageVersion>7.0.0-alpha.1.21561.9</dotnetusersecretsPackageVersion>
|
||||
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>7.0.0-alpha.1.21628.1</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefPackageVersion>7.0.0-alpha.1.21628.1</MicrosoftAspNetCoreAppRefPackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefInternalPackageVersion>7.0.0-alpha.1.21628.1</MicrosoftAspNetCoreAppRefInternalPackageVersion>
|
||||
<VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>7.0.0-alpha.1.21628.1</VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>
|
||||
<dotnetdevcertsPackageVersion>7.0.0-alpha.1.21628.1</dotnetdevcertsPackageVersion>
|
||||
<dotnetusersecretsPackageVersion>7.0.0-alpha.1.21628.1</dotnetusersecretsPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/sdk -->
|
||||
<MicrosoftNETSdkPackageVersion>7.0.100-alpha.1.21562.5</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.100-alpha.1.21562.5</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>7.0.100-alpha.1.21629.4</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.100-alpha.1.21629.4</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
|
||||
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
|
||||
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/corefx -->
|
||||
<MicrosoftNETCorePlatformsPackageVersion>7.0.0-alpha.1.21561.18</MicrosoftNETCorePlatformsPackageVersion>
|
||||
<MicrosoftNETCorePlatformsPackageVersion>7.0.0-alpha.1.21628.1</MicrosoftNETCorePlatformsPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/core-setup -->
|
||||
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.0-alpha.1.21561.18</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
|
||||
<VSRedistCommonNetCoreTargetingPackx6470PackageVersion>7.0.0-alpha.1.21561.18</VSRedistCommonNetCoreTargetingPackx6470PackageVersion>
|
||||
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>7.0.0-alpha.1.21561.18</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppHostwinx64PackageVersion>7.0.0-alpha.1.21561.18</MicrosoftNETCoreAppHostwinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-alpha.1.21561.18</MicrosoftNETCoreAppRefPackageVersion>
|
||||
<MicrosoftNETCoreDotNetHostResolverPackageVersion>7.0.0-alpha.1.21561.18</MicrosoftNETCoreDotNetHostResolverPackageVersion>
|
||||
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.0-alpha.1.21628.1</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
|
||||
<VSRedistCommonNetCoreTargetingPackx6470PackageVersion>7.0.0-alpha.1.21628.1</VSRedistCommonNetCoreTargetingPackx6470PackageVersion>
|
||||
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>7.0.0-alpha.1.21628.1</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppHostwinx64PackageVersion>7.0.0-alpha.1.21628.1</MicrosoftNETCoreAppHostwinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-alpha.1.21628.1</MicrosoftNETCoreAppRefPackageVersion>
|
||||
<MicrosoftNETCoreDotNetHostResolverPackageVersion>7.0.0-alpha.1.21628.1</MicrosoftNETCoreDotNetHostResolverPackageVersion>
|
||||
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
|
||||
<VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>7.0.0-alpha.1.21561.11</VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>
|
||||
<VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>7.0.0-alpha.1.21561.11</VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>7.0.0-alpha.1.21561.11</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRefPackageVersion>7.0.0-alpha.1.21561.11</MicrosoftWindowsDesktopAppRefPackageVersion>
|
||||
<VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>7.0.0-alpha.1.21627.4</VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>
|
||||
<VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>7.0.0-alpha.1.21627.4</VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>7.0.0-alpha.1.21627.4</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRefPackageVersion>7.0.0-alpha.1.21627.4</MicrosoftWindowsDesktopAppRefPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 -->
|
||||
|
|
@ -117,14 +123,14 @@
|
|||
<NUnit3Templates60PackageVersion>$(NUnit3DotNetNewTemplatePackageVersion)</NUnit3Templates60PackageVersion>
|
||||
<MicrosoftDotNetCommonItemTemplates60PackageVersion>$(MicrosoftDotNetCommonItemTemplates60PackageVersion)</MicrosoftDotNetCommonItemTemplates60PackageVersion>
|
||||
<MicrosoftDotNetCommonProjectTemplates60PackageVersion>$(MicrosoftDotNetCommonItemTemplates60PackageVersion)</MicrosoftDotNetCommonProjectTemplates60PackageVersion>
|
||||
<AspNetCorePackageVersionFor60Templates>6.0.0</AspNetCorePackageVersionFor60Templates>
|
||||
<AspNetCorePackageVersionFor60Templates>6.0.1</AspNetCorePackageVersionFor60Templates>
|
||||
<!-- 5.0 Template versions -->
|
||||
<MicrosoftDotnetWinFormsProjectTemplates50PackageVersion>$(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion)</MicrosoftDotnetWinFormsProjectTemplates50PackageVersion>
|
||||
<MicrosoftDotNetWpfProjectTemplates50PackageVersion>$(MicrosoftDotNetWpfProjectTemplatesPackageVersion)</MicrosoftDotNetWpfProjectTemplates50PackageVersion>
|
||||
<NUnit3Templates50PackageVersion>$(NUnit3DotNetNewTemplatePackageVersion)</NUnit3Templates50PackageVersion>
|
||||
<MicrosoftDotNetCommonItemTemplates50PackageVersion>$(MicrosoftDotNetCommonItemTemplates50PackageVersion)</MicrosoftDotNetCommonItemTemplates50PackageVersion>
|
||||
<MicrosoftDotNetCommonProjectTemplates50PackageVersion>$(MicrosoftDotNetCommonItemTemplates50PackageVersion)</MicrosoftDotNetCommonProjectTemplates50PackageVersion>
|
||||
<AspNetCorePackageVersionFor50Templates>5.0.12</AspNetCorePackageVersionFor50Templates>
|
||||
<AspNetCorePackageVersionFor50Templates>5.0.13</AspNetCorePackageVersionFor50Templates>
|
||||
<!-- 3.1 Template versions -->
|
||||
<MicrosoftDotnetWinFormsProjectTemplates31PackageVersion>4.8.1-servicing.19605.5</MicrosoftDotnetWinFormsProjectTemplates31PackageVersion>
|
||||
<MicrosoftDotNetWpfProjectTemplates31PackageVersion>3.1.2-servicing.20066.4</MicrosoftDotNetWpfProjectTemplates31PackageVersion>
|
||||
|
|
@ -132,7 +138,7 @@
|
|||
<MicrosoftDotNetCommonItemTemplates31PackageVersion>3.1.15</MicrosoftDotNetCommonItemTemplates31PackageVersion>
|
||||
<MicrosoftDotNetCommonProjectTemplates31PackageVersion>$(MicrosoftDotNetCommonItemTemplates31PackageVersion)</MicrosoftDotNetCommonProjectTemplates31PackageVersion>
|
||||
<MicrosoftDotNetTestProjectTemplates31PackageVersion>$(MicrosoftDotNetTestProjectTemplates50PackageVersion)</MicrosoftDotNetTestProjectTemplates31PackageVersion>
|
||||
<AspNetCorePackageVersionFor31Templates>3.1.21</AspNetCorePackageVersionFor31Templates>
|
||||
<AspNetCorePackageVersionFor31Templates>3.1.22</AspNetCorePackageVersionFor31Templates>
|
||||
<MicrosoftAspNetCoreComponentsWebAssemblyTemplatesPackageVersion>3.2.1</MicrosoftAspNetCoreComponentsWebAssemblyTemplatesPackageVersion>
|
||||
<!-- 3.0 Template versions -->
|
||||
<MicrosoftDotnetWinFormsProjectTemplates30PackageVersion>4.8.0-rc2.19462.10</MicrosoftDotnetWinFormsProjectTemplates30PackageVersion>
|
||||
|
|
@ -146,14 +152,14 @@
|
|||
<NUnit3Templates21PackageVersion>1.5.3</NUnit3Templates21PackageVersion>
|
||||
<MicrosoftDotNetCommonItemTemplates21PackageVersion>1.0.2-beta3</MicrosoftDotNetCommonItemTemplates21PackageVersion>
|
||||
<MicrosoftDotNetCommonProjectTemplates21PackageVersion>$(MicrosoftDotNetCommonItemTemplates21PackageVersion)</MicrosoftDotNetCommonProjectTemplates21PackageVersion>
|
||||
<MicrosoftDotNetTestProjectTemplates21PackageVersion>1.0.2-beta4.21552.1</MicrosoftDotNetTestProjectTemplates21PackageVersion>
|
||||
<MicrosoftDotNetTestProjectTemplates21PackageVersion>1.0.2-beta4.21622.1</MicrosoftDotNetTestProjectTemplates21PackageVersion>
|
||||
<AspNetCorePackageVersionFor21Templates>2.1.30</AspNetCorePackageVersionFor21Templates>
|
||||
</PropertyGroup>
|
||||
<!-- infrastructure and test only dependencies -->
|
||||
<PropertyGroup>
|
||||
<VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
|
||||
<DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
|
||||
<MicrosoftNETTestSdkVersion>17.1.0-preview-20211109-03</MicrosoftNETTestSdkVersion>
|
||||
<MicrosoftNETTestSdkVersion>17.2.0-preview-20211223-02</MicrosoftNETTestSdkVersion>
|
||||
</PropertyGroup>
|
||||
<!-- dependencies for source-build tarball -->
|
||||
<PropertyGroup>
|
||||
|
|
@ -179,14 +185,14 @@
|
|||
</PropertyGroup>
|
||||
<!-- Workload manifest package versions -->
|
||||
<PropertyGroup>
|
||||
<MauiWorkloadManifestVersion>6.0.100-rc.1.1351</MauiWorkloadManifestVersion>
|
||||
<XamarinAndroidWorkloadManifestVersion>30.0.100-rc.1.137</XamarinAndroidWorkloadManifestVersion>
|
||||
<XamarinIOSWorkloadManifestVersion>15.0.100-rc.1.496</XamarinIOSWorkloadManifestVersion>
|
||||
<XamarinMacCatalystWorkloadManifestVersion>15.0.100-rc.1.496</XamarinMacCatalystWorkloadManifestVersion>
|
||||
<XamarinMacOSWorkloadManifestVersion>12.0.100-rc.1.496</XamarinMacOSWorkloadManifestVersion>
|
||||
<XamarinTvOSWorkloadManifestVersion>15.0.100-rc.1.496</XamarinTvOSWorkloadManifestVersion>
|
||||
<MauiWorkloadManifestVersion>6.0.101-preview.9.1805</MauiWorkloadManifestVersion>
|
||||
<XamarinAndroidWorkloadManifestVersion>31.0.101-preview.9.16</XamarinAndroidWorkloadManifestVersion>
|
||||
<XamarinIOSWorkloadManifestVersion>15.0.101-preview.9.31</XamarinIOSWorkloadManifestVersion>
|
||||
<XamarinMacCatalystWorkloadManifestVersion>15.0.101-preview.9.31</XamarinMacCatalystWorkloadManifestVersion>
|
||||
<XamarinMacOSWorkloadManifestVersion>12.0.101-preview.9.31</XamarinMacOSWorkloadManifestVersion>
|
||||
<XamarinTvOSWorkloadManifestVersion>15.0.101-preview.9.31</XamarinTvOSWorkloadManifestVersion>
|
||||
<MonoWorkloadManifestVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MonoWorkloadManifestVersion>
|
||||
<MicrosoftNETWorkloadEmscriptenManifest70100Version>7.0.0-alpha.1.21560.2</MicrosoftNETWorkloadEmscriptenManifest70100Version>
|
||||
<MicrosoftNETWorkloadEmscriptenManifest70100Version>7.0.0-alpha.1.21601.1</MicrosoftNETWorkloadEmscriptenManifest70100Version>
|
||||
<EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenManifest70100Version)</EmscriptenWorkloadManifestVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
|
|
|
|||
|
|
@ -187,10 +187,6 @@ function InitializeCustomToolset {
|
|||
}
|
||||
|
||||
function Build {
|
||||
|
||||
if [[ "$ci" == true ]]; then
|
||||
TryLogClientIpAddress
|
||||
fi
|
||||
InitializeToolset
|
||||
InitializeCustomToolset
|
||||
|
||||
|
|
|
|||
35
eng/common/cross/arm/tizen-build-rootfs.sh
Normal file
35
eng/common/cross/arm/tizen-build-rootfs.sh
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
#!/usr/bin/env bash
|
||||
set -e
|
||||
|
||||
__ARM_HARDFP_CrossDir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
|
||||
__TIZEN_CROSSDIR="$__ARM_HARDFP_CrossDir/tizen"
|
||||
|
||||
if [[ -z "$ROOTFS_DIR" ]]; then
|
||||
echo "ROOTFS_DIR is not defined."
|
||||
exit 1;
|
||||
fi
|
||||
|
||||
TIZEN_TMP_DIR=$ROOTFS_DIR/tizen_tmp
|
||||
mkdir -p $TIZEN_TMP_DIR
|
||||
|
||||
# Download files
|
||||
echo ">>Start downloading files"
|
||||
VERBOSE=1 $__ARM_HARDFP_CrossDir/tizen-fetch.sh $TIZEN_TMP_DIR
|
||||
echo "<<Finish downloading files"
|
||||
|
||||
echo ">>Start constructing Tizen rootfs"
|
||||
TIZEN_RPM_FILES=`ls $TIZEN_TMP_DIR/*.rpm`
|
||||
cd $ROOTFS_DIR
|
||||
for f in $TIZEN_RPM_FILES; do
|
||||
rpm2cpio $f | cpio -idm --quiet
|
||||
done
|
||||
echo "<<Finish constructing Tizen rootfs"
|
||||
|
||||
# Cleanup tmp
|
||||
rm -rf $TIZEN_TMP_DIR
|
||||
|
||||
# Configure Tizen rootfs
|
||||
echo ">>Start configuring Tizen rootfs"
|
||||
ln -sfn asm-arm ./usr/include/asm
|
||||
patch -p1 < $__TIZEN_CROSSDIR/tizen.patch
|
||||
echo "<<Finish configuring Tizen rootfs"
|
||||
170
eng/common/cross/arm/tizen-fetch.sh
Normal file
170
eng/common/cross/arm/tizen-fetch.sh
Normal file
|
|
@ -0,0 +1,170 @@
|
|||
#!/usr/bin/env bash
|
||||
set -e
|
||||
|
||||
if [[ -z "${VERBOSE// }" ]] || [ "$VERBOSE" -ne "$VERBOSE" ] 2>/dev/null; then
|
||||
VERBOSE=0
|
||||
fi
|
||||
|
||||
Log()
|
||||
{
|
||||
if [ $VERBOSE -ge $1 ]; then
|
||||
echo ${@:2}
|
||||
fi
|
||||
}
|
||||
|
||||
Inform()
|
||||
{
|
||||
Log 1 -e "\x1B[0;34m$@\x1B[m"
|
||||
}
|
||||
|
||||
Debug()
|
||||
{
|
||||
Log 2 -e "\x1B[0;32m$@\x1B[m"
|
||||
}
|
||||
|
||||
Error()
|
||||
{
|
||||
>&2 Log 0 -e "\x1B[0;31m$@\x1B[m"
|
||||
}
|
||||
|
||||
Fetch()
|
||||
{
|
||||
URL=$1
|
||||
FILE=$2
|
||||
PROGRESS=$3
|
||||
if [ $VERBOSE -ge 1 ] && [ $PROGRESS ]; then
|
||||
CURL_OPT="--progress-bar"
|
||||
else
|
||||
CURL_OPT="--silent"
|
||||
fi
|
||||
curl $CURL_OPT $URL > $FILE
|
||||
}
|
||||
|
||||
hash curl 2> /dev/null || { Error "Require 'curl' Aborting."; exit 1; }
|
||||
hash xmllint 2> /dev/null || { Error "Require 'xmllint' Aborting."; exit 1; }
|
||||
hash sha256sum 2> /dev/null || { Error "Require 'sha256sum' Aborting."; exit 1; }
|
||||
|
||||
TMPDIR=$1
|
||||
if [ ! -d $TMPDIR ]; then
|
||||
TMPDIR=./tizen_tmp
|
||||
Debug "Create temporary directory : $TMPDIR"
|
||||
mkdir -p $TMPDIR
|
||||
fi
|
||||
|
||||
TIZEN_URL=http://download.tizen.org/snapshots/tizen
|
||||
BUILD_XML=build.xml
|
||||
REPOMD_XML=repomd.xml
|
||||
PRIMARY_XML=primary.xml
|
||||
TARGET_URL="http://__not_initialized"
|
||||
|
||||
Xpath_get()
|
||||
{
|
||||
XPATH_RESULT=''
|
||||
XPATH=$1
|
||||
XML_FILE=$2
|
||||
RESULT=$(xmllint --xpath $XPATH $XML_FILE)
|
||||
if [[ -z ${RESULT// } ]]; then
|
||||
Error "Can not find target from $XML_FILE"
|
||||
Debug "Xpath = $XPATH"
|
||||
exit 1
|
||||
fi
|
||||
XPATH_RESULT=$RESULT
|
||||
}
|
||||
|
||||
fetch_tizen_pkgs_init()
|
||||
{
|
||||
TARGET=$1
|
||||
PROFILE=$2
|
||||
Debug "Initialize TARGET=$TARGET, PROFILE=$PROFILE"
|
||||
|
||||
TMP_PKG_DIR=$TMPDIR/tizen_${PROFILE}_pkgs
|
||||
if [ -d $TMP_PKG_DIR ]; then rm -rf $TMP_PKG_DIR; fi
|
||||
mkdir -p $TMP_PKG_DIR
|
||||
|
||||
PKG_URL=$TIZEN_URL/$PROFILE/latest
|
||||
|
||||
BUILD_XML_URL=$PKG_URL/$BUILD_XML
|
||||
TMP_BUILD=$TMP_PKG_DIR/$BUILD_XML
|
||||
TMP_REPOMD=$TMP_PKG_DIR/$REPOMD_XML
|
||||
TMP_PRIMARY=$TMP_PKG_DIR/$PRIMARY_XML
|
||||
TMP_PRIMARYGZ=${TMP_PRIMARY}.gz
|
||||
|
||||
Fetch $BUILD_XML_URL $TMP_BUILD
|
||||
|
||||
Debug "fetch $BUILD_XML_URL to $TMP_BUILD"
|
||||
|
||||
TARGET_XPATH="//build/buildtargets/buildtarget[@name=\"$TARGET\"]/repo[@type=\"binary\"]/text()"
|
||||
Xpath_get $TARGET_XPATH $TMP_BUILD
|
||||
TARGET_PATH=$XPATH_RESULT
|
||||
TARGET_URL=$PKG_URL/$TARGET_PATH
|
||||
|
||||
REPOMD_URL=$TARGET_URL/repodata/repomd.xml
|
||||
PRIMARY_XPATH='string(//*[local-name()="data"][@type="primary"]/*[local-name()="location"]/@href)'
|
||||
|
||||
Fetch $REPOMD_URL $TMP_REPOMD
|
||||
|
||||
Debug "fetch $REPOMD_URL to $TMP_REPOMD"
|
||||
|
||||
Xpath_get $PRIMARY_XPATH $TMP_REPOMD
|
||||
PRIMARY_XML_PATH=$XPATH_RESULT
|
||||
PRIMARY_URL=$TARGET_URL/$PRIMARY_XML_PATH
|
||||
|
||||
Fetch $PRIMARY_URL $TMP_PRIMARYGZ
|
||||
|
||||
Debug "fetch $PRIMARY_URL to $TMP_PRIMARYGZ"
|
||||
|
||||
gunzip $TMP_PRIMARYGZ
|
||||
|
||||
Debug "unzip $TMP_PRIMARYGZ to $TMP_PRIMARY"
|
||||
}
|
||||
|
||||
fetch_tizen_pkgs()
|
||||
{
|
||||
ARCH=$1
|
||||
PACKAGE_XPATH_TPL='string(//*[local-name()="metadata"]/*[local-name()="package"][*[local-name()="name"][text()="_PKG_"]][*[local-name()="arch"][text()="_ARCH_"]]/*[local-name()="location"]/@href)'
|
||||
|
||||
PACKAGE_CHECKSUM_XPATH_TPL='string(//*[local-name()="metadata"]/*[local-name()="package"][*[local-name()="name"][text()="_PKG_"]][*[local-name()="arch"][text()="_ARCH_"]]/*[local-name()="checksum"]/text())'
|
||||
|
||||
for pkg in ${@:2}
|
||||
do
|
||||
Inform "Fetching... $pkg"
|
||||
XPATH=${PACKAGE_XPATH_TPL/_PKG_/$pkg}
|
||||
XPATH=${XPATH/_ARCH_/$ARCH}
|
||||
Xpath_get $XPATH $TMP_PRIMARY
|
||||
PKG_PATH=$XPATH_RESULT
|
||||
|
||||
XPATH=${PACKAGE_CHECKSUM_XPATH_TPL/_PKG_/$pkg}
|
||||
XPATH=${XPATH/_ARCH_/$ARCH}
|
||||
Xpath_get $XPATH $TMP_PRIMARY
|
||||
CHECKSUM=$XPATH_RESULT
|
||||
|
||||
PKG_URL=$TARGET_URL/$PKG_PATH
|
||||
PKG_FILE=$(basename $PKG_PATH)
|
||||
PKG_PATH=$TMPDIR/$PKG_FILE
|
||||
|
||||
Debug "Download $PKG_URL to $PKG_PATH"
|
||||
Fetch $PKG_URL $PKG_PATH true
|
||||
|
||||
echo "$CHECKSUM $PKG_PATH" | sha256sum -c - > /dev/null
|
||||
if [ $? -ne 0 ]; then
|
||||
Error "Fail to fetch $PKG_URL to $PKG_PATH"
|
||||
Debug "Checksum = $CHECKSUM"
|
||||
exit 1
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
Inform "Initialize arm base"
|
||||
fetch_tizen_pkgs_init standard base
|
||||
Inform "fetch common packages"
|
||||
fetch_tizen_pkgs armv7hl gcc gcc-devel-static glibc glibc-devel libicu libicu-devel libatomic linux-glibc-devel keyutils keyutils-devel libkeyutils
|
||||
Inform "fetch coreclr packages"
|
||||
fetch_tizen_pkgs armv7hl lldb lldb-devel libgcc libstdc++ libstdc++-devel libunwind libunwind-devel lttng-ust-devel lttng-ust userspace-rcu-devel userspace-rcu
|
||||
Inform "fetch corefx packages"
|
||||
fetch_tizen_pkgs armv7hl libcom_err libcom_err-devel zlib zlib-devel libopenssl11 libopenssl1.1-devel krb5 krb5-devel
|
||||
|
||||
Inform "Initialize standard unified"
|
||||
fetch_tizen_pkgs_init standard unified
|
||||
Inform "fetch corefx packages"
|
||||
fetch_tizen_pkgs armv7hl gssdp gssdp-devel tizen-release
|
||||
|
||||
9
eng/common/cross/arm/tizen/tizen.patch
Normal file
9
eng/common/cross/arm/tizen/tizen.patch
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
diff -u -r a/usr/lib/libc.so b/usr/lib/libc.so
|
||||
--- a/usr/lib/libc.so 2016-12-30 23:00:08.284951863 +0900
|
||||
+++ b/usr/lib/libc.so 2016-12-30 23:00:32.140951815 +0900
|
||||
@@ -2,4 +2,4 @@
|
||||
Use the shared library, but some functions are only in
|
||||
the static library, so try that secondarily. */
|
||||
OUTPUT_FORMAT(elf32-littlearm)
|
||||
-GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a AS_NEEDED ( /lib/ld-linux-armhf.so.3 ) )
|
||||
+GROUP ( libc.so.6 libc_nonshared.a AS_NEEDED ( ld-linux-armhf.so.3 ) )
|
||||
2
eng/common/cross/armv6/sources.list.buster
Normal file
2
eng/common/cross/armv6/sources.list.buster
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
deb http://raspbian.raspberrypi.org/raspbian/ buster main contrib non-free rpi
|
||||
deb-src http://raspbian.raspberrypi.org/raspbian/ buster main contrib non-free rpi
|
||||
|
|
@ -99,6 +99,15 @@ while :; do
|
|||
__AlpineArch=armv7
|
||||
__QEMUArch=arm
|
||||
;;
|
||||
armv6)
|
||||
__BuildArch=armv6
|
||||
__UbuntuArch=armhf
|
||||
__QEMUArch=arm
|
||||
__UbuntuRepo="http://raspbian.raspberrypi.org/raspbian/"
|
||||
__CodeName=buster
|
||||
__LLDB_Package="liblldb-6.0-dev"
|
||||
__Keyring="/usr/share/keyrings/raspbian-archive-keyring.gpg"
|
||||
;;
|
||||
arm64)
|
||||
__BuildArch=arm64
|
||||
__UbuntuArch=arm64
|
||||
|
|
@ -176,8 +185,8 @@ while :; do
|
|||
__LLDB_Package="liblldb-6.0-dev"
|
||||
;;
|
||||
tizen)
|
||||
if [ "$__BuildArch" != "armel" ] && [ "$__BuildArch" != "arm64" ]; then
|
||||
echo "Tizen is available only for armel and arm64."
|
||||
if [ "$__BuildArch" != "arm" ] && [ "$__BuildArch" != "armel" ] && [ "$__BuildArch" != "arm64" ]; then
|
||||
echo "Tizen is available only for arm, armel and arm64."
|
||||
usage;
|
||||
exit 1;
|
||||
fi
|
||||
|
|
@ -236,6 +245,12 @@ while :; do
|
|||
shift
|
||||
done
|
||||
|
||||
if [ -e "$__Keyring" ]; then
|
||||
__Keyring="--keyring=$__Keyring"
|
||||
else
|
||||
__Keyring=""
|
||||
fi
|
||||
|
||||
if [ "$__BuildArch" == "armel" ]; then
|
||||
__LLDB_Package="lldb-3.5-dev"
|
||||
fi
|
||||
|
|
@ -337,7 +352,7 @@ elif [[ "$__CodeName" == "illumos" ]]; then
|
|||
wget -P "$__RootfsDir"/usr/include/netpacket https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/inet/sockmods/netpacket/packet.h
|
||||
wget -P "$__RootfsDir"/usr/include/sys https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/sys/sdt.h
|
||||
elif [[ -n $__CodeName ]]; then
|
||||
qemu-debootstrap --arch $__UbuntuArch $__CodeName $__RootfsDir $__UbuntuRepo
|
||||
qemu-debootstrap $__Keyring --arch $__UbuntuArch $__CodeName $__RootfsDir $__UbuntuRepo
|
||||
cp $__CrossDir/$__BuildArch/sources.list.$__CodeName $__RootfsDir/etc/apt/sources.list
|
||||
chroot $__RootfsDir apt-get update
|
||||
chroot $__RootfsDir apt-get -f -y install
|
||||
|
|
|
|||
|
|
@ -3,18 +3,26 @@ set(CROSS_ROOTFS $ENV{ROOTFS_DIR})
|
|||
set(TARGET_ARCH_NAME $ENV{TARGET_BUILD_ARCH})
|
||||
if(EXISTS ${CROSS_ROOTFS}/bin/freebsd-version)
|
||||
set(CMAKE_SYSTEM_NAME FreeBSD)
|
||||
set(FREEBSD 1)
|
||||
elseif(EXISTS ${CROSS_ROOTFS}/usr/platform/i86pc)
|
||||
set(CMAKE_SYSTEM_NAME SunOS)
|
||||
set(ILLUMOS 1)
|
||||
else()
|
||||
set(CMAKE_SYSTEM_NAME Linux)
|
||||
set(LINUX 1)
|
||||
endif()
|
||||
set(CMAKE_SYSTEM_VERSION 1)
|
||||
|
||||
if(EXISTS ${CROSS_ROOTFS}/etc/tizen-release)
|
||||
set(TIZEN 1)
|
||||
elseif(EXISTS ${CROSS_ROOTFS}/android_platform)
|
||||
set(ANDROID 1)
|
||||
endif()
|
||||
|
||||
if(TARGET_ARCH_NAME STREQUAL "armel")
|
||||
set(CMAKE_SYSTEM_PROCESSOR armv7l)
|
||||
set(TOOLCHAIN "arm-linux-gnueabi")
|
||||
if("$ENV{__DistroRid}" MATCHES "tizen.*")
|
||||
if(TIZEN)
|
||||
set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi/9.2.0")
|
||||
endif()
|
||||
elseif(TARGET_ARCH_NAME STREQUAL "arm")
|
||||
|
|
@ -26,6 +34,9 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm")
|
|||
else()
|
||||
set(TOOLCHAIN "arm-linux-gnueabihf")
|
||||
endif()
|
||||
if(TIZEN)
|
||||
set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf/9.2.0")
|
||||
endif()
|
||||
elseif(TARGET_ARCH_NAME STREQUAL "arm64")
|
||||
set(CMAKE_SYSTEM_PROCESSOR aarch64)
|
||||
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/aarch64-alpine-linux-musl)
|
||||
|
|
@ -33,7 +44,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm64")
|
|||
else()
|
||||
set(TOOLCHAIN "aarch64-linux-gnu")
|
||||
endif()
|
||||
if("$ENV{__DistroRid}" MATCHES "tizen.*")
|
||||
if(TIZEN)
|
||||
set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu/9.2.0")
|
||||
endif()
|
||||
elseif(TARGET_ARCH_NAME STREQUAL "s390x")
|
||||
|
|
@ -42,7 +53,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "s390x")
|
|||
elseif(TARGET_ARCH_NAME STREQUAL "x86")
|
||||
set(CMAKE_SYSTEM_PROCESSOR i686)
|
||||
set(TOOLCHAIN "i686-linux-gnu")
|
||||
elseif (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
|
||||
elseif (FREEBSD)
|
||||
set(CMAKE_SYSTEM_PROCESSOR "x86_64")
|
||||
set(triple "x86_64-unknown-freebsd12")
|
||||
elseif (ILLUMOS)
|
||||
|
|
@ -57,7 +68,11 @@ if(DEFINED ENV{TOOLCHAIN})
|
|||
endif()
|
||||
|
||||
# Specify include paths
|
||||
if(DEFINED TIZEN_TOOLCHAIN)
|
||||
if(TIZEN)
|
||||
if(TARGET_ARCH_NAME STREQUAL "arm")
|
||||
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
|
||||
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/armv7hl-tizen-linux-gnueabihf)
|
||||
endif()
|
||||
if(TARGET_ARCH_NAME STREQUAL "armel")
|
||||
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
|
||||
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/armv7l-tizen-linux-gnueabi)
|
||||
|
|
@ -68,7 +83,7 @@ if(DEFINED TIZEN_TOOLCHAIN)
|
|||
endif()
|
||||
endif()
|
||||
|
||||
if("$ENV{__DistroRid}" MATCHES "android.*")
|
||||
if(ANDROID)
|
||||
if(TARGET_ARCH_NAME STREQUAL "arm")
|
||||
set(ANDROID_ABI armeabi-v7a)
|
||||
elseif(TARGET_ARCH_NAME STREQUAL "arm64")
|
||||
|
|
@ -76,7 +91,9 @@ if("$ENV{__DistroRid}" MATCHES "android.*")
|
|||
endif()
|
||||
|
||||
# extract platform number required by the NDK's toolchain
|
||||
string(REGEX REPLACE ".*\\.([0-9]+)-.*" "\\1" ANDROID_PLATFORM "$ENV{__DistroRid}")
|
||||
file(READ "${CROSS_ROOTFS}/android_platform" RID_FILE_CONTENTS)
|
||||
string(REPLACE "RID=" "" ANDROID_RID "${RID_FILE_CONTENTS}")
|
||||
string(REGEX REPLACE ".*\\.([0-9]+)-.*" "\\1" ANDROID_PLATFORM "${ANDROID_RID}")
|
||||
|
||||
set(ANDROID_TOOLCHAIN clang)
|
||||
set(FEATURE_EVENT_TRACE 0) # disable event trace as there is no lttng-ust package in termux repository
|
||||
|
|
@ -85,7 +102,7 @@ if("$ENV{__DistroRid}" MATCHES "android.*")
|
|||
|
||||
# include official NDK toolchain script
|
||||
include(${CROSS_ROOTFS}/../build/cmake/android.toolchain.cmake)
|
||||
elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
|
||||
elseif(FREEBSD)
|
||||
# we cross-compile by instructing clang
|
||||
set(CMAKE_C_COMPILER_TARGET ${triple})
|
||||
set(CMAKE_CXX_COMPILER_TARGET ${triple})
|
||||
|
|
@ -145,20 +162,20 @@ function(add_toolchain_linker_flag Flag)
|
|||
set("CMAKE_SHARED_LINKER_FLAGS${CONFIG_SUFFIX}_INIT" "${CMAKE_SHARED_LINKER_FLAGS${CONFIG_SUFFIX}_INIT} ${Flag}" PARENT_SCOPE)
|
||||
endfunction()
|
||||
|
||||
if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
|
||||
if(LINUX)
|
||||
add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/lib/${TOOLCHAIN}")
|
||||
add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib/${TOOLCHAIN}")
|
||||
endif()
|
||||
|
||||
if(TARGET_ARCH_NAME STREQUAL "armel")
|
||||
if(DEFINED TIZEN_TOOLCHAIN) # For Tizen only
|
||||
if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$")
|
||||
if(TIZEN)
|
||||
add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
|
||||
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib")
|
||||
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib")
|
||||
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
|
||||
endif()
|
||||
elseif(TARGET_ARCH_NAME STREQUAL "arm64")
|
||||
if(DEFINED TIZEN_TOOLCHAIN) # For Tizen only
|
||||
if(TIZEN)
|
||||
add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
|
||||
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib64")
|
||||
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib64")
|
||||
|
|
@ -177,7 +194,7 @@ endif()
|
|||
|
||||
# Specify compile options
|
||||
|
||||
if((TARGET_ARCH_NAME MATCHES "^(arm|armel|arm64|s390x)$" AND NOT "$ENV{__DistroRid}" MATCHES "android.*") OR ILLUMOS)
|
||||
if((TARGET_ARCH_NAME MATCHES "^(arm|armel|arm64|s390x)$" AND NOT ANDROID) OR ILLUMOS)
|
||||
set(CMAKE_C_COMPILER_TARGET ${TOOLCHAIN})
|
||||
set(CMAKE_CXX_COMPILER_TARGET ${TOOLCHAIN})
|
||||
set(CMAKE_ASM_COMPILER_TARGET ${TOOLCHAIN})
|
||||
|
|
@ -204,8 +221,8 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86")
|
|||
add_compile_options(-Wno-error=unused-command-line-argument)
|
||||
endif()
|
||||
|
||||
if(DEFINED TIZEN_TOOLCHAIN)
|
||||
if(TARGET_ARCH_NAME MATCHES "^(armel|arm64)$")
|
||||
if(TIZEN)
|
||||
if(TARGET_ARCH_NAME MATCHES "^(arm|armel|arm64)$")
|
||||
add_compile_options(-Wno-deprecated-declarations) # compile-time option
|
||||
add_compile_options(-D__extern_always_inline=inline) # compile-time option
|
||||
endif()
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ fi
|
|||
function InstallDarcCli {
|
||||
local darc_cli_package_name="microsoft.dotnet.darc"
|
||||
|
||||
InitializeDotNetCli
|
||||
InitializeDotNetCli true
|
||||
local dotnet_root=$_InitializeDotNetCli
|
||||
|
||||
if [ -z "$toolpath" ]; then
|
||||
|
|
|
|||
3
eng/common/dotnet-install.sh
vendored
3
eng/common/dotnet-install.sh
vendored
|
|
@ -55,6 +55,9 @@ case $cpuname in
|
|||
aarch64)
|
||||
buildarch=arm64
|
||||
;;
|
||||
loongarch64)
|
||||
buildarch=loongarch64
|
||||
;;
|
||||
amd64|x86_64)
|
||||
buildarch=x64
|
||||
;;
|
||||
|
|
|
|||
|
|
@ -276,7 +276,8 @@ function Get-MachineArchitecture {
|
|||
}
|
||||
if (($ProcessorArchitecture -Eq "AMD64") -Or
|
||||
($ProcessorArchitecture -Eq "IA64") -Or
|
||||
($ProcessorArchitecture -Eq "ARM64")) {
|
||||
($ProcessorArchitecture -Eq "ARM64") -Or
|
||||
($ProcessorArchitecture -Eq "LOONGARCH64")) {
|
||||
return "x64"
|
||||
}
|
||||
return "x86"
|
||||
|
|
|
|||
|
|
@ -2,24 +2,45 @@
|
|||
#
|
||||
# This file detects the C/C++ compiler and exports it to the CC/CXX environment variables
|
||||
#
|
||||
# NOTE: some scripts source this file and rely on stdout being empty, make sure to not output anything here!
|
||||
|
||||
if [[ "$#" -lt 3 ]]; then
|
||||
echo "Usage..."
|
||||
echo "init-compiler.sh <script directory> <Architecture> <compiler> <compiler major version> <compiler minor version>"
|
||||
echo "init-compiler.sh <script directory> <Architecture> <compiler>"
|
||||
echo "Specify the script directory."
|
||||
echo "Specify the target architecture."
|
||||
echo "Specify the name of compiler (clang or gcc)."
|
||||
echo "Specify the major version of compiler."
|
||||
echo "Specify the minor version of compiler."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
nativescriptroot="$1"
|
||||
build_arch="$2"
|
||||
compiler="$3"
|
||||
|
||||
case "$compiler" in
|
||||
clang*|-clang*|--clang*)
|
||||
# clangx.y or clang-x.y
|
||||
version="$(echo "$compiler" | tr -d '[:alpha:]-=')"
|
||||
parts=(${version//./ })
|
||||
majorVersion="${parts[0]}"
|
||||
minorVersion="${parts[1]}"
|
||||
if [[ -z "$minorVersion" && "$majorVersion" -le 6 ]]; then
|
||||
minorVersion=0;
|
||||
fi
|
||||
compiler=clang
|
||||
;;
|
||||
|
||||
gcc*|-gcc*|--gcc*)
|
||||
# gccx.y or gcc-x.y
|
||||
version="$(echo "$compiler" | tr -d '[:alpha:]-=')"
|
||||
parts=(${version//./ })
|
||||
majorVersion="${parts[0]}"
|
||||
minorVersion="${parts[1]}"
|
||||
compiler=gcc
|
||||
;;
|
||||
esac
|
||||
|
||||
cxxCompiler="$compiler++"
|
||||
majorVersion="$4"
|
||||
minorVersion="$5"
|
||||
|
||||
. "$nativescriptroot"/../pipeline-logging-functions.sh
|
||||
|
||||
|
|
@ -111,12 +132,10 @@ if [[ -z "$CC" ]]; then
|
|||
exit 1
|
||||
fi
|
||||
|
||||
if [[ "$compiler" == "clang" ]]; then
|
||||
if command -v "lld$desired_version" > /dev/null; then
|
||||
# Only lld version >= 9 can be considered stable
|
||||
if [[ "$majorVersion" -ge 9 ]]; then
|
||||
LDFLAGS="-fuse-ld=lld"
|
||||
fi
|
||||
# Only lld version >= 9 can be considered stable
|
||||
if [[ "$compiler" == "clang" && "$majorVersion" -ge 9 ]]; then
|
||||
if "$CC" -fuse-ld=lld -Wl,--version >/dev/null 2>&1; then
|
||||
LDFLAGS="-fuse-ld=lld"
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -83,9 +83,6 @@ try {
|
|||
}
|
||||
|
||||
if ($restore) {
|
||||
if ($ci) {
|
||||
Try-LogClientIpAddress
|
||||
}
|
||||
Build 'Restore'
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -124,7 +124,7 @@ try {
|
|||
Exec-BlockVerbosely {
|
||||
& $(Join-Path $PSScriptRoot 'run-sdl.ps1') `
|
||||
-GuardianCliLocation $guardianCliLocation `
|
||||
-WorkingDirectory $workingDirectory `
|
||||
-WorkingDirectory $SourceDirectory `
|
||||
-UpdateBaseline $UpdateBaseline `
|
||||
-GdnFolder $gdnFolder
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Microsoft.Guardian.Cli" version="0.53.3"/>
|
||||
<package id="Microsoft.Guardian.Cli" version="0.109.0"/>
|
||||
</packages>
|
||||
|
|
|
|||
|
|
@ -51,14 +51,9 @@ jobs:
|
|||
value: ${{ parameters.AzDOPipelineId }}
|
||||
- name: AzDOBuildId
|
||||
value: ${{ parameters.AzDOBuildId }}
|
||||
# The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in
|
||||
# sync with the packages.config file.
|
||||
- name: DefaultGuardianVersion
|
||||
value: 0.53.3
|
||||
- template: /eng/common/templates/variables/sdl-variables.yml
|
||||
- name: GuardianVersion
|
||||
value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }}
|
||||
- name: GuardianPackagesConfigFile
|
||||
value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
|
||||
pool:
|
||||
vmImage: windows-2019
|
||||
steps:
|
||||
|
|
@ -125,57 +120,11 @@ jobs:
|
|||
displayName: Extract Archive Artifacts
|
||||
continueOnError: ${{ parameters.sdlContinueOnError }}
|
||||
|
||||
- ${{ if ne(parameters.overrideGuardianVersion, '') }}:
|
||||
- powershell: |
|
||||
$content = Get-Content $(GuardianPackagesConfigFile)
|
||||
|
||||
Write-Host "packages.config content was:`n$content"
|
||||
|
||||
$content = $content.Replace('$(DefaultGuardianVersion)', '$(GuardianVersion)')
|
||||
$content | Set-Content $(GuardianPackagesConfigFile)
|
||||
|
||||
Write-Host "packages.config content updated to:`n$content"
|
||||
displayName: Use overridden Guardian version ${{ parameters.overrideGuardianVersion }}
|
||||
|
||||
- task: NuGetToolInstaller@1
|
||||
displayName: 'Install NuGet.exe'
|
||||
- task: NuGetCommand@2
|
||||
displayName: 'Install Guardian'
|
||||
inputs:
|
||||
restoreSolution: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
|
||||
feedsToUse: config
|
||||
nugetConfigPath: $(Build.SourcesDirectory)\eng\common\sdl\NuGet.config
|
||||
externalFeedCredentials: GuardianConnect
|
||||
restoreDirectory: $(Build.SourcesDirectory)\.packages
|
||||
|
||||
- ${{ if ne(parameters.overrideParameters, '') }}:
|
||||
- powershell: ${{ parameters.executeAllSdlToolsScript }} ${{ parameters.overrideParameters }}
|
||||
displayName: Execute SDL
|
||||
continueOnError: ${{ parameters.sdlContinueOnError }}
|
||||
- ${{ if eq(parameters.overrideParameters, '') }}:
|
||||
- powershell: ${{ parameters.executeAllSdlToolsScript }}
|
||||
-GuardianPackageName Microsoft.Guardian.Cli.$(GuardianVersion)
|
||||
-NugetPackageDirectory $(Build.SourcesDirectory)\.packages
|
||||
-AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw)
|
||||
${{ parameters.additionalParameters }}
|
||||
displayName: Execute SDL
|
||||
continueOnError: ${{ parameters.sdlContinueOnError }}
|
||||
|
||||
- ${{ if ne(parameters.publishGuardianDirectoryToPipeline, 'false') }}:
|
||||
# We want to publish the Guardian results and configuration for easy diagnosis. However, the
|
||||
# '.gdn' dir is a mix of configuration, results, extracted dependencies, and Guardian default
|
||||
# tooling files. Some of these files are large and aren't useful during an investigation, so
|
||||
# exclude them by simply deleting them before publishing. (As of writing, there is no documented
|
||||
# way to selectively exclude a dir from the pipeline artifact publish task.)
|
||||
- task: DeleteFiles@1
|
||||
displayName: Delete Guardian dependencies to avoid uploading
|
||||
inputs:
|
||||
SourceFolder: $(Agent.BuildDirectory)/.gdn
|
||||
Contents: |
|
||||
c
|
||||
i
|
||||
condition: succeededOrFailed()
|
||||
- publish: $(Agent.BuildDirectory)/.gdn
|
||||
artifact: GuardianConfiguration
|
||||
displayName: Publish GuardianConfiguration
|
||||
condition: succeededOrFailed()
|
||||
- template: /eng/common/templates/steps/execute-sdl.yml
|
||||
parameters:
|
||||
overrideGuardianVersion: ${{ parameters.overrideGuardianVersion }}
|
||||
executeAllSdlToolsScript: ${{ parameters.executeAllSdlToolsScript }}
|
||||
overrideParameters: ${{ parameters.overrideParameters }}
|
||||
additionalParameters: ${{ parameters.additionalParameters }}
|
||||
publishGuardianDirectoryToPipeline: ${{ parameters.publishGuardianDirectoryToPipeline }}
|
||||
sdlContinueOnError: ${{ parameters.sdlContinueOnError }}
|
||||
|
|
|
|||
|
|
@ -114,6 +114,7 @@ jobs:
|
|||
continueOnError: ${{ parameters.continueOnError }}
|
||||
condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT'))
|
||||
|
||||
- ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}:
|
||||
- task: NuGetAuthenticate@0
|
||||
|
||||
- ${{ if or(eq(parameters.artifacts.download, 'true'), ne(parameters.artifacts.download, '')) }}:
|
||||
|
|
|
|||
68
eng/common/templates/steps/execute-sdl.yml
Normal file
68
eng/common/templates/steps/execute-sdl.yml
Normal file
|
|
@ -0,0 +1,68 @@
|
|||
parameters:
|
||||
overrideGuardianVersion: ''
|
||||
executeAllSdlToolsScript: ''
|
||||
overrideParameters: ''
|
||||
additionalParameters: ''
|
||||
publishGuardianDirectoryToPipeline: false
|
||||
sdlContinueOnError: false
|
||||
condition: ''
|
||||
|
||||
steps:
|
||||
- ${{ if ne(parameters.overrideGuardianVersion, '') }}:
|
||||
- powershell: |
|
||||
$content = Get-Content $(GuardianPackagesConfigFile)
|
||||
|
||||
Write-Host "packages.config content was:`n$content"
|
||||
|
||||
$content = $content.Replace('$(DefaultGuardianVersion)', '$(GuardianVersion)')
|
||||
$content | Set-Content $(GuardianPackagesConfigFile)
|
||||
|
||||
Write-Host "packages.config content updated to:`n$content"
|
||||
displayName: Use overridden Guardian version ${{ parameters.overrideGuardianVersion }}
|
||||
|
||||
- task: NuGetToolInstaller@1
|
||||
displayName: 'Install NuGet.exe'
|
||||
|
||||
- task: NuGetCommand@2
|
||||
displayName: 'Install Guardian'
|
||||
inputs:
|
||||
restoreSolution: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
|
||||
feedsToUse: config
|
||||
nugetConfigPath: $(Build.SourcesDirectory)\eng\common\sdl\NuGet.config
|
||||
externalFeedCredentials: GuardianConnect
|
||||
restoreDirectory: $(Build.SourcesDirectory)\.packages
|
||||
|
||||
- ${{ if ne(parameters.overrideParameters, '') }}:
|
||||
- powershell: ${{ parameters.executeAllSdlToolsScript }} ${{ parameters.overrideParameters }}
|
||||
displayName: Execute SDL
|
||||
continueOnError: ${{ parameters.sdlContinueOnError }}
|
||||
condition: ${{ parameters.condition }}
|
||||
|
||||
- ${{ if eq(parameters.overrideParameters, '') }}:
|
||||
- powershell: ${{ parameters.executeAllSdlToolsScript }}
|
||||
-GuardianPackageName Microsoft.Guardian.Cli.$(GuardianVersion)
|
||||
-NugetPackageDirectory $(Build.SourcesDirectory)\.packages
|
||||
-AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw)
|
||||
${{ parameters.additionalParameters }}
|
||||
displayName: Execute SDL
|
||||
continueOnError: ${{ parameters.sdlContinueOnError }}
|
||||
condition: ${{ parameters.condition }}
|
||||
|
||||
- ${{ if ne(parameters.publishGuardianDirectoryToPipeline, 'false') }}:
|
||||
# We want to publish the Guardian results and configuration for easy diagnosis. However, the
|
||||
# '.gdn' dir is a mix of configuration, results, extracted dependencies, and Guardian default
|
||||
# tooling files. Some of these files are large and aren't useful during an investigation, so
|
||||
# exclude them by simply deleting them before publishing. (As of writing, there is no documented
|
||||
# way to selectively exclude a dir from the pipeline artifact publish task.)
|
||||
- task: DeleteFiles@1
|
||||
displayName: Delete Guardian dependencies to avoid uploading
|
||||
inputs:
|
||||
SourceFolder: $(Agent.BuildDirectory)/.gdn
|
||||
Contents: |
|
||||
c
|
||||
i
|
||||
condition: succeededOrFailed()
|
||||
- publish: $(Agent.BuildDirectory)/.gdn
|
||||
artifact: GuardianConfiguration
|
||||
displayName: Publish GuardianConfiguration
|
||||
condition: succeededOrFailed()
|
||||
7
eng/common/templates/variables/sdl-variables.yml
Normal file
7
eng/common/templates/variables/sdl-variables.yml
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
variables:
|
||||
# The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in
|
||||
# sync with the packages.config file.
|
||||
- name: DefaultGuardianVersion
|
||||
value: 0.109.0
|
||||
- name: GuardianPackagesConfigFile
|
||||
value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
|
||||
|
|
@ -163,9 +163,6 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
|
|||
# Disable telemetry on CI.
|
||||
if ($ci) {
|
||||
$env:DOTNET_CLI_TELEMETRY_OPTOUT=1
|
||||
|
||||
# In case of network error, try to log the current IP for reference
|
||||
Try-LogClientIpAddress
|
||||
}
|
||||
|
||||
# Source Build uses DotNetCoreSdkDir variable
|
||||
|
|
@ -301,31 +298,44 @@ function InstallDotNet([string] $dotnetRoot,
|
|||
if ($skipNonVersionedFiles) { $installParameters.SkipNonVersionedFiles = $skipNonVersionedFiles }
|
||||
if ($noPath) { $installParameters.NoPath = $True }
|
||||
|
||||
try {
|
||||
& $installScript @installParameters
|
||||
}
|
||||
catch {
|
||||
if ($runtimeSourceFeed -or $runtimeSourceFeedKey) {
|
||||
Write-Host "Failed to install dotnet from public location. Trying from '$runtimeSourceFeed'"
|
||||
if ($runtimeSourceFeed) { $installParameters.AzureFeed = $runtimeSourceFeed }
|
||||
$variations = @()
|
||||
$variations += @($installParameters)
|
||||
|
||||
if ($runtimeSourceFeedKey) {
|
||||
$decodedBytes = [System.Convert]::FromBase64String($runtimeSourceFeedKey)
|
||||
$decodedString = [System.Text.Encoding]::UTF8.GetString($decodedBytes)
|
||||
$installParameters.FeedCredential = $decodedString
|
||||
}
|
||||
$dotnetBuilds = $installParameters.Clone()
|
||||
$dotnetbuilds.AzureFeed = "https://dotnetbuilds.azureedge.net/public"
|
||||
$variations += @($dotnetBuilds)
|
||||
|
||||
try {
|
||||
& $installScript @installParameters
|
||||
}
|
||||
catch {
|
||||
Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Failed to install dotnet from custom location '$runtimeSourceFeed'."
|
||||
ExitWithExitCode 1
|
||||
}
|
||||
} else {
|
||||
Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Failed to install dotnet from public location."
|
||||
ExitWithExitCode 1
|
||||
if ($runtimeSourceFeed) {
|
||||
$runtimeSource = $installParameters.Clone()
|
||||
$runtimeSource.AzureFeed = $runtimeSourceFeed
|
||||
if ($runtimeSourceFeedKey) {
|
||||
$decodedBytes = [System.Convert]::FromBase64String($runtimeSourceFeedKey)
|
||||
$decodedString = [System.Text.Encoding]::UTF8.GetString($decodedBytes)
|
||||
$runtimeSource.FeedCredential = $decodedString
|
||||
}
|
||||
$variations += @($runtimeSource)
|
||||
}
|
||||
|
||||
$installSuccess = $false
|
||||
foreach ($variation in $variations) {
|
||||
if ($variation | Get-Member AzureFeed) {
|
||||
$location = $variation.AzureFeed
|
||||
} else {
|
||||
$location = "public location";
|
||||
}
|
||||
Write-Host "Attempting to install dotnet from $location."
|
||||
try {
|
||||
& $installScript @variation
|
||||
$installSuccess = $true
|
||||
break
|
||||
}
|
||||
catch {
|
||||
Write-Host "Failed to install dotnet from $location."
|
||||
}
|
||||
}
|
||||
if (-not $installSuccess) {
|
||||
Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Failed to install dotnet from any of the specified locations."
|
||||
ExitWithExitCode 1
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -882,24 +892,6 @@ if (!$disableConfigureToolsetImport) {
|
|||
}
|
||||
}
|
||||
|
||||
function Try-LogClientIpAddress()
|
||||
{
|
||||
Write-Host "Attempting to log this client's IP for Azure Package feed telemetry purposes"
|
||||
try
|
||||
{
|
||||
$result = Invoke-WebRequest -Uri "http://co1.msedge.net/fdv2/diagnostics.aspx" -UseBasicParsing
|
||||
$lines = $result.Content.Split([Environment]::NewLine)
|
||||
$socketIp = $lines | Select-String -Pattern "^Socket IP:.*"
|
||||
Write-Host $socketIp
|
||||
$clientIp = $lines | Select-String -Pattern "^Client IP:.*"
|
||||
Write-Host $clientIp
|
||||
}
|
||||
catch
|
||||
{
|
||||
Write-Host "Unable to get this machine's effective IP address for logging: $_"
|
||||
}
|
||||
}
|
||||
|
||||
#
|
||||
# If $ci flag is set, turn on (and log that we did) special environment variables for improved Nuget client retry logic.
|
||||
#
|
||||
|
|
|
|||
|
|
@ -178,7 +178,7 @@ function InstallDotNetSdk {
|
|||
if [[ $# -ge 3 ]]; then
|
||||
architecture=$3
|
||||
fi
|
||||
InstallDotNet "$root" "$version" $architecture 'sdk' 'false' $runtime_source_feed $runtime_source_feed_key
|
||||
InstallDotNet "$root" "$version" $architecture 'sdk' 'true' $runtime_source_feed $runtime_source_feed_key
|
||||
}
|
||||
|
||||
function InstallDotNet {
|
||||
|
|
@ -188,28 +188,29 @@ function InstallDotNet {
|
|||
GetDotNetInstallScript "$root"
|
||||
local install_script=$_GetDotNetInstallScript
|
||||
|
||||
local archArg=''
|
||||
local installParameters=(--version $version --install-dir "$root")
|
||||
|
||||
if [[ -n "${3:-}" ]] && [ "$3" != 'unset' ]; then
|
||||
archArg="--architecture $3"
|
||||
installParameters+=(--architecture $3)
|
||||
fi
|
||||
local runtimeArg=''
|
||||
if [[ -n "${4:-}" ]] && [ "$4" != 'sdk' ]; then
|
||||
runtimeArg="--runtime $4"
|
||||
installParameters+=(--runtime $4)
|
||||
fi
|
||||
local skipNonVersionedFilesArg=""
|
||||
if [[ "$#" -ge "5" ]] && [[ "$5" != 'false' ]]; then
|
||||
skipNonVersionedFilesArg="--skip-non-versioned-files"
|
||||
installParameters+=(--skip-non-versioned-files)
|
||||
fi
|
||||
bash "$install_script" --version $version --install-dir "$root" $archArg $runtimeArg $skipNonVersionedFilesArg || {
|
||||
local exit_code=$?
|
||||
echo "Failed to install dotnet SDK from public location (exit code '$exit_code')."
|
||||
|
||||
local runtimeSourceFeed=''
|
||||
if [[ -n "${6:-}" ]]; then
|
||||
runtimeSourceFeed="--azure-feed $6"
|
||||
fi
|
||||
local variations=() # list of variable names with parameter arrays in them
|
||||
|
||||
local runtimeSourceFeedKey=''
|
||||
local public_location=("${installParameters[@]}")
|
||||
variations+=(public_location)
|
||||
|
||||
local dotnetbuilds=("${installParameters[@]}" --azure-feed "https://dotnetbuilds.azureedge.net/public")
|
||||
variations+=(dotnetbuilds)
|
||||
|
||||
if [[ -n "${6:-}" ]]; then
|
||||
variations+=(private_feed)
|
||||
local private_feed=("${installParameters[@]}" --azure-feed $6)
|
||||
if [[ -n "${7:-}" ]]; then
|
||||
# The 'base64' binary on alpine uses '-d' and doesn't support '--decode'
|
||||
# '-d'. To work around this, do a simple detection and switch the parameter
|
||||
|
|
@ -219,22 +220,27 @@ function InstallDotNet {
|
|||
decodeArg="-d"
|
||||
fi
|
||||
decodedFeedKey=`echo $7 | base64 $decodeArg`
|
||||
runtimeSourceFeedKey="--feed-credential $decodedFeedKey"
|
||||
private_feed+=(--feed-credential $decodedFeedKey)
|
||||
fi
|
||||
fi
|
||||
|
||||
local installSuccess=0
|
||||
for variationName in "${variations[@]}"; do
|
||||
local name="$variationName[@]"
|
||||
local variation=("${!name}")
|
||||
echo "Attempting to install dotnet from $variationName."
|
||||
bash "$install_script" "${variation[@]}" && installSuccess=1
|
||||
if [[ "$installSuccess" -eq 1 ]]; then
|
||||
break
|
||||
fi
|
||||
|
||||
if [[ -n "$runtimeSourceFeed" || -n "$runtimeSourceFeedKey" ]]; then
|
||||
bash "$install_script" --version $version --install-dir "$root" $archArg $runtimeArg $skipNonVersionedFilesArg $runtimeSourceFeed $runtimeSourceFeedKey || {
|
||||
local exit_code=$?
|
||||
Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from custom location '$runtimeSourceFeed' (exit code '$exit_code')."
|
||||
ExitWithExitCode $exit_code
|
||||
}
|
||||
else
|
||||
if [[ $exit_code != 0 ]]; then
|
||||
Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from public location (exit code '$exit_code')."
|
||||
fi
|
||||
ExitWithExitCode $exit_code
|
||||
fi
|
||||
}
|
||||
echo "Failed to install dotnet from $variationName."
|
||||
done
|
||||
|
||||
if [[ "$installSuccess" -eq 0 ]]; then
|
||||
Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from any of the specified locations."
|
||||
ExitWithExitCode 1
|
||||
fi
|
||||
}
|
||||
|
||||
function with_retries {
|
||||
|
|
@ -399,13 +405,6 @@ function StopProcesses {
|
|||
return 0
|
||||
}
|
||||
|
||||
function TryLogClientIpAddress () {
|
||||
echo 'Attempting to log this client''s IP for Azure Package feed telemetry purposes'
|
||||
if command -v curl > /dev/null; then
|
||||
curl -s 'http://co1.msedge.net/fdv2/diagnostics.aspx' | grep ' IP: ' || true
|
||||
fi
|
||||
}
|
||||
|
||||
function MSBuild {
|
||||
local args=$@
|
||||
if [[ "$pipelines_log" == true ]]; then
|
||||
|
|
|
|||
14
eng/source-build-tarball-build-official.yml
Normal file
14
eng/source-build-tarball-build-official.yml
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
trigger: none
|
||||
pr: none
|
||||
resources:
|
||||
pipelines:
|
||||
- pipeline: installer-build-resource
|
||||
source: dotnet-installer-official-ci
|
||||
trigger: true
|
||||
|
||||
stages:
|
||||
- stage: build
|
||||
jobs:
|
||||
- template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml
|
||||
parameters:
|
||||
tarballResourceId: installer-build-resource
|
||||
|
|
@ -3,11 +3,8 @@ pr: none
|
|||
resources:
|
||||
pipelines:
|
||||
- pipeline: installer-build-resource
|
||||
${{ if eq(variables['System.TeamProject'], 'public') }}:
|
||||
source: installer
|
||||
${{ if ne(variables['System.TeamProject'], 'public') }}:
|
||||
source: dotnet-installer-official-ci
|
||||
trigger: true # Run pipeline when any run of installer CI completes
|
||||
source: installer
|
||||
trigger: true
|
||||
|
||||
stages:
|
||||
- stage: build
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
"cmake": "3.16.4"
|
||||
},
|
||||
"msbuild-sdks": {
|
||||
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21559.3",
|
||||
"Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21559.3"
|
||||
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21628.1",
|
||||
"Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21628.1"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,9 +25,6 @@ CUSTOM_BUILD_ARGS=
|
|||
# Set nuget package cache under the repo
|
||||
[ -z $NUGET_PACKAGES ] && export NUGET_PACKAGES="$REPOROOT/.nuget/packages"
|
||||
|
||||
# Set max number of files open, helps avoid errors during NuGet restore
|
||||
ulimit -n 16384
|
||||
|
||||
args=( )
|
||||
|
||||
while [[ $# > 0 ]]; do
|
||||
|
|
|
|||
|
|
@ -7,10 +7,10 @@ jobs:
|
|||
pool:
|
||||
${{ if eq(variables['System.TeamProject'], 'public') }}:
|
||||
name: NetCore1ESPool-Public
|
||||
demands: ImageOverride -equals Build.Ubuntu.1604.Amd64.Open
|
||||
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
|
||||
${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
||||
name: NetCore1ESPool-Internal
|
||||
demands: ImageOverride -equals Build.Ubuntu.1604.Amd64
|
||||
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
|
||||
variables:
|
||||
_BuildConfig: Release
|
||||
workspace:
|
||||
|
|
|
|||
|
|
@ -10,87 +10,105 @@ parameters:
|
|||
# The resource id of the tarball to download and build
|
||||
tarballResourceId: current
|
||||
|
||||
# The following parameters aren't expected to be passed in rather they are used for encapsulation
|
||||
# -----------------------------------------------------------------------------------------------
|
||||
fedora33Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2
|
||||
poolInternal:
|
||||
name: NetCore1ESPool-Svc-Internal
|
||||
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
|
||||
poolPublic:
|
||||
name: NetCore1ESPool-Svc-Public
|
||||
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
|
||||
tarballDir: $(Build.StagingDirectory)/tarball
|
||||
|
||||
jobs:
|
||||
- job: Source_Build_Run_Tarball_Build
|
||||
- job: Build_Tarball
|
||||
condition: ${{ parameters.condition }}
|
||||
displayName: Source-Build Build Tarball
|
||||
displayName: Build Tarball
|
||||
dependsOn: ${{ parameters.dependsOn }}
|
||||
pool:
|
||||
${{ if eq(variables['System.TeamProject'], 'public') }}:
|
||||
name: NetCore1ESPool-Public
|
||||
demands: ImageOverride -equals Build.Ubuntu.1604.Amd64.Open
|
||||
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
|
||||
${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
||||
name: NetCore1ESPool-Internal
|
||||
demands: ImageOverride -equals Build.Ubuntu.1604.Amd64
|
||||
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
|
||||
strategy:
|
||||
matrix:
|
||||
Fedora33-Online:
|
||||
_runOnline: true
|
||||
_Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2
|
||||
_BuildArch: x64
|
||||
_Container: ${{ parameters.fedora33Container }}
|
||||
_RunOnline: true
|
||||
Fedora33-Offline:
|
||||
_runOnline: false
|
||||
_Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2
|
||||
timeoutInMinutes: 210
|
||||
variables:
|
||||
_TarballDir: $(Build.StagingDirectory)/tarball
|
||||
_BuildConfig: Release
|
||||
_BuildArch: x64
|
||||
_BuildArch: x64
|
||||
_Container: ${{ parameters.fedora33Container }}
|
||||
_RunOnline: false
|
||||
timeoutInMinutes: 240
|
||||
workspace:
|
||||
clean: all
|
||||
|
||||
steps:
|
||||
- checkout: none
|
||||
|
||||
- download: ${{ parameters.tarballResourceId }}
|
||||
artifact: BlobArtifacts
|
||||
patterns: '**/dotnet-sdk-source*.tar.gz'
|
||||
displayName: Download Tarball
|
||||
|
||||
- script: |
|
||||
set -x
|
||||
|
||||
resourceIdPathSegment=
|
||||
if [ '${{ parameters.tarballResourceId }}' != 'current' ]; then
|
||||
resourceIdPathSegment='${{ parameters.tarballResourceId }}/'
|
||||
fi
|
||||
|
||||
mkdir -p "$(_TarballDir)"
|
||||
tarballFilePath="$(PIPELINE.WORKSPACE)/${resourceIdPathSegment}BlobArtifacts/dotnet-sdk-source*.tar.gz"
|
||||
eval tar -ozxf "$tarballFilePath" -C "$(_TarballDir)"
|
||||
eval rm -f "$tarballFilePath"
|
||||
displayName: Extract Tarball
|
||||
|
||||
- script: |
|
||||
set -x
|
||||
|
||||
docker run --rm -v $(_TarballDir):/tarball -w /tarball $(_Container) ./prep.sh
|
||||
displayName: Prep Tarball
|
||||
|
||||
- script: |
|
||||
set -x
|
||||
df -h
|
||||
|
||||
networkArgs=
|
||||
customBuildArgs=
|
||||
if [ '$(_runOnline)' = 'true' ]; then
|
||||
customBuildArgs='--online'
|
||||
else
|
||||
networkArgs='--network none'
|
||||
fi
|
||||
|
||||
docker run --rm -v $(_TarballDir):/tarball -w /tarball ${networkArgs} $(_Container) ./build.sh ${customBuildArgs} -- /p:CleanWhileBuilding=true
|
||||
displayName: Build Tarball
|
||||
|
||||
- publish: '$(_TarballDir)/artifacts/$(_BuildArch)/$(_BuildConfig)/'
|
||||
artifact: $(Agent.JobName)_Artifacts_Attempt$(System.JobAttempt)
|
||||
displayName: Publish Source Build Artifacts
|
||||
|
||||
- script: |
|
||||
set -x
|
||||
|
||||
docker run --rm -v $(_TarballDir):/tarball -w /tarball $(_Container) ./build.sh --run-smoke-test
|
||||
displayName: Run Tests
|
||||
|
||||
- template: /src/SourceBuild/Arcade/eng/common/templates/steps/source-build-publish-logs.yml
|
||||
- template: /src/SourceBuild/Arcade/eng/common/templates/steps/source-build-build-tarball.yml
|
||||
parameters:
|
||||
sourceFolder: $(_TarballDir)
|
||||
buildArch: $(_BuildArch)
|
||||
container: $(_Container)
|
||||
prepScript: |
|
||||
set -x
|
||||
|
||||
docker run --rm -v ${{ parameters.tarballDir }}:/tarball -w /tarball $(_Container) ./prep.sh
|
||||
runOnline: $(_RunOnline)
|
||||
tarballDir: ${{ parameters.tarballDir }}
|
||||
tarballResourceId: ${{ parameters.tarballResourceId }}
|
||||
|
||||
- ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
|
||||
- job: Rebuild_Tarball
|
||||
displayName: Rebuild Tarball With Previous
|
||||
dependsOn: Build_Tarball
|
||||
pool:
|
||||
${{ if eq(variables['System.TeamProject'], 'public') }}:
|
||||
${{ parameters.poolPublic }}
|
||||
${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
||||
${{ parameters.poolInternal }}
|
||||
strategy:
|
||||
matrix:
|
||||
Fedora33-Offline:
|
||||
_PreviousSourceBuildArtifact: Build Tarball Fedora33-Offline_Artifacts
|
||||
_BuildArch: x64
|
||||
_Container: ${{ parameters.fedora33Container }}
|
||||
_RunOnline: false
|
||||
timeoutInMinutes: 180
|
||||
workspace:
|
||||
clean: all
|
||||
|
||||
steps:
|
||||
- checkout: none
|
||||
|
||||
- download: current
|
||||
artifact: $(_PreviousSourceBuildArtifact)
|
||||
patterns: '*.tar.gz'
|
||||
displayName: Download Previous Source Build Artifacts
|
||||
|
||||
- task: CopyFiles@2
|
||||
displayName: Copy Previous Source Build Artifacts
|
||||
inputs:
|
||||
SourceFolder: $(PIPELINE.WORKSPACE)/$(_PreviousSourceBuildArtifact)
|
||||
Contents: '*.tar.gz'
|
||||
TargetFolder: ${{ parameters.tarballDir }}/packages/archive/
|
||||
|
||||
- template: /src/SourceBuild/Arcade/eng/common/templates/steps/source-build-build-tarball.yml
|
||||
parameters:
|
||||
additionalBuildArgs: --with-sdk /tarball/.dotnet
|
||||
buildArch: $(_BuildArch)
|
||||
container: $(_Container)
|
||||
prepScript: |
|
||||
set -x
|
||||
|
||||
mkdir ${{ parameters.tarballDir }}/.dotnet
|
||||
tarballFilePath="${{ parameters.tarballDir }}/packages/archive/dotnet-sdk-*.tar.gz"
|
||||
eval tar -ozxf "$tarballFilePath" -C "${{ parameters.tarballDir }}/.dotnet"
|
||||
eval rm -f "$tarballFilePath"
|
||||
runOnline: $(_RunOnline)
|
||||
tarballDir: ${{ parameters.tarballDir }}
|
||||
tarballResourceId: ${{ parameters.tarballResourceId }}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,75 @@
|
|||
# Steps used to build a source-build tarball
|
||||
|
||||
parameters:
|
||||
# Additional custom build args
|
||||
additionalBuildArgs: ""
|
||||
|
||||
# Architecture to build
|
||||
buildArch: null
|
||||
|
||||
# Container image to build within
|
||||
container: null
|
||||
|
||||
# Script logic to prep the tarball for building
|
||||
prepScript: null
|
||||
|
||||
# Whether or not to build online
|
||||
runOnline: null
|
||||
|
||||
# Directory to build the tarball in
|
||||
tarballDir:
|
||||
|
||||
# Resource id of the tarball to download and build
|
||||
tarballResourceId: null
|
||||
|
||||
steps:
|
||||
- download: ${{ parameters.tarballResourceId }}
|
||||
artifact: BlobArtifacts
|
||||
patterns: '**/dotnet-sdk-source*.tar.gz'
|
||||
displayName: Download Tarball
|
||||
|
||||
- script: |
|
||||
set -x
|
||||
|
||||
resourceIdPathSegment=
|
||||
if [ '${{ parameters.tarballResourceId }}' != 'current' ]; then
|
||||
resourceIdPathSegment='${{ parameters.tarballResourceId }}/'
|
||||
fi
|
||||
|
||||
mkdir -p "${{ parameters.tarballDir }}"
|
||||
tarballFilePath="$(PIPELINE.WORKSPACE)/${resourceIdPathSegment}BlobArtifacts/dotnet-sdk-source*.tar.gz"
|
||||
eval tar -ozxf "$tarballFilePath" -C "${{ parameters.tarballDir }}"
|
||||
eval rm -f "$tarballFilePath"
|
||||
displayName: Extract Tarball
|
||||
|
||||
- script: ${{ parameters.prepScript }}
|
||||
displayName: Prep Tarball
|
||||
|
||||
- script: |
|
||||
set -x
|
||||
df -h
|
||||
|
||||
networkArgs=
|
||||
customBuildArgs=
|
||||
if [ '${{ parameters.runOnline}}' = 'true' ]; then
|
||||
customBuildArgs='--online'
|
||||
else
|
||||
networkArgs='--network none'
|
||||
fi
|
||||
|
||||
docker run --rm -v ${{ parameters.tarballDir }}:/tarball -w /tarball ${networkArgs} ${{ parameters.container }} ./build.sh ${customBuildArgs} ${{ parameters.additionalBuildArgs }} -- /p:CleanWhileBuilding=true
|
||||
displayName: Build Tarball
|
||||
|
||||
- script: |
|
||||
set -x
|
||||
|
||||
docker run --rm -v ${{ parameters.tarballDir }}:/tarball -w /tarball ${{ parameters.container }} ./build.sh --run-smoke-test ${{ parameters.additionalBuildArgs }}
|
||||
displayName: Run Tests
|
||||
|
||||
- template: /src/SourceBuild/Arcade/eng/common/templates/steps/source-build-publish-logs.yml
|
||||
parameters:
|
||||
sourceFolder: ${{ parameters.tarballDir }}
|
||||
|
||||
- publish: '${{ parameters.tarballDir }}/artifacts/${{ parameters.buildArch}}/Release/'
|
||||
artifact: $(Agent.JobName)_Artifacts
|
||||
displayName: Publish Artifacts
|
||||
|
|
@ -170,7 +170,7 @@
|
|||
Condition="$(IsRootRepo) != 'true'" />
|
||||
|
||||
<Exec
|
||||
Command="git submodule update --init --recursive"
|
||||
Command="git submodule update --init --recursive --depth 1"
|
||||
WorkingDirectory="$(TarballRepoSourceDir)" />
|
||||
|
||||
<!-- Remove the git objects folder to free up tarball space -->
|
||||
|
|
|
|||
|
|
@ -12,8 +12,7 @@
|
|||
-->
|
||||
<ItemGroup>
|
||||
<PackageDownload Include="Microsoft.DotNet.Common.ItemTemplates"
|
||||
Version="[$(MicrosoftDotNetCommonItemTemplates21PackageVersion)];
|
||||
[$(MicrosoftDotNetCommonItemTemplates30PackageVersion)];
|
||||
Version="[$(MicrosoftDotNetCommonItemTemplates30PackageVersion)];
|
||||
[$(MicrosoftDotNetCommonItemTemplates31PackageVersion)];
|
||||
[$(MicrosoftDotNetCommonItemTemplates50PackageVersion)];
|
||||
[$(MicrosoftDotNetCommonItemTemplates60PackageVersion)]" />
|
||||
|
|
@ -27,7 +26,6 @@
|
|||
<!-- TODO: Re-enable once successful build completes -->
|
||||
<!-- <PackageDownload Include="Microsoft.DotNet.Web.ItemTemplates.6.0" Version="[$(AspNetCorePackageVersionFor60Templates)]" /> -->
|
||||
|
||||
<PackageDownload Include="Microsoft.DotNet.Common.ProjectTemplates.2.1" Version="[$(MicrosoftDotNetCommonProjectTemplates21PackageVersion)]" />
|
||||
<PackageDownload Include="Microsoft.DotNet.Common.ProjectTemplates.3.0" Version="[$(MicrosoftDotNetCommonProjectTemplates30PackageVersion)]" />
|
||||
<PackageDownload Include="Microsoft.DotNet.Common.ProjectTemplates.3.1" Version="[$(MicrosoftDotNetCommonProjectTemplates31PackageVersion)]" />
|
||||
<PackageDownload Include="Microsoft.DotNet.Common.ProjectTemplates.5.0" Version="[$(MicrosoftDotNetCommonProjectTemplates50PackageVersion)]" />
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"tools": {
|
||||
"dotnet": "6.0.100-rc.2.21426.20"
|
||||
"dotnet": "6.0.200-preview.21603.2"
|
||||
},
|
||||
"msbuild-sdks": {
|
||||
"Microsoft.Build.CentralPackageVersions": "2.0.1",
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
</Target>
|
||||
|
||||
<Target Name="CopyBinariesToBinFolder"
|
||||
AfterTargets="Build"
|
||||
AfterTargets="ExtractIntermediatePackages"
|
||||
Inputs="$(MSBuildProjectFullPath)"
|
||||
Outputs="$(RepoCompletedSemaphorePath)CopyBinariesToBinFolder.complete">
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -10,11 +10,6 @@
|
|||
<LogVerbosityOptOut>true</LogVerbosityOptOut>
|
||||
<BuildCommandArgs>$(BuildCommandArgs) -v $(LogVerbosity)</BuildCommandArgs>
|
||||
|
||||
<!-- The sdk repo is building with an older version of the SDK where this property is
|
||||
defaulted to false. The SDK that source-build is using defaults it to true.
|
||||
Set it to false to get old behavior for building the sdk repo. -->
|
||||
<BuildCommandArgs>$(BuildCommandArgs) /p:ProduceReferenceAssembly=false</BuildCommandArgs>
|
||||
|
||||
<!-- Pass in package version props using the Product Construction (ProdCon) API. -->
|
||||
<BuildCommandArgs>$(BuildCommandArgs) /p:PB_PackageVersionPropsUrl=file:%2F%2F$(PackageVersionPropsPath)</BuildCommandArgs>
|
||||
|
||||
|
|
|
|||
|
|
@ -49,13 +49,47 @@
|
|||
|
||||
<!-- Copy files specified in package references above from restored package dir to unpacked archive dir -->
|
||||
<Message Text=" Replacing restored files in $(UnpackedTarPath)" Importance="High" />
|
||||
<Copy
|
||||
SourceFiles="$(RestorePackagesPath)$([System.String]::copy('%(PackageReference.Identity)').ToLower()).%(PackageReference.Version).nupkg"
|
||||
DestinationFiles="$(UnpackedTarPath)%(PackageReference.Identity).%(PackageReference.Version).nupkg" />
|
||||
<MSBuild Projects="$(MSBuildProjectFile)"
|
||||
Targets="CopyDownloadedPackage"
|
||||
Properties="SourcePath=$(RestorePackagesPath);DestinationPath=$(UnpackedTarPath);PackageName=%(PackageReference.Identity);PackageVersion=%(PackageReference.Version)" />
|
||||
|
||||
<!-- Repack tarball with new bootstrap name -->
|
||||
<Message Text=" Repacking tarball to $(NewTarballName)" Importance="High" />
|
||||
<Exec Command="tar --numeric-owner -czf $(NewTarballName) *.nupkg *.props SourceBuildReferencePackages/" WorkingDirectory="$(UnpackedTarPath)" />
|
||||
|
||||
</Target>
|
||||
|
||||
<Target Name="CopyDownloadedPackage">
|
||||
<!--
|
||||
Copy downloaded package to the output path.
|
||||
Note: The package version may be different than the version specified
|
||||
since the source-build build number can be different than the official
|
||||
package build number.
|
||||
-->
|
||||
<ItemGroup>
|
||||
<SourceFileName Include="$(SourcePath)$(PackageName.ToLower()).*.nupkg" />
|
||||
</ItemGroup>
|
||||
<PropertyGroup>
|
||||
<DestinationFileName>@(SourceFileName->'%(Filename)')</DestinationFileName>
|
||||
<NewVersion>$(DestinationFileName.Replace('$(PackageName.ToLower()).',''))</NewVersion>
|
||||
</PropertyGroup>
|
||||
<Copy
|
||||
SourceFiles="@(SourceFileName)"
|
||||
DestinationFiles="$(DestinationPath)$(PackageName).$(NewVersion).nupkg" />
|
||||
|
||||
<!--
|
||||
Update the PackageVersions.props if restored version is
|
||||
different than the specified version.
|
||||
-->
|
||||
<PropertyGroup>
|
||||
<VersionTag>$([System.String]::concat('%3C','$(PackageName)','Version','%3E').Replace('.',''))</VersionTag>
|
||||
<PackageVersionTag>$([System.String]::concat('%3C','$(PackageName)','PackageVersion','%3E').Replace('.',''))</PackageVersionTag>
|
||||
<FilePath>$(DestinationPath)PackageVersions.props</FilePath>
|
||||
</PropertyGroup>
|
||||
<WriteLinesToFile
|
||||
File="$(FilePath)"
|
||||
Lines="$([System.IO.File]::ReadAllText($(FilePath)).Replace('$(VersionTag)$(PackageVersion)','$(VersionTag)$(NewVersion)').Replace('$(PackageVersionTag)$(PackageVersion)','$(PackageVersionTag)$(NewVersion)'))"
|
||||
Overwrite="true"
|
||||
Condition=" '$(PackageVersion)' != '$(NewVersion)' " />
|
||||
</Target>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ TARBALL_PREFIX=dotnet-sdk-
|
|||
VERSION_PREFIX=6.0
|
||||
# See https://github.com/dotnet/source-build/issues/579, this version
|
||||
# needs to be compatible with the runtime produced from source-build
|
||||
DEV_CERTS_VERSION_DEFAULT=6.0.0-preview.6.21355.2
|
||||
DEV_CERTS_VERSION_DEFAULT=6.0.0-rtm.21573.1
|
||||
__ROOT_REPO=$(sed 's/\r$//' "$SCRIPT_ROOT/artifacts/obj/rootrepo.txt") # remove CR if mounted repo on Windows drive
|
||||
executingUserHome=${HOME:-}
|
||||
|
||||
|
|
@ -247,11 +247,10 @@ function doCommand() {
|
|||
echo " terminated with exit code $?" | tee -a "$logFile"
|
||||
elif [ "$1" == "multi-rid-publish" ]; then
|
||||
if [ "$lang" == "F#" ]; then
|
||||
# F# tries to use a truncated version number unless we pass it this flag. see https://github.com/dotnet/source-build/issues/2554
|
||||
runPublishScenarios() {
|
||||
"${dotnetCmd}" publish --self-contained false /bl:"${binlogPrefix}publish-fx-dep.binlog" /p:_NETCoreSdkIsPreview=true
|
||||
"${dotnetCmd}" publish --self-contained true -r "$targetRid" /bl:"${binlogPrefix}publish-self-contained-${targetRid}.binlog" /p:_NETCoreSdkIsPreview=true
|
||||
"${dotnetCmd}" publish --self-contained true -r linux-x64 /bl:"${binlogPrefix}publish-self-contained-portable.binlog" /p:_NETCoreSdkIsPreview=true
|
||||
"${dotnetCmd}" publish --self-contained false /bl:"${binlogPrefix}publish-fx-dep.binlog"
|
||||
"${dotnetCmd}" publish --self-contained true -r "$targetRid" /bl:"${binlogPrefix}publish-self-contained-${targetRid}.binlog"
|
||||
"${dotnetCmd}" publish --self-contained true -r linux-x64 /bl:"${binlogPrefix}publish-self-contained-portable.binlog"
|
||||
}
|
||||
else
|
||||
runPublishScenarios() {
|
||||
|
|
@ -269,9 +268,9 @@ function doCommand() {
|
|||
if [ "$lang" == "F#" ]; then
|
||||
# F# tries to use a truncated version number unless we pass it this flag. see https://github.com/dotnet/source-build/issues/2554
|
||||
if [ "$projectOutput" == "true" ]; then
|
||||
"${dotnetCmd}" $1 /bl:"$binlog" /p:_NETCoreSdkIsPreview=true | tee -a "$logFile"
|
||||
"${dotnetCmd}" $1 /bl:"$binlog" | tee -a "$logFile"
|
||||
else
|
||||
"${dotnetCmd}" $1 /bl:"$binlog" /p:_NETCoreSdkIsPreview=true >> "$logFile" 2>&1
|
||||
"${dotnetCmd}" $1 /bl:"$binlog" >> "$logFile" 2>&1
|
||||
fi
|
||||
else
|
||||
if [ "$projectOutput" == "true" ]; then
|
||||
|
|
@ -322,8 +321,7 @@ function runAllTests() {
|
|||
doCommand VB xunit new restore test
|
||||
doCommand VB mstest new restore test
|
||||
|
||||
# "run" was removed from the list below. see https://github.com/dotnet/source-build/issues/2554
|
||||
doCommand F# console new restore build multi-rid-publish
|
||||
doCommand F# console new restore build run multi-rid-publish
|
||||
doCommand F# classlib new restore build multi-rid-publish
|
||||
doCommand F# xunit new restore test
|
||||
doCommand F# mstest new restore test
|
||||
|
|
@ -348,16 +346,12 @@ function runWebTests() {
|
|||
doCommand C# mvc "$@" new restore build run multi-rid-publish
|
||||
doCommand C# webapi "$@" new restore build multi-rid-publish
|
||||
doCommand C# razor "$@" new restore build run multi-rid-publish
|
||||
# Requires prereqs (non-source-built packages) - re-enable with https://github.com/dotnet/source-build/issues/2550
|
||||
# doCommand C# blazorwasm "$@" new restore build run publish
|
||||
doCommand C# blazorwasm "$@" new restore build run publish
|
||||
doCommand C# blazorserver "$@" new restore build run publish
|
||||
|
||||
# "run" was removed from the list below. see https://github.com/dotnet/source-build/issues/2554
|
||||
doCommand F# web "$@" new restore build multi-rid-publish
|
||||
# Requires prereqs (non-source-built packages) - re-enable with https://github.com/dotnet/source-build/issues/2550
|
||||
# doCommand F# mvc "$@" new restore build run multi-rid-publish
|
||||
# "run" was also removed from this set, same issue: https://github.com/dotnet/source-build/issues/2554
|
||||
doCommand F# webapi "$@" new restore build multi-rid-publish
|
||||
doCommand F# web "$@" new restore build run multi-rid-publish
|
||||
doCommand F# mvc "$@" new restore build run multi-rid-publish
|
||||
doCommand F# webapi "$@" new restore build run multi-rid-publish
|
||||
}
|
||||
|
||||
function runXmlDocTests() {
|
||||
|
|
|
|||
|
|
@ -24,9 +24,9 @@ index 37feef5..c5aee85 100644
|
|||
+ <NoWarn>$(NoWarn);NU1603</NoWarn>
|
||||
+ </PropertyGroup>
|
||||
+
|
||||
<PropertyGroup Condition="'$(DotNetBuildFromSource)' == 'true'">
|
||||
<!--
|
||||
When building using source-build the process is:
|
||||
<PropertyGroup Condition="'$(DotNetBuildOffline)' == 'true'">
|
||||
<!--
|
||||
Arcade has a special version prop for CodeAnalysis.CSharp in GenFacades
|
||||
--
|
||||
2.29.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,68 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Davis Goodin <dagood@microsoft.com>
|
||||
Date: Fri, 22 Oct 2021 13:26:33 -0500
|
||||
Subject: [PATCH] Fix MicrosoftExtensionsVersion
|
||||
|
||||
Move it to eng/Versions.props to make it overridable, and rename it to match an
|
||||
actual package ID.
|
||||
|
||||
Update paramater nullability in src/Logging/SimpleConsoleLogger.cs to be
|
||||
source-compatible with the 6.0 version of these packages.
|
||||
|
||||
See https://github.com/dotnet/format/issues/1400
|
||||
---
|
||||
Directory.Packages.props | 7 +++----
|
||||
eng/Versions.props | 1 +
|
||||
src/Logging/SimpleConsoleLogger.cs | 2 +-
|
||||
3 files changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/Directory.Packages.props b/Directory.Packages.props
|
||||
index 6b628c2..9b579ea 100644
|
||||
--- a/Directory.Packages.props
|
||||
+++ b/Directory.Packages.props
|
||||
@@ -2,7 +2,6 @@
|
||||
<!-- <Import Project="eng\Versions.props" /> -->
|
||||
|
||||
<PropertyGroup>
|
||||
- <MicrosoftExtensionsVersion>5.0.0</MicrosoftExtensionsVersion>
|
||||
<!-- In order tests against the same version of NuGet as the SDK. We have to set this to match. -->
|
||||
<NuGetVersion>6.0.0-preview.4.221</NuGetVersion>
|
||||
</PropertyGroup>
|
||||
@@ -25,9 +24,9 @@
|
||||
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="$(MicrosoftNETCoreCompilersPackageVersion)" />
|
||||
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="$(MicrosoftNETCoreCompilersPackageVersion)" />
|
||||
<PackageVersion Include="Microsoft.CodeAnalysis" Version="$(MicrosoftNETCoreCompilersPackageVersion)" />
|
||||
- <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsVersion)" />
|
||||
- <PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="$(MicrosoftExtensionsVersion)" />
|
||||
- <PackageVersion Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsVersion)" />
|
||||
+ <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionVersion)" />
|
||||
+ <PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="$(MicrosoftExtensionsDependencyInjectionVersion)" />
|
||||
+ <PackageVersion Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsDependencyInjectionVersion)" />
|
||||
<PackageVersion Include="NuGet.Common" Version="$(NuGetVersion)" />
|
||||
<PackageVersion Include="NuGet.Configuration" Version="$(NuGetVersion)" />
|
||||
<PackageVersion Include="NuGet.Frameworks" Version="$(NuGetVersion)" />
|
||||
diff --git a/eng/Versions.props b/eng/Versions.props
|
||||
index b1990aa..f6ddbbd 100644
|
||||
--- a/eng/Versions.props
|
||||
+++ b/eng/Versions.props
|
||||
@@ -15,6 +15,7 @@
|
||||
<PropertyGroup>
|
||||
<MicrosoftBuildVersion>16.11.0</MicrosoftBuildVersion>
|
||||
<MicrosoftCodeAnalysisAnalyzersVersion>3.3.2</MicrosoftCodeAnalysisAnalyzersVersion>
|
||||
+ <MicrosoftExtensionsDependencyInjectionVersion>5.0.0</MicrosoftExtensionsDependencyInjectionVersion>
|
||||
<!-- Dependencies from https://github.com/dotnet/roslyn -->
|
||||
<MicrosoftNETCoreCompilersPackageVersion>4.0.0-6.21526.21</MicrosoftNETCoreCompilersPackageVersion>
|
||||
<!-- Dependencies from https://github.com/dotnet/command-line-api -->
|
||||
diff --git a/src/Logging/SimpleConsoleLogger.cs b/src/Logging/SimpleConsoleLogger.cs
|
||||
index c361f84..fd8015c 100644
|
||||
--- a/src/Logging/SimpleConsoleLogger.cs
|
||||
+++ b/src/Logging/SimpleConsoleLogger.cs
|
||||
@@ -37,7 +37,7 @@ namespace Microsoft.CodeAnalysis.Tools.Logging
|
||||
_minimalErrorLevel = minimalErrorLevel;
|
||||
}
|
||||
|
||||
- public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter)
|
||||
+ public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception? exception, Func<TState, Exception?, string> formatter)
|
||||
{
|
||||
if (!IsEnabled(logLevel))
|
||||
{
|
||||
|
|
@ -1,167 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Davis Goodin <dagood@microsoft.com>
|
||||
Date: Tue, 19 Oct 2021 16:11:51 -0500
|
||||
Subject: [PATCH] Disable apphost on downlevel frameworks during source-build
|
||||
|
||||
During source-build, disable apphost build for 'fsi' and 'fsc', and
|
||||
'fsyacc', 'fslex', and 'AssemblyCheck' during the bootstrap build.
|
||||
|
||||
Creating an apphost for a net5.0 project while building with a net6.0
|
||||
SDK downloads the apphost pack as a prebuilt. Stopping the projects from
|
||||
creating the apphost removes the prebuilt for source-build.
|
||||
|
||||
To make disabling the apphost work in the bootstrapping build, add a
|
||||
check to eng/build.sh to skip the bootstrap build if we're currently
|
||||
running the "outer" source-build. That gives source-build the ability to
|
||||
run bootstrapping on its own terms. Now, when eng/SourceBuild.props runs
|
||||
bootstrapping, it can pass the DotNetBuildFromSource property through
|
||||
the environment so it takes effect.
|
||||
|
||||
See: https://github.com/dotnet/fsharp/issues/12282
|
||||
|
||||
PR: https://github.com/dotnet/fsharp/pull/12286
|
||||
---
|
||||
eng/SourceBuild.props | 2 +-
|
||||
eng/build.sh | 51 ++++++++++---------
|
||||
.../AssemblyCheck/AssemblyCheck.fsproj | 1 +
|
||||
src/buildtools/fslex/fslex.fsproj | 1 +
|
||||
src/buildtools/fsyacc/fsyacc.fsproj | 1 +
|
||||
src/fsharp/fsc/fsc.fsproj | 1 +
|
||||
src/fsharp/fsi/fsi.fsproj | 1 +
|
||||
7 files changed, 34 insertions(+), 24 deletions(-)
|
||||
|
||||
diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props
|
||||
index 22c929f28..903ee00d3 100644
|
||||
--- a/eng/SourceBuild.props
|
||||
+++ b/eng/SourceBuild.props
|
||||
@@ -41,7 +41,7 @@
|
||||
<Exec
|
||||
Command="./build.sh --bootstrap --skipBuild"
|
||||
WorkingDirectory="$(InnerSourceBuildRepoRoot)"
|
||||
- EnvironmentVariables="@(InnerBuildEnv)" />
|
||||
+ EnvironmentVariables="@(InnerBuildEnv);DotNetBuildFromSource=true" />
|
||||
</Target>
|
||||
|
||||
</Project>
|
||||
diff --git a/eng/build.sh b/eng/build.sh
|
||||
index 9a2aa0083..6af422237 100755
|
||||
--- a/eng/build.sh
|
||||
+++ b/eng/build.sh
|
||||
@@ -240,29 +240,34 @@ function BuildSolution {
|
||||
node_reuse=false
|
||||
|
||||
# build bootstrap tools
|
||||
- bootstrap_config=Proto
|
||||
- bootstrap_dir=$artifacts_dir/Bootstrap
|
||||
- if [[ "$force_bootstrap" == true ]]; then
|
||||
- rm -fr $bootstrap_dir
|
||||
- fi
|
||||
- if [ ! -f "$bootstrap_dir/fslex.dll" ]; then
|
||||
- BuildMessage="Error building tools"
|
||||
- MSBuild "$repo_root/src/buildtools/buildtools.proj" \
|
||||
- /restore \
|
||||
- /p:Configuration=$bootstrap_config
|
||||
-
|
||||
- mkdir -p "$bootstrap_dir"
|
||||
- cp -pr $artifacts_dir/bin/fslex/$bootstrap_config/net5.0 $bootstrap_dir/fslex
|
||||
- cp -pr $artifacts_dir/bin/fsyacc/$bootstrap_config/net5.0 $bootstrap_dir/fsyacc
|
||||
- fi
|
||||
- if [ ! -f "$bootstrap_dir/fsc.exe" ]; then
|
||||
- BuildMessage="Error building bootstrap"
|
||||
- MSBuild "$repo_root/proto.proj" \
|
||||
- /restore \
|
||||
- /p:Configuration=$bootstrap_config \
|
||||
-
|
||||
-
|
||||
- cp -pr $artifacts_dir/bin/fsc/$bootstrap_config/net5.0 $bootstrap_dir/fsc
|
||||
+ # source_build=true means we are currently in the outer/wrapper source-build,
|
||||
+ # and building bootstrap needs to wait. The source-build targets will run this
|
||||
+ # script again without setting source_build=true when it is done setting up
|
||||
+ # the build environment. See 'eng/SourceBuild.props'.
|
||||
+ if [[ "$source_build" != true ]]; then
|
||||
+ bootstrap_config=Proto
|
||||
+ bootstrap_dir=$artifacts_dir/Bootstrap
|
||||
+ if [[ "$force_bootstrap" == true ]]; then
|
||||
+ rm -fr $bootstrap_dir
|
||||
+ fi
|
||||
+ if [ ! -f "$bootstrap_dir/fslex.dll" ]; then
|
||||
+ BuildMessage="Error building tools"
|
||||
+ MSBuild "$repo_root/src/buildtools/buildtools.proj" \
|
||||
+ /restore \
|
||||
+ /p:Configuration=$bootstrap_config
|
||||
+
|
||||
+ mkdir -p "$bootstrap_dir"
|
||||
+ cp -pr $artifacts_dir/bin/fslex/$bootstrap_config/net5.0 $bootstrap_dir/fslex
|
||||
+ cp -pr $artifacts_dir/bin/fsyacc/$bootstrap_config/net5.0 $bootstrap_dir/fsyacc
|
||||
+ fi
|
||||
+ if [ ! -f "$bootstrap_dir/fsc.exe" ]; then
|
||||
+ BuildMessage="Error building bootstrap"
|
||||
+ MSBuild "$repo_root/proto.proj" \
|
||||
+ /restore \
|
||||
+ /p:Configuration=$bootstrap_config
|
||||
+
|
||||
+ cp -pr $artifacts_dir/bin/fsc/$bootstrap_config/net5.0 $bootstrap_dir/fsc
|
||||
+ fi
|
||||
fi
|
||||
|
||||
if [[ "$skip_build" != true ]]; then
|
||||
diff --git a/src/buildtools/AssemblyCheck/AssemblyCheck.fsproj b/src/buildtools/AssemblyCheck/AssemblyCheck.fsproj
|
||||
index 464b6ef78..5c78bbe6d 100644
|
||||
--- a/src/buildtools/AssemblyCheck/AssemblyCheck.fsproj
|
||||
+++ b/src/buildtools/AssemblyCheck/AssemblyCheck.fsproj
|
||||
@@ -4,6 +4,7 @@
|
||||
<OutputType>Exe</OutputType>
|
||||
<TargetFramework>net5.0</TargetFramework>
|
||||
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
|
||||
+ <UseAppHost Condition="'$(DotNetBuildFromSource)' == 'true'">false</UseAppHost>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
diff --git a/src/buildtools/fslex/fslex.fsproj b/src/buildtools/fslex/fslex.fsproj
|
||||
index 1959ce59c..3d63bf6bf 100644
|
||||
--- a/src/buildtools/fslex/fslex.fsproj
|
||||
+++ b/src/buildtools/fslex/fslex.fsproj
|
||||
@@ -5,6 +5,7 @@
|
||||
<TargetFramework>net5.0</TargetFramework>
|
||||
<DefineConstants>INTERNALIZED_FSLEXYACC_RUNTIME;$(DefineConstants)</DefineConstants>
|
||||
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
|
||||
+ <UseAppHost Condition="'$(DotNetBuildFromSource)' == 'true'">false</UseAppHost>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
diff --git a/src/buildtools/fsyacc/fsyacc.fsproj b/src/buildtools/fsyacc/fsyacc.fsproj
|
||||
index 5d1b7141f..63b63c5de 100644
|
||||
--- a/src/buildtools/fsyacc/fsyacc.fsproj
|
||||
+++ b/src/buildtools/fsyacc/fsyacc.fsproj
|
||||
@@ -5,6 +5,7 @@
|
||||
<TargetFramework>net5.0</TargetFramework>
|
||||
<DefineConstants>INTERNALIZED_FSLEXYACC_RUNTIME;$(DefineConstants)</DefineConstants>
|
||||
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
|
||||
+ <UseAppHost Condition="'$(DotNetBuildFromSource)' == 'true'">false</UseAppHost>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
diff --git a/src/fsharp/fsc/fsc.fsproj b/src/fsharp/fsc/fsc.fsproj
|
||||
index 7fa31fc21..04025c297 100644
|
||||
--- a/src/fsharp/fsc/fsc.fsproj
|
||||
+++ b/src/fsharp/fsc/fsc.fsproj
|
||||
@@ -12,6 +12,7 @@
|
||||
<OtherFlags>$(OtherFlags) --maxerrors:20 --extraoptimizationloops:1</OtherFlags>
|
||||
<NGenBinary>true</NGenBinary>
|
||||
<UseAppHost>true</UseAppHost>
|
||||
+ <UseAppHost Condition="'$(DotNetBuildFromSource)' == 'true'">false</UseAppHost>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(TargetFramework)' == 'net472'">
|
||||
diff --git a/src/fsharp/fsi/fsi.fsproj b/src/fsharp/fsi/fsi.fsproj
|
||||
index 9fd9b1333..eace6c166 100644
|
||||
--- a/src/fsharp/fsi/fsi.fsproj
|
||||
+++ b/src/fsharp/fsi/fsi.fsproj
|
||||
@@ -13,6 +13,7 @@
|
||||
<Win32Resource>fsi.res</Win32Resource>
|
||||
<NGenBinary>true</NGenBinary>
|
||||
<UseAppHost>true</UseAppHost>
|
||||
+ <UseAppHost Condition="'$(DotNetBuildFromSource)' == 'true'">false</UseAppHost>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(TargetFramework)' == 'net472'">
|
||||
|
|
@ -7,26 +7,27 @@ Removes prebuilts.
|
|||
|
||||
Background Issue: https://github.com/dotnet/source-build/issues/2542
|
||||
---
|
||||
eng/Packages.props | 3 ---
|
||||
eng/dependabot/Packages.props | 3 ---
|
||||
src/Build/Microsoft.Build.csproj | 4 +++-
|
||||
src/Directory.BeforeCommon.targets | 2 +-
|
||||
src/Framework/Microsoft.Build.Framework.csproj | 2 +-
|
||||
src/Samples/Directory.Build.props | 1 +
|
||||
src/Tasks/Microsoft.Build.Tasks.csproj | 4 +++-
|
||||
src/Utilities/Microsoft.Build.Utilities.csproj | 2 +-
|
||||
6 files changed, 9 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/eng/Packages.props b/eng/Packages.props
|
||||
index 2de607c5d..1668addc9 100644
|
||||
--- a/eng/Packages.props
|
||||
+++ b/eng/Packages.props
|
||||
@@ -46,9 +46,6 @@
|
||||
7 files changed, 10 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/eng/dependabot/Packages.props b/eng/dependabot/Packages.props
|
||||
index a1f21de26..ff74d6e7f 100644
|
||||
--- a/eng/dependabot/Packages.props
|
||||
+++ b/eng/dependabot/Packages.props
|
||||
@@ -22,9 +22,6 @@
|
||||
|
||||
<ItemGroup Condition="'$(DotNetBuildFromSource)' != 'true'">
|
||||
<GlobalPackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="$(MicrosoftCodeAnalysisBannedApiAnalyzersVersion)" />
|
||||
<GlobalPackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.3" />
|
||||
- </ItemGroup>
|
||||
-
|
||||
- <ItemGroup>
|
||||
<GlobalPackageReference Include="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="15.0.15" PrivateAssets="All" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" />
|
||||
<GlobalPackageReference Include="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="15.0.36" PrivateAssets="All" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" />
|
||||
</ItemGroup>
|
||||
|
||||
diff --git a/src/Build/Microsoft.Build.csproj b/src/Build/Microsoft.Build.csproj
|
||||
|
|
@ -34,9 +35,9 @@ index d08e337c5..3b173aee5 100644
|
|||
--- a/src/Build/Microsoft.Build.csproj
|
||||
+++ b/src/Build/Microsoft.Build.csproj
|
||||
@@ -38,8 +38,10 @@
|
||||
<PackageReference Include="Microsoft.IO.Redist" Condition="'$(FeatureMSIORedist)' == 'true'" />
|
||||
</ItemGroup>
|
||||
|
||||
<PackageReference Include="Microsoft.IO.Redist" Condition="'$(FeatureMSIORedist)' == 'true'" />
|
||||
</ItemGroup>
|
||||
|
||||
- <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
|
||||
+ <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' and '$(DotNetBuildFromSource)' != 'true'">
|
||||
<PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" />
|
||||
|
|
@ -58,6 +59,19 @@ index 913c97b12..320bffa56 100644
|
|||
<DefineConstants>$(DefineConstants);FEATURE_MSCOREE</DefineConstants>
|
||||
</PropertyGroup>
|
||||
|
||||
diff --git a/src/Framework/Microsoft.Build.Framework.csproj b/src/Framework/Microsoft.Build.Framework.csproj
|
||||
index df7556447..c7edff611 100644
|
||||
--- a/src/Framework/Microsoft.Build.Framework.csproj
|
||||
+++ b/src/Framework/Microsoft.Build.Framework.csproj
|
||||
@@ -31,7 +31,7 @@
|
||||
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
|
||||
<!-- Promote CompilerServices.Unsafe from the old version we get from System.Memory on net472. -->
|
||||
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" />
|
||||
- <PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" />
|
||||
+ <PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Condition="'$(DotNetBuildFromSource)' != 'true'" />
|
||||
<Reference Include="System.Xaml" />
|
||||
</ItemGroup>
|
||||
|
||||
diff --git a/src/Samples/Directory.Build.props b/src/Samples/Directory.Build.props
|
||||
index 6b9d6cd9f..317ef14a6 100644
|
||||
--- a/src/Samples/Directory.Build.props
|
||||
|
|
|
|||
|
|
@ -0,0 +1,28 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: MichaelSimons <msimons@microsoft.com>
|
||||
Date: Tue, 23 Nov 2021 16:13:36 +0000
|
||||
Subject: [PATCH] Update System.Threading.Tasks.DataFlow version
|
||||
|
||||
Addresses:
|
||||
NuGet.Build.Tasks.csproj : error NU1605: Detected package downgrade: System.Threading.Tasks.Dataflow from 6.0.0 to 4.9.0. Reference the package directly from the project to select a different version. [src/nuget-client.a998efecd431ec8a41536b5ac0152c16f1e2e646/build/restorehelper.targets]
|
||||
NuGet.Build.Tasks.csproj : error NU1605: NuGet.Build.Tasks -> Microsoft.Build.Tasks.Core 17.1.0-preview-21572-15 -> System.Threading.Tasks.Dataflow (>= 6.0.0) [src/nuget-client.a998efecd431ec8a41536b5ac0152c16f1e2e646/build/restorehelper.targets]
|
||||
NuGet.Build.Tasks.csproj : error NU1605: NuGet.Build.Tasks -> System.Threading.Tasks.Dataflow (>= 4.9.0) [src/nuget-client.a998efecd431ec8a41536b5ac0152c16f1e2e646/build/restorehelper.targets]
|
||||
|
||||
Backport issue: https://github.com/dotnet/source-build/issues/2311
|
||||
---
|
||||
build/packages.targets | 2 +-
|
||||
1 file changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/build/packages.targets b/build/packages.targets
|
||||
index a0aa4cc..ef5a1cc 100644
|
||||
--- a/build/packages.targets
|
||||
+++ b/build/packages.targets
|
||||
@@ -58,7 +59,7 @@
|
||||
<PackageReference Update="System.Security.Cryptography.Cng" Version="$(CryptographyPackagesVersion)" />
|
||||
<PackageReference Update="System.Security.Cryptography.Pkcs" Version="$(CryptographyPackagesVersion)" />
|
||||
<PackageReference Update="System.Security.Cryptography.ProtectedData" Version="4.4.0" />
|
||||
- <PackageReference Update="System.Threading.Tasks.Dataflow" Version="4.9.0" />
|
||||
+ <PackageReference Update="System.Threading.Tasks.Dataflow" Version="6.0.0" />
|
||||
<PackageReference Update="VSSDK.TemplateWizardInterface" Version="12.0.4" />
|
||||
<PackageReference Update="VsWebSite.Interop" Version="$(VSFrameworkVersion)" />
|
||||
<PackageReference Update="Microsoft.Net.Compilers.Toolset" Version="3.9.0" />
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
From 1a415d2019d74bcf009134326d1c25798589de64 Mon Sep 17 00:00:00 2001
|
||||
From: Chris Rummel <crummel@microsoft.com>
|
||||
Date: Tue, 19 Oct 2021 11:39:32 -0500
|
||||
Subject: [PATCH] Apply arcade-powered source-build patches (#55823)
|
||||
|
||||
Don't include desktop artifacts that don't exist in source-build.
|
||||
Source-build doesn't have these artifacts available, even when we eventually will
|
||||
build desktop TFMs, because Roslyn is one of the first builds in source-build.
|
||||
Instead Roslyn is picking up reference packages that don't have the `lib` directory
|
||||
which is causing a build failure. This disables the attempt to grab these desktop
|
||||
artifacts so source-build just skips them instead.
|
||||
|
||||
Backported to roslyn with https://github.com/dotnet/roslyn/pull/55823
|
||||
---
|
||||
.../DesktopCompilerArtifacts.targets | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/NuGet/Microsoft.Net.Compilers.Toolset/DesktopCompilerArtifacts.targets b/src/NuGet/Microsoft.Net.Compilers.Toolset/DesktopCompilerArtifacts.targets
|
||||
index c8b87ab6958..107ff051b51 100644
|
||||
--- a/src/NuGet/Microsoft.Net.Compilers.Toolset/DesktopCompilerArtifacts.targets
|
||||
+++ b/src/NuGet/Microsoft.Net.Compilers.Toolset/DesktopCompilerArtifacts.targets
|
||||
@@ -20,7 +20,7 @@
|
||||
VS training data to the assemblies they produce.
|
||||
-->
|
||||
|
||||
- <Target Name="InitializeDesktopCompilerArtifacts">
|
||||
+ <Target Name="InitializeDesktopCompilerArtifacts" Condition="'$(DotNetBuildFromSource)' != 'true'">
|
||||
<ItemGroup>
|
||||
|
||||
<!-- The Roslyn built binaries must be taken from these locations because this is the location where signing occurs -->
|
||||
--
|
||||
2.31.1
|
||||
|
||||
|
|
@ -0,0 +1,31 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Davis Goodin <dagood@microsoft.com>
|
||||
Date: Tue, 26 Oct 2021 13:24:57 -0500
|
||||
Subject: [PATCH] Disable package validation in source-build for reliability
|
||||
|
||||
See comment in diff.
|
||||
|
||||
Upstream PR: https://github.com/dotnet/runtime/pull/60881
|
||||
---
|
||||
eng/packaging.targets | 8 +++++++-
|
||||
1 file changed, 7 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/eng/packaging.targets b/eng/packaging.targets
|
||||
index ecf74672ac8..0a04191182d 100644
|
||||
--- a/eng/packaging.targets
|
||||
+++ b/eng/packaging.targets
|
||||
@@ -1,7 +1,13 @@
|
||||
<Project>
|
||||
|
||||
<PropertyGroup>
|
||||
- <EnablePackageValidation>true</EnablePackageValidation>
|
||||
+ <!--
|
||||
+ Package validation causes flaky errors during the build. Validation isn't useful during
|
||||
+ source-build (it is only a guardrail for devs), so disable it during source-build to avoid the
|
||||
+ impact on build reliability. https://github.com/dotnet/runtime/issues/60883 tracks fixing the
|
||||
+ flakiness and removing this condition.
|
||||
+ -->
|
||||
+ <EnablePackageValidation Condition="'$(DotNetBuildFromSource)' != 'true'">true</EnablePackageValidation>
|
||||
<!-- Don't restore prebuilt packages during sourcebuild. -->
|
||||
<DisablePackageBaselineValidation Condition="'$(DotNetBuildFromSource)' == 'true'">true</DisablePackageBaselineValidation>
|
||||
<PackageValidationBaselineVersion Condition="'$(PackageValidationBaselineVersion)' == ''">$(NetCoreAppLatestStablePackageBaselineVersion)</PackageValidationBaselineVersion>
|
||||
|
|
@ -0,0 +1,41 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: MichaelSimons <msimons@microsoft.com>
|
||||
Date: Tue, 23 Nov 2021 17:45:25 +0000
|
||||
Subject: [PATCH] Update nuspec project target frameworks for source-build
|
||||
|
||||
This patch removes prebuilts caused from targetting netcoreapp1.0
|
||||
|
||||
Backported with https://github.com/microsoft/vstest/pull/3188
|
||||
---
|
||||
src/package/nuspec/Microsoft.TestPlatform.Build.csproj | 3 ++-
|
||||
src/package/nuspec/Microsoft.TestPlatform.CLI.csproj | 3 ++-
|
||||
2 files changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/package/nuspec/Microsoft.TestPlatform.Build.csproj b/src/package/nuspec/Microsoft.TestPlatform.Build.csproj
|
||||
index 038fbf8..57cde8e 100644
|
||||
--- a/src/package/nuspec/Microsoft.TestPlatform.Build.csproj
|
||||
+++ b/src/package/nuspec/Microsoft.TestPlatform.Build.csproj
|
||||
@@ -1,7 +1,8 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<OutputType>Exe</OutputType>
|
||||
- <TargetFramework>netcoreapp1.0</TargetFramework>
|
||||
+ <TargetFramework Condition=" '$(DotNetBuildFromSource)' != 'true' ">netcoreapp1.0</TargetFramework>
|
||||
+ <TargetFramework Condition=" '$(DotNetBuildFromSource)' == 'true' ">net6.0</TargetFramework>
|
||||
<CheckEolTargetFramework>false</CheckEolTargetFramework>
|
||||
<NuspecFile>TestPlatform.Build.nuspec</NuspecFile>
|
||||
<NuspecProperties>version=$(Version)</NuspecProperties>
|
||||
diff --git a/src/package/nuspec/Microsoft.TestPlatform.CLI.csproj b/src/package/nuspec/Microsoft.TestPlatform.CLI.csproj
|
||||
index 29198ba..19386eb 100644
|
||||
--- a/src/package/nuspec/Microsoft.TestPlatform.CLI.csproj
|
||||
+++ b/src/package/nuspec/Microsoft.TestPlatform.CLI.csproj
|
||||
@@ -1,7 +1,8 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<OutputType>Exe</OutputType>
|
||||
- <TargetFramework>netcoreapp1.0</TargetFramework>
|
||||
+ <TargetFramework Condition=" '$(DotNetBuildFromSource)' != 'true' ">netcoreapp1.0</TargetFramework>
|
||||
+ <TargetFramework Condition=" '$(DotNetBuildFromSource)' == 'true' ">net6.0</TargetFramework>
|
||||
<CheckEolTargetFramework>false</CheckEolTargetFramework>
|
||||
<NuspecFile>TestPlatform.CLI.nuspec</NuspecFile>
|
||||
<NuspecProperties>version=$(Version)</NuspecProperties>
|
||||
|
|
@ -7,7 +7,6 @@ using System.Collections.Generic;
|
|||
using System.Diagnostics;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Net.Http;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using Microsoft.WindowsAzure.Storage;
|
||||
|
|
@ -217,4 +216,4 @@ namespace Microsoft.DotNet.Cli.Build
|
|||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -15,7 +15,8 @@
|
|||
<PackageReference Include="NuGet.Versioning" Version="$(NuGetVersioningPackageVersion)" />
|
||||
<PackageReference Include="NuGet.Packaging" Version="$(NuGetVersioningPackageVersion)" />
|
||||
<PackageReference Include="System.Reflection.Metadata" Version="1.4.2" />
|
||||
<PackageReference Include="WindowsAzure.Storage" Version="8.4.0" Condition="'$(DotNetBuildFromSource)' != 'true'" />
|
||||
<PackageReference Include="WindowsAzure.Storage" Version="9.3.3" Condition="'$(DotNetBuildFromSource)' != 'true'" />
|
||||
<PackageReference Include="System.Net.Http" Version="4.3.4" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
|
||||
|
|
|
|||
|
|
@ -1,84 +1,100 @@
|
|||
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ItemGroup>
|
||||
<BundledManifests Include="Microsoft.NET.Sdk.Android.Manifest-6.0.100" SdkFeatureBand="6.0.100" Version="$(XamarinAndroidWorkloadManifestVersion)" WorkloadManifestId="Microsoft.NET.Sdk.Android" />
|
||||
<BundledManifests Include="Microsoft.NET.Sdk.iOS.Manifest-6.0.100" SdkFeatureBand="6.0.100" Version="$(XamarinIOSWorkloadManifestVersion)" WorkloadManifestId="Microsoft.NET.Sdk.iOS" />
|
||||
<BundledManifests Include="Microsoft.NET.Sdk.MacCatalyst.Manifest-6.0.100" SdkFeatureBand="6.0.100" Version="$(XamarinMacCatalystWorkloadManifestVersion)" WorkloadManifestId="Microsoft.NET.Sdk.MacCatalyst" />
|
||||
<BundledManifests Include="Microsoft.NET.Sdk.macOS.Manifest-6.0.100" SdkFeatureBand="6.0.100" Version="$(XamarinMacOSWorkloadManifestVersion)" WorkloadManifestId="Microsoft.NET.Sdk.macOS" />
|
||||
<BundledManifests Include="Microsoft.NET.Sdk.Maui.Manifest-6.0.100" SdkFeatureBand="6.0.100" Version="$(MauiWorkloadManifestVersion)" WorkloadManifestId="Microsoft.NET.Sdk.Maui" />
|
||||
<BundledManifests Include="Microsoft.NET.Sdk.tvOS.Manifest-6.0.100" SdkFeatureBand="6.0.100" Version="$(XamarinTvOSWorkloadManifestVersion)" WorkloadManifestId="Microsoft.NET.Sdk.tvOS" />
|
||||
<BundledManifests Include="Microsoft.NET.Workload.Mono.ToolChain.Manifest-7.0.100" SdkFeatureBand="7.0.100" Version="$(MonoWorkloadManifestVersion)" WorkloadManifestId="Microsoft.NET.Workload.Mono.ToolChain" />
|
||||
<BundledManifests Include="Microsoft.NET.Workload.Emscripten.Manifest-7.0.100" SdkFeatureBand="7.0.100" Version="$(EmscriptenWorkloadManifestVersion)" WorkloadManifestId="Microsoft.NET.Workload.Emscripten" />
|
||||
<BundledManifests Include="Microsoft.NET.Sdk.Android" FeatureBand="6.0.100" Version="$(XamarinAndroidWorkloadManifestVersion)" />
|
||||
<BundledManifests Include="Microsoft.NET.Sdk.iOS" FeatureBand="6.0.100" Version="$(XamarinIOSWorkloadManifestVersion)" />
|
||||
<BundledManifests Include="Microsoft.NET.Sdk.MacCatalyst" FeatureBand="6.0.100" Version="$(XamarinMacCatalystWorkloadManifestVersion)" />
|
||||
<BundledManifests Include="Microsoft.NET.Sdk.macOS" FeatureBand="6.0.100" Version="$(XamarinMacOSWorkloadManifestVersion)" />
|
||||
<BundledManifests Include="Microsoft.NET.Sdk.Maui" FeatureBand="6.0.100" Version="$(MauiWorkloadManifestVersion)" />
|
||||
<BundledManifests Include="Microsoft.NET.Sdk.tvOS" FeatureBand="6.0.100" Version="$(XamarinTvOSWorkloadManifestVersion)" />
|
||||
<BundledManifests Include="Microsoft.NET.Workload.Mono.ToolChain" FeatureBand="7.0.100" Version="$(MonoWorkloadManifestVersion)" />
|
||||
<BundledManifests Include="Microsoft.NET.Workload.Emscripten" FeatureBand="7.0.100" Version="$(EmscriptenWorkloadManifestVersion)" />
|
||||
</ItemGroup>
|
||||
|
||||
<!-- Restore workload manifests via PackageReference -->
|
||||
<!-- Calculate NuGet package IDs for bundled manifests -->
|
||||
<PropertyGroup>
|
||||
<!-- TODO: Not exactly sure how this value should be calculated -->
|
||||
<!--<MsiArchitectureForWorkloadManifests>$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture.ToString().ToLowerInvariant)</MsiArchitectureForWorkloadManifests>-->
|
||||
<MsiArchitectureForWorkloadManifests>$(Architecture)</MsiArchitectureForWorkloadManifests>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<BundledManifestsForPackageDownload Include="@(BundledManifests)" >
|
||||
<Version>[%(Version)]</Version>
|
||||
</BundledManifestsForPackageDownload>
|
||||
|
||||
<PackageDownload Include="@(BundledManifestsForPackageDownload)" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<BundledManifests Update="@(BundledManifests)" >
|
||||
<RestoredNupkgContentPath>$(NuGetPackageRoot)$([MSBuild]::ValueOrDefault('%(Identity)', '').ToLower())/$([MSBuild]::ValueOrDefault('%(Version)', '').ToLower())</RestoredNupkgContentPath>
|
||||
<BundledManifests Update="@(BundledManifests)">
|
||||
<NupkgId>%(Identity).Manifest-%(FeatureBand)</NupkgId>
|
||||
<MsiNupkgId>%(Identity).Manifest-%(FeatureBand).Msi.$(MsiArchitectureForWorkloadManifests)</MsiNupkgId>
|
||||
<RestoredNupkgContentPath>$(NuGetPackageRoot)$([MSBuild]::ValueOrDefault('%(NupkgId)', '').ToLower())/$([MSBuild]::ValueOrDefault('%(Version)', '').ToLower())</RestoredNupkgContentPath>
|
||||
<RestoredMsiNupkgContentPath>$(NuGetPackageRoot)$([MSBuild]::ValueOrDefault('%(MsiNupkgId)', '').ToLower())/$([MSBuild]::ValueOrDefault('%(Version)', '').ToLower())</RestoredMsiNupkgContentPath>
|
||||
<RestoredMsiPathInNupkg>$([MSBuild]::NormalizePath('%(RestoredMsiNupkgContentPath)/data/%(NupkgId).%(Version)-$(MsiArchitectureForWorkloadManifests).msi'))</RestoredMsiPathInNupkg>
|
||||
</BundledManifests>
|
||||
</ItemGroup>
|
||||
|
||||
<Target Name="LayoutManifests"
|
||||
DependsOnTargets="LayoutManifestsForSDK;LayoutManifestsForMSI"/>
|
||||
|
||||
<Target Name="LayoutManifestsForSDK"
|
||||
DependsOnTargets="SetupBundledComponents;GenerateManifestVersions">
|
||||
|
||||
<Copy SourceFiles="@(ManifestContent)"
|
||||
DestinationFolder="$(RedistLayoutPath)sdk-manifests/%(DestinationPath)"/>
|
||||
<!-- Restore workload manifests via PackageDownload -->
|
||||
<ItemGroup>
|
||||
<PackageDownload Include="@(BundledManifests->'%(NupkgId)')" >
|
||||
<Version>[%(Version)]</Version>
|
||||
</PackageDownload>
|
||||
</ItemGroup>
|
||||
|
||||
</Target>
|
||||
<ItemGroup Condition=" '$(OS)' == 'Windows_NT' and '$(Architecture)' != 'arm' ">
|
||||
<PackageDownload Include="@(BundledManifests->'%(MsiNupkgId)')" >
|
||||
<Version>[%(Version)]</Version>
|
||||
</PackageDownload>
|
||||
|
||||
<Target Name="LayoutManifestsForMSI"
|
||||
DependsOnTargets="SetupBundledComponents;GenerateManifestVersions"
|
||||
Condition="$(ProductMonikerRid.StartsWith('win')) And '$(Architecture)' != 'arm'">
|
||||
<PackageReference Include="Microsoft.DotNet.SignCheck" Version="$(ArcadeSdkVersion)" />
|
||||
</ItemGroup>
|
||||
|
||||
<Target Name="ValidateBundledManifestSigning"
|
||||
Condition=" '$(OS)' == 'Windows_NT' and '$(Architecture)' != 'arm' ">
|
||||
|
||||
<Copy SourceFiles="@(ManifestContent)"
|
||||
DestinationFolder="$(BaseOutputPath)$(Configuration)\sdk-manifests\sdk-manifests/%(DestinationPath)"/>
|
||||
|
||||
</Target>
|
||||
|
||||
<Target Name="GenerateManifestVersions">
|
||||
|
||||
<PropertyGroup>
|
||||
<ManifestsMSIInstallerFile>$(ArtifactsNonShippingPackagesDir)dotnet-sdkmanifests-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension)</ManifestsMSIInstallerFile>
|
||||
<ManifestsDependencyKeyName>SDK_Manifests_$([MSBuild]::ValueOrDefault('$(Version)', '').Replace('-', '_'))</ManifestsDependencyKeyName>
|
||||
<ManifestsBrandName>Microsoft .NET SDK Workload Manifests $(Version)</ManifestsBrandName>
|
||||
<ManifestsLayoutPath>$(BaseOutputPath)$(Configuration)\sdk-manifests</ManifestsLayoutPath>
|
||||
</PropertyGroup>
|
||||
<SignCheckExe>$(PkgMicrosoft_DotNet_SignCheck)\tools\Microsoft.DotNet.SignCheck.exe</SignCheckExe>
|
||||
<SignCheckLog Condition="'$(SignCheckLog)' == ''">$(ArtifactsLogDir)\workloadmanifestsigncheck.log</SignCheckLog>
|
||||
<SignCheckErrorLog Condition="'$(SignCheckErrorLog)' == ''">$(ArtifactsLogDir)\workloadmanifestsigncheck.errors.log</SignCheckErrorLog>
|
||||
</PropertyGroup>
|
||||
|
||||
<GenerateMsiVersion BuildNumber="$(CombinedBuildNumberAndRevision)"
|
||||
Major="$(VersionMajor)"
|
||||
Minor="$(VersionMinor)"
|
||||
Patch="$(VersionFeature)">
|
||||
<Output TaskParameter="MsiVersion" PropertyName="ManifestMsiVersion" />
|
||||
</GenerateMsiVersion>
|
||||
|
||||
<GenerateGuidFromName Name="$(ManifestsMSIInstallerFile)">
|
||||
<Output TaskParameter="GeneratedGuid"
|
||||
PropertyName="ManifestsInstallerUpgradeCode" />
|
||||
</GenerateGuidFromName>
|
||||
<ItemGroup>
|
||||
<!-- Don't try to validate signing for workload manifests that will be signed as part of post-build signing -->
|
||||
<BundledManifestsToValidateSigning Include="@(BundledManifests)"
|
||||
Exclude="Microsoft.NET.Workload.Mono.ToolChain;
|
||||
Microsoft.NET.Workload.Emscripten" />
|
||||
|
||||
<SignCheckWorkloadManifestMsiInputFiles Include="@(BundledManifestsToValidateSigning->'%(RestoredMsiPathInNupkg)')" />
|
||||
</ItemGroup>
|
||||
|
||||
<Exec Command="$(SignCheckExe) ^
|
||||
--recursive ^
|
||||
-f UnsignedFiles ^
|
||||
-i @(SignCheckWorkloadManifestMsiInputFiles, ' ') ^
|
||||
-l $(SignCheckLog) ^
|
||||
-e $(SignCheckErrorLog)" />
|
||||
|
||||
<Error
|
||||
Text="Signing validation failed for workload manifest MSI. Check $(SignCheckErrorLog) for more information."
|
||||
Condition="Exists($(SignCheckErrorLog)) and '$([System.IO.File]::ReadAllText($(SignCheckErrorLog)))' != ''" />
|
||||
|
||||
<Message
|
||||
Text="##vso[artifact.upload containerfolder=LogFiles;artifactname=LogFiles]{SignCheckErrorLog}"
|
||||
Condition="Exists($(SignCheckErrorLog)) and '$([System.IO.File]::ReadAllText($(SignCheckErrorLog)))' != ''" />
|
||||
|
||||
</Target>
|
||||
|
||||
<Target Name="LayoutManifests"
|
||||
DependsOnTargets="SetupBundledComponents">
|
||||
|
||||
<ItemGroup>
|
||||
<ManifestContent Include="%(BundledManifests.RestoredNupkgContentPath)\data\*"
|
||||
Condition="Exists('%(RestoredNupkgContentPath)\data')"
|
||||
DestinationPath="%(BundledManifests.SdkFeatureBand)/$([MSBuild]::ValueOrDefault('%(WorkloadManifestId)', '').ToLower())"
|
||||
DestinationPath="$([MSBuild]::ValueOrDefault('%(Identity)', '').ToLower())"
|
||||
RestoredNupkgContentPath="%(RestoredNupkgContentPath)"
|
||||
WorkloadManifestId="%(WorkloadManifestId)"/>
|
||||
|
||||
WorkloadManifestId="%(Identity)"/>
|
||||
|
||||
<ManifestContent Include="%(BundledManifests.RestoredNupkgContentPath)\data\localize\*"
|
||||
Condition="Exists('%(RestoredNupkgContentPath)\data\localize')"
|
||||
DestinationPath="%(BundledManifests.SdkFeatureBand)/$([MSBuild]::ValueOrDefault('%(WorkloadManifestId)', '').ToLower())/localize"/>
|
||||
DestinationPath="$([MSBuild]::ValueOrDefault('%(Identity)', '').ToLower())/localize"/>
|
||||
</ItemGroup>
|
||||
|
||||
<Error Text="No workload manifest content found." Condition="'@(ManifestContent->Count())' == '0'" />
|
||||
|
||||
<Copy SourceFiles="@(ManifestContent)"
|
||||
DestinationFolder="$(RedistLayoutPath)sdk-manifests/$(CliProductBandVersion)00/%(DestinationPath)"/>
|
||||
|
||||
</Target>
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -26,8 +26,8 @@
|
|||
|
||||
<PropertyGroup>
|
||||
<VersionFeature21>30</VersionFeature21>
|
||||
<VersionFeature31>21</VersionFeature31>
|
||||
<VersionFeature50>12</VersionFeature50>
|
||||
<VersionFeature31>22</VersionFeature31>
|
||||
<VersionFeature50>13</VersionFeature50>
|
||||
<VersionFeature60>0</VersionFeature60>
|
||||
</PropertyGroup>
|
||||
|
||||
|
|
@ -199,8 +199,8 @@
|
|||
|
||||
<WindowsDesktop30RuntimePackRids Include="win-x64;win-x86" />
|
||||
<WindowsDesktop31RuntimePackRids Include="@(WindowsDesktop30RuntimePackRids)" />
|
||||
<WindowsDesktop50RuntimePackRids Include="@(WindowsDesktop31RuntimePackRids)" />
|
||||
<WindowsDesktopRuntimePackRids Include="@(WindowsDesktop50RuntimePackRids);win-arm64" />
|
||||
<WindowsDesktop50RuntimePackRids Include="@(WindowsDesktop31RuntimePackRids);win-arm64" />
|
||||
<WindowsDesktopRuntimePackRids Include="@(WindowsDesktop50RuntimePackRids)" />
|
||||
</ItemGroup>
|
||||
|
||||
<!--
|
||||
|
|
@ -378,6 +378,7 @@ Copyright (c) .NET Foundation. All rights reserved.
|
|||
TargetingPackVersion="$(MicrosoftAspNetCoreAppRefPackageVersion)"
|
||||
RuntimePackNamePatterns="Microsoft.AspNetCore.App.Runtime.**RID**"
|
||||
RuntimePackRuntimeIdentifiers="@(AspNetCoreRuntimePackRids, '%3B')"
|
||||
RuntimePackExcludedRuntimeIdentifiers="android"
|
||||
/>
|
||||
|
||||
<KnownFrameworkReference Include="Microsoft.Windows.SDK.NET.Ref"
|
||||
|
|
|
|||
|
|
@ -463,9 +463,13 @@
|
|||
</Target>
|
||||
|
||||
<Target Name="CopyIncludedWorkloadManifestFile" >
|
||||
|
||||
<ItemGroup>
|
||||
<WorkloadManifestFilesContent Include="$([MSBuild]::ValueOrDefault('%(BundledManifests.WorkloadManifestId)', '').ToLower())" />
|
||||
<WorkloadManifestFilesContent Include="$([MSBuild]::ValueOrDefault('%(BundledManifests.Identity)', '').ToLower())" />
|
||||
</ItemGroup>
|
||||
|
||||
<Error Text="No workload manifest content found." Condition="'@(WorkloadManifestFilesContent->Count())' == '0'" />
|
||||
|
||||
<WriteLinesToFile File="$(SdkOutputDirectory)IncludedWorkloadManifests.txt"
|
||||
Lines="@(WorkloadManifestFilesContent)"
|
||||
Overwrite="true" />
|
||||
|
|
|
|||
|
|
@ -38,9 +38,6 @@
|
|||
<SdkPlaceholderInstallerNupkgFile>$(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.SdkPlaceholder.$(Architecture).$(FullNugetVersion).nupkg</SdkPlaceholderInstallerNupkgFile>
|
||||
<VSToolsNuspecFile>$(MSBuildThisFileDirectory)packaging/windows/clisdk/VS.Tools.Net.Core.SDK.nuspec</VSToolsNuspecFile>
|
||||
<VSToolsNupkgFile>$(ArtifactsNonShippingPackagesDir)VS.Tools.Net.Core.SDK.$(Architecture).$(FullNugetVersion).nupkg</VSToolsNupkgFile>
|
||||
|
||||
<ManifestInstallerNuspecFile>$(MSBuildThisFileDirectory)packaging/windows/clisdk/VS.Redist.Common.NetCore.Manifest.nuspec</ManifestInstallerNuspecFile>
|
||||
<ManifestInstallerNupkgFile>$(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Manifest.$(Architecture).$(FullNugetVersion).nupkg</ManifestInstallerNupkgFile>
|
||||
|
||||
<SdkResolverLayoutPath>$(ArtifactsDir)bin/SdkResolver/$(Configuration)</SdkResolverLayoutPath>
|
||||
<VSToolsResolverNuspecFile>$(MSBuildThisFileDirectory)packaging/windows/clisdk/VS.Tools.Net.Core.SDK.Resolver.nuspec</VSToolsResolverNuspecFile>
|
||||
|
|
@ -283,49 +280,36 @@
|
|||
</ItemGroup>
|
||||
</Target>
|
||||
|
||||
<Target Name="GenerateManifestsMsi"
|
||||
DependsOnTargets="GenerateLayout;AcquireWix;MsiTargetsSetupInputOutputs;SetSdkBrandingInfo"
|
||||
Condition="$(ProductMonikerRid.StartsWith('win')) And '$(Architecture)' != 'arm'"
|
||||
Inputs="@(BundledManifests);$(ManifestsGenerateMsiPowershellScript)"
|
||||
Outputs="$(ManifestsMSIInstallerFile)">
|
||||
|
||||
<Target Name="GenerateWorkloadManifestsWxs"
|
||||
DependsOnTargets="ValidateBundledManifestSigning">
|
||||
<PropertyGroup>
|
||||
<ManifestsGenerateMsiPowershellScript>$(MSBuildThisFileDirectory)packaging/windows/clisdk/generatemanifestsmsi.ps1</ManifestsGenerateMsiPowershellScript>
|
||||
<WorkloadManifestsWxsPath>$(IntermediateOutputPath)WorkloadManifests.wxs</WorkloadManifestsWxsPath>
|
||||
<WorkloadManifestsWxsContent>
|
||||
<![CDATA[
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
|
||||
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
|
||||
<Fragment>
|
||||
<PackageGroup Id="PG_WorkloadManifests">
|
||||
@(BundledManifests->'<MsiPackage SourceFile="%(RestoredMsiPathInNupkg)">
|
||||
<MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
|
||||
</MsiPackage>', '
|
||||
')
|
||||
</PackageGroup>
|
||||
</Fragment>
|
||||
</Wix>
|
||||
]]>
|
||||
</WorkloadManifestsWxsContent>
|
||||
</PropertyGroup>
|
||||
|
||||
<Exec Command="powershell -NoProfile -NoLogo $(ManifestsGenerateMsiPowershellScript) ^
|
||||
'$(ManifestsLayoutPath)' ^
|
||||
'$(ManifestsMSIInstallerFile)' ^
|
||||
'$(WixRoot)' ^
|
||||
'$(ManifestsBrandName)' ^
|
||||
'$(ManifestMsiVersion)' ^
|
||||
'$(ManifestMsiVersion)' ^
|
||||
'$(FullNugetVersion)' ^
|
||||
'$(ManifestsInstallerUpgradeCode)' ^
|
||||
'$(ManifestsDependencyKeyName)' ^
|
||||
'$(Architecture)' ^
|
||||
-InformationAction Continue" />
|
||||
<ItemGroup>
|
||||
<ManifestsMsiWixSrcFiles Include="$(WixRoot)\provider.wixobj" />
|
||||
<ManifestsMsiWixSrcFiles Include="$(WixRoot)\Manifests.wixobj" />
|
||||
<ManifestsMsiWixSrcFiles Include="$(WixRoot)\dotnethome_x64.wixobj" />
|
||||
<ManifestsMsiWixSrcFiles Include="$(WixRoot)\Manifest-install-files.wixobj" />
|
||||
</ItemGroup>
|
||||
|
||||
<CreateLightCommandPackageDrop
|
||||
LightCommandWorkingDir="$(LightCommandObjDir)"
|
||||
OutputFolder="$(LightCommandPackagesDir)"
|
||||
NoLogo="true"
|
||||
Cultures="en-us"
|
||||
InstallerFile="$(ArtifactsNonShippingPackagesDir)$(ManifestsMSIInstallerFile)"
|
||||
WixExtensions="WixUIExtension;WixDependencyExtension;WixUtilExtension"
|
||||
WixSrcFiles="@(ManifestsMsiWixSrcFiles)">
|
||||
<Output TaskParameter="OutputFile" PropertyName="_LightCommandPackageNameOutput" />
|
||||
</CreateLightCommandPackageDrop>
|
||||
<WriteLinesToFile File="$(WorkloadManifestsWxsPath)"
|
||||
Lines="$(WorkloadManifestsWxsContent)"
|
||||
WriteOnlyWhenDifferent="true"
|
||||
Overwrite="true" />
|
||||
</Target>
|
||||
|
||||
<Target Name="GenerateSdkBundle"
|
||||
DependsOnTargets="GenerateLayout;AcquireWix;MsiTargetsSetupInputOutputs;GenerateSdkMsi;SignSdkMsi;GenerateTemplatesMsis;GenerateManifestsMsi;SignTemplatesMsis"
|
||||
DependsOnTargets="GenerateLayout;AcquireWix;MsiTargetsSetupInputOutputs;GenerateSdkMsi;SignSdkMsi;GenerateTemplatesMsis;GenerateWorkloadManifestsWxs;SignTemplatesMsis"
|
||||
Condition=" '$(OS)' == 'Windows_NT' "
|
||||
Inputs="$(SdkMSIInstallerFile);
|
||||
$(DownloadedSharedFrameworkInstallerFile);
|
||||
|
|
@ -347,6 +331,7 @@
|
|||
</PropertyGroup>
|
||||
|
||||
<Exec Command="powershell -NoProfile -NoLogo $(SdkGenerateBundlePowershellScript) ^
|
||||
-WorkloadManifestWxsFile '$(WorkloadManifestsWxsPath)' ^
|
||||
-CLISDKMSIFile '$(SdkMSIInstallerFile)' ^
|
||||
-ASPNETRuntimeWixLibFile '$(DownloadsFolder)$(DownloadedAspNetCoreSharedFxWixLibFileName)' ^
|
||||
-SharedFxMSIFile '$(DownloadsFolder)$(DownloadedSharedFrameworkInstallerFileName)' ^
|
||||
|
|
@ -363,7 +348,6 @@
|
|||
-WindowsDesktopTargetingPackMSIFile '$(DownloadsFolder)$(DownloadedWindowsDesktopTargetingPackInstallerFileName)' ^
|
||||
-FinalizerExe '$(FinalizerExe)' ^
|
||||
-TemplatesMSIFile '$(LatestTemplateMsiInstallerFile)' ^
|
||||
-ManifestsMSIFile '$(ManifestsMsiInstallerFile)' ^
|
||||
-DotnetBundleOutput '$(CombinedFrameworkSdkHostMSIInstallerFile)' ^
|
||||
-WixRoot '$(WixRoot)' ^
|
||||
-ProductMoniker '$(SdkBrandName)' ^
|
||||
|
|
@ -380,6 +364,7 @@
|
|||
-InformationAction Continue " />
|
||||
<ItemGroup>
|
||||
<BundleMsiWixSrcFiles Include="$(WixRoot)\bundle.wixobj" />
|
||||
<BundleMsiWixSrcFiles Include="$(WixRoot)\WorkloadManifests.wixobj" />
|
||||
<BundleMsiWixSrcFiles Include="$(DownloadsFolder)$(DownloadedAspNetCoreSharedFxWixLibFileName)" />
|
||||
</ItemGroup>
|
||||
<CreateLightCommandPackageDrop
|
||||
|
|
@ -463,24 +448,6 @@
|
|||
|
||||
</Target>
|
||||
|
||||
<Target Name="GenerateManifestNupkg"
|
||||
DependsOnTargets="GenerateLayout;GenerateManifestsMsi"
|
||||
Condition=" '$(OS)' == 'Windows_NT' "
|
||||
Inputs="$(ManifestsMSIInstallerFile);
|
||||
$(ManifestInstallerNuspecFile);
|
||||
$(GenerateNupkgPowershellScript)"
|
||||
Outputs="$(ManifestInstallerNupkgFile)">
|
||||
|
||||
<Exec Command="powershell -NoProfile -NoLogo $(GenerateNupkgPowershellScript) ^
|
||||
'$(ArtifactsDir)' ^
|
||||
'$(ManifestsMSIInstallerFile)' ^
|
||||
'$(FullNugetVersion)' ^
|
||||
'$(ManifestInstallerNuspecFile)' ^
|
||||
'$(ManifestInstallerNupkgFile)' ^
|
||||
'$(Architecture)' ^
|
||||
'$(MajorMinorVersion)'" />
|
||||
</Target>
|
||||
|
||||
<Target Name="GenerateVSToolsNupkg"
|
||||
DependsOnTargets="GenerateLayout;MsiTargetsSetupInputOutputs"
|
||||
Condition=" '$(OS)' == 'Windows_NT' and '$(Architecture)' == 'x86' "
|
||||
|
|
@ -558,14 +525,12 @@
|
|||
GenerateSdkMsi;
|
||||
SignSdkMsi;
|
||||
GenerateTemplatesMsis;
|
||||
GenerateManifestsMsi;
|
||||
SignTemplatesMsis;
|
||||
GenerateSdkBundle;
|
||||
SignSdkBundle;
|
||||
GenerateSdkPlaceholderMsi;
|
||||
SignSdkPlaceholderMsi;
|
||||
GenerateToolsetNupkg;
|
||||
GenerateManifestNupkg;
|
||||
GenerateTemplatesNupkgs;
|
||||
GenerateSdkPlaceholderNupkg;
|
||||
GenerateVSToolsNupkg;
|
||||
|
|
|
|||
|
|
@ -29,6 +29,8 @@
|
|||
'$(Rid)' == 'linux-musl-x64' ">$(Rid)</ProductMonikerRid>
|
||||
<ProductMonikerRid Condition=" '$(ProductMonikerRid)' == '' ">$(OSName)-$(Architecture)</ProductMonikerRid>
|
||||
|
||||
<PortableProductMonikerRid Condition=" '$(PortableProductMonikerRid)' == '' ">$(HostOSName)-$(Architecture)</PortableProductMonikerRid>
|
||||
|
||||
<ArtifactNameSdk>dotnet-sdk-internal$(PgoTerm)</ArtifactNameSdk>
|
||||
<ArtifactNameCombinedHostHostFxrFrameworkSdk>dotnet-sdk$(PgoTerm)</ArtifactNameCombinedHostHostFxrFrameworkSdk>
|
||||
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@
|
|||
資源
|
||||
• 如需 .NET 文件，請前往 https://aka.ms/dotnet-docs
|
||||
• 如需 SDK 文件，請前往 https://aka.ms/dotnet-sdk-docs
|
||||
• 如需版本資訊，請前往 https://aka.ms/dotnet5-release-notes
|
||||
• 如需版本資訊，請前往 https://aka.ms/dotnet6-release-notes
|
||||
• 如需教學課程，請前往 https://aka.ms/dotnet-tutorials</String>
|
||||
<String Id="WelcomeHeaderMessage">.NET SDK</String>
|
||||
<String Id="WelcomeDescription">
|
||||
|
|
@ -76,7 +76,10 @@
|
|||
<String Id="InstallationNoteTitle">安裝附註</String>
|
||||
<String Id="InstallationNote">安裝程序期間將會執行命令，加快專案還原速度並啟用離線存取。最多需要一分鐘的時間完成。
|
||||
</String>
|
||||
<String Id="VisualStudioWarning">若預計要搭配 Visual Studio 使用 .NET 5.0，需要 Visual Studio 2022 17.0 或更新版本。<A HREF="https://aka.ms/dotnet5-release-notes">深入了解</A>.
|
||||
<String Id="VisualStudioWarning">若預計要搭配 Visual Studio 使用 .NET 6.0，需要 Visual Studio 2022 17.0 或更新版本。<A HREF="https://aka.ms/dotnet6-release-notes">深入了解</A>.
|
||||
</String>
|
||||
<String Id="LicenseAssent">按一下 [\[]安裝[\[] 即表示您同意下列條款。</String>
|
||||
<String Id="InstallPathx64x86">The installation path for x64 SDK installations: "[DOTNETHOME_X64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]"</String>
|
||||
<String Id="InstallPathARM64x86">The installation path for ARM64 SDK installations: "[DOTNETHOME_ARM64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]"</String>
|
||||
<String Id="InstallPathARM64x64">The installation path for ARM64 SDK installations: "[DOTNETHOME_ARM64]" cannot be the same as for x64 SDK installations: "[DOTNETHOME_X64]"</String>
|
||||
</WixLocalization>
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ Tento produkt shromažďuje data o využití.
|
|||
Zdroje informací
|
||||
• Dokumentace k .NET : https://aka.ms/dotnet-docs
|
||||
• Dokumentace k sadě SDK: https://aka.ms/dotnet-sdk-docs
|
||||
• Zpráva k vydání verze: https://aka.ms/dotnet5-release-notes
|
||||
• Zpráva k vydání verze: https://aka.ms/dotnet6-release-notes
|
||||
• Kurzy: https://aka.ms/dotnet-tutorials</String>
|
||||
<String Id="WelcomeHeaderMessage">Sada .NET SDK</String>
|
||||
<String Id="WelcomeDescription">
|
||||
|
|
@ -76,7 +76,10 @@ Zdroje informací
|
|||
<String Id="InstallationNoteTitle">Poznámka k instalaci</String>
|
||||
<String Id="InstallationNote">Během procesu instalace se spustí příkaz, který zlepší rychlost obnovení projektu a povolí offline přístup. Akce se dokončí přibližně za minutu.
|
||||
</String>
|
||||
<String Id="VisualStudioWarning">Pokud se chystáte používat .NET 5.0 se sadou Visual Studio, potřebujete Visual Studio 2022 17.0 nebo novější. <A HREF="https://aka.ms/dotnet5-release-notes">Další informace</A>.
|
||||
<String Id="VisualStudioWarning">Pokud se chystáte používat .NET 6.0 se sadou Visual Studio, potřebujete Visual Studio 2022 17.0 nebo novější. <A HREF="https://aka.ms/dotnet6-release-notes">Další informace</A>.
|
||||
</String>
|
||||
<String Id="LicenseAssent">Kliknutím na Nainstalovat vyjadřujete souhlas s následujícími podmínkami.</String>
|
||||
<String Id="InstallPathx64x86">The installation path for x64 SDK installations: "[DOTNETHOME_X64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]"</String>
|
||||
<String Id="InstallPathARM64x86">The installation path for ARM64 SDK installations: "[DOTNETHOME_ARM64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]"</String>
|
||||
<String Id="InstallPathARM64x64">The installation path for ARM64 SDK installations: "[DOTNETHOME_ARM64]" cannot be the same as for x64 SDK installations: "[DOTNETHOME_X64]"</String>
|
||||
</WixLocalization>
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ Dieses Produkt erfasst Nutzungsdaten.
|
|||
Ressourcen
|
||||
• .NET-Dokumentation: https://aka.ms/dotnet-docs
|
||||
• SDK-Dokumentation: https://aka.ms/dotnet-sdk-docs
|
||||
• Versionshinweise: https://aka.ms/dotnet5-release-notes
|
||||
• Versionshinweise: https://aka.ms/dotnet6-release-notes
|
||||
• Tutorials: https://aka.ms/dotnet-tutorials</String>
|
||||
<String Id="WelcomeHeaderMessage">.NET SDK</String>
|
||||
<String Id="WelcomeDescription">
|
||||
|
|
@ -76,7 +76,10 @@ Ressourcen
|
|||
<String Id="InstallationNoteTitle">Installationshinweis</String>
|
||||
<String Id="InstallationNote">Während des Installationsvorgangs wird ein Befehl ausgeführt, durch den die Geschwindigkeit der Projektwiederherstellung verbessert und der Offlinezugriff aktiviert wird. Der Vorgang dauert bis zu einer Minute.
|
||||
</String>
|
||||
<String Id="VisualStudioWarning">Wenn Sie .NET 5.0 mit Visual Studio verwenden möchten, ist Visual Studio 2022 17.0 oder höher erforderlich. <A HREF="https://aka.ms/dotnet5-release-notes">Weitere Informationen</A>
|
||||
<String Id="VisualStudioWarning">Wenn Sie .NET 6.0 mit Visual Studio verwenden möchten, ist Visual Studio 2022 17.0 oder höher erforderlich. <A HREF="https://aka.ms/dotnet6-release-notes">Weitere Informationen</A>
|
||||
</String>
|
||||
<String Id="LicenseAssent">Durch Klicken auf "Installieren" stimmen Sie den nachstehenden Bedingungen zu.</String>
|
||||
<String Id="InstallPathx64x86">The installation path for x64 SDK installations: "[DOTNETHOME_X64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]"</String>
|
||||
<String Id="InstallPathARM64x86">The installation path for ARM64 SDK installations: "[DOTNETHOME_ARM64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]"</String>
|
||||
<String Id="InstallPathARM64x64">The installation path for ARM64 SDK installations: "[DOTNETHOME_ARM64]" cannot be the same as for x64 SDK installations: "[DOTNETHOME_X64]"</String>
|
||||
</WixLocalization>
|
||||
|
|
|
|||
|
|
@ -79,4 +79,7 @@ Resources
|
|||
<String Id="VisualStudioWarning">If you plan to use .NET 6.0 with Visual Studio, Visual Studio 2022 17.0 or newer is required. <A HREF="https://aka.ms/dotnet6-release-notes">Learn more</A>.
|
||||
</String>
|
||||
<String Id="LicenseAssent">By clicking Install, you agree to the following terms:</String>
|
||||
<String Id="InstallPathx64x86">The installation path for x64 SDK installations: "[DOTNETHOME_X64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]"</String>
|
||||
<String Id="InstallPathARM64x86">The installation path for ARM64 SDK installations: "[DOTNETHOME_ARM64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]"</String>
|
||||
<String Id="InstallPathARM64x64">The installation path for ARM64 SDK installations: "[DOTNETHOME_ARM64]" cannot be the same as for x64 SDK installations: "[DOTNETHOME_X64]"</String>
|
||||
</WixLocalization>
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ Ce produit collecte des données d'utilisation
|
|||
Ressources
|
||||
• Documentation .NET sur https://aka.ms/dotnet-docs
|
||||
• Documentation de kit SDK sur https://aka.ms/dotnet-sdk-docs
|
||||
• Notes de publication sur https://aka.ms/dotnet5-release-notes
|
||||
• Notes de publication sur https://aka.ms/dotnet6-release-notes
|
||||
• Tutoriels sur https://aka.ms/dotnet-tutorials</String>
|
||||
<String Id="WelcomeHeaderMessage">SDK .NET</String>
|
||||
<String Id="WelcomeDescription">
|
||||
|
|
@ -76,7 +76,10 @@ Ressources
|
|||
<String Id="InstallationNoteTitle">Note d'installation</String>
|
||||
<String Id="InstallationNote">Une commande va être exécutée pendant le processus d'installation, ce qui va améliorer la vitesse de restauration du projet et permettre l'accès hors connexion. L'opération va prendre environ une minute.
|
||||
</String>
|
||||
<String Id="VisualStudioWarning">Si vous comptez utiliser .NET 5.0 avec Visual Studio, Visual Studio 2022 17.0 ou une version ultérieure est nécessaire. <A HREF="https://aka.ms/dotnet5-release-notes">En savoir plus</A>.
|
||||
<String Id="VisualStudioWarning">Si vous comptez utiliser .NET 6.0 avec Visual Studio, Visual Studio 2022 17.0 ou une version ultérieure est nécessaire. <A HREF="https://aka.ms/dotnet6-release-notes">En savoir plus</A>.
|
||||
</String>
|
||||
<String Id="LicenseAssent">En cliquant sur Installer, vous acceptez les conditions suivantes.</String>
|
||||
<String Id="InstallPathx64x86">The installation path for x64 SDK installations: "[DOTNETHOME_X64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]"</String>
|
||||
<String Id="InstallPathARM64x86">The installation path for ARM64 SDK installations: "[DOTNETHOME_ARM64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]"</String>
|
||||
<String Id="InstallPathARM64x64">The installation path for ARM64 SDK installations: "[DOTNETHOME_ARM64]" cannot be the same as for x64 SDK installations: "[DOTNETHOME_X64]"</String>
|
||||
</WixLocalization>
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ Questo prodotto consente di raccogliere i dati sull'utilizzo
|
|||
Risorse
|
||||
• Documentazione di .NET https://aka.ms/dotnet-docs
|
||||
• Documentazione dell'SDK https://aka.ms/dotnet-sdk-docs
|
||||
• Note sulla versione https://aka.ms/dotnet5-release-notes
|
||||
• Note sulla versione https://aka.ms/dotnet6-release-notes
|
||||
• Esercitazioni https://aka.ms/dotnet-tutorials</String>
|
||||
<String Id="WelcomeHeaderMessage">.NET SDK</String>
|
||||
<String Id="WelcomeDescription">
|
||||
|
|
@ -79,4 +79,7 @@ Risorse
|
|||
<String Id="VisualStudioWarning">Se si intende usare .NET 6.0 con Visual Studio, è richiesto Visual Studio 2022 17.0 o versione successiva. <A HREF="https://aka.ms/dotnet6-release-notes">Altre informazioni</A>.
|
||||
</String>
|
||||
<String Id="LicenseAssent">Facendo clic su Installa, si accettano le condizioni seguenti.</String>
|
||||
<String Id="InstallPathx64x86">The installation path for x64 SDK installations: "[DOTNETHOME_X64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]"</String>
|
||||
<String Id="InstallPathARM64x86">The installation path for ARM64 SDK installations: "[DOTNETHOME_ARM64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]"</String>
|
||||
<String Id="InstallPathARM64x64">The installation path for ARM64 SDK installations: "[DOTNETHOME_ARM64]" cannot be the same as for x64 SDK installations: "[DOTNETHOME_X64]"</String>
|
||||
</WixLocalization>
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@
|
|||
リソース
|
||||
• .NET ドキュメント https://aka.ms/dotnet-docs
|
||||
• SDK ドキュメント https://aka.ms/dotnet-sdk-docs
|
||||
• リリース ノート https://aka.ms/dotnet5-release-notes
|
||||
• リリース ノート https://aka.ms/dotnet6-release-notes
|
||||
• チュートリアル https://aka.ms/dotnet-tutorials</String>
|
||||
<String Id="WelcomeHeaderMessage">.NET SDK</String>
|
||||
<String Id="WelcomeDescription">
|
||||
|
|
@ -76,7 +76,10 @@
|
|||
<String Id="InstallationNoteTitle">インストール メモ</String>
|
||||
<String Id="InstallationNote">コマンドはインストール処理中に実行されるので、プロジェクトの復元速度が向上し、オフラインでアクセスできます。完了するまでに最大 1 分かかります。
|
||||
</String>
|
||||
<String Id="VisualStudioWarning">.NET 5.0 を Visual Studio で使用する場合は、Visual Studio 2022 17.0 以降が必要です。<A HREF="https://aka.ms/dotnet5-release-notes">詳細情報</A>。
|
||||
<String Id="VisualStudioWarning">.NET 6.0 を Visual Studio で使用する場合は、Visual Studio 2022 17.0 以降が必要です。<A HREF="https://aka.ms/dotnet6-release-notes">詳細情報</A>。
|
||||
</String>
|
||||
<String Id="LicenseAssent">[インストール] をクリックすると、次の条項に同意したものと見なされます。</String>
|
||||
<String Id="InstallPathx64x86">The installation path for x64 SDK installations: "[DOTNETHOME_X64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]"</String>
|
||||
<String Id="InstallPathARM64x86">The installation path for ARM64 SDK installations: "[DOTNETHOME_ARM64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]"</String>
|
||||
<String Id="InstallPathARM64x64">The installation path for ARM64 SDK installations: "[DOTNETHOME_ARM64]" cannot be the same as for x64 SDK installations: "[DOTNETHOME_X64]"</String>
|
||||
</WixLocalization>
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@
|
|||
리소스
|
||||
• .NET 설명서 https://aka.ms/dotnet-docs
|
||||
• SDK 설명서 https://aka.ms/dotnet-sdk-docs
|
||||
• 릴리스 정보 https://aka.ms/dotnet5-release-notes
|
||||
• 릴리스 정보 https://aka.ms/dotnet6-release-notes
|
||||
• 자습서 https://aka.ms/dotnet-tutorials</String>
|
||||
<String Id="WelcomeHeaderMessage">.NET SDK</String>
|
||||
<String Id="WelcomeDescription">
|
||||
|
|
@ -79,4 +79,7 @@
|
|||
<String Id="VisualStudioWarning">Visual Studio와 함께 .NET 6.0을 사용하려면 Visual Studio 2022 17.0 이상이 필요합니다. <A HREF="https://aka.ms/dotnet6-release-notes">자세한 정보</A>.
|
||||
</String>
|
||||
<String Id="LicenseAssent">[설치]를 클릭하면 다음 사용 약관에 동의하는 것입니다.</String>
|
||||
<String Id="InstallPathx64x86">The installation path for x64 SDK installations: "[DOTNETHOME_X64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]"</String>
|
||||
<String Id="InstallPathARM64x86">The installation path for ARM64 SDK installations: "[DOTNETHOME_ARM64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]"</String>
|
||||
<String Id="InstallPathARM64x64">The installation path for ARM64 SDK installations: "[DOTNETHOME_ARM64]" cannot be the same as for x64 SDK installations: "[DOTNETHOME_X64]"</String>
|
||||
</WixLocalization>
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ Ten produkt gromadzi dane dotyczące użycia
|
|||
Zasoby
|
||||
• Dokumentacja platformy .NET: https://aka.ms/dotnet-docs
|
||||
• Dokumentacja zestawu SDK: https://aka.ms/dotnet-sdk-docs
|
||||
• Informacje o wersji: https://aka.ms/dotnet5-release-notes
|
||||
• Informacje o wersji: https://aka.ms/dotnet6-release-notes
|
||||
• Samouczki: https://aka.ms/dotnet-tutorials</String>
|
||||
<String Id="WelcomeHeaderMessage">.NET SDK</String>
|
||||
<String Id="WelcomeDescription">
|
||||
|
|
@ -79,4 +79,7 @@ Zasoby
|
|||
<String Id="VisualStudioWarning">Jeśli planujesz używać platformy .NET 6.0 z programem Visual Studio, wymagany jest program Visual Studio 2022 17.0 lub nowszy. <A HREF="https://aka.ms/dotnet6-release-notes">Dowiedz się więcej</A>.
|
||||
</String>
|
||||
<String Id="LicenseAssent">Klikając pozycję Zainstaluj, wyrażasz zgodę na następujące warunki.</String>
|
||||
<String Id="InstallPathx64x86">The installation path for x64 SDK installations: "[DOTNETHOME_X64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]"</String>
|
||||
<String Id="InstallPathARM64x86">The installation path for ARM64 SDK installations: "[DOTNETHOME_ARM64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]"</String>
|
||||
<String Id="InstallPathARM64x64">The installation path for ARM64 SDK installations: "[DOTNETHOME_ARM64]" cannot be the same as for x64 SDK installations: "[DOTNETHOME_X64]"</String>
|
||||
</WixLocalization>
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ Este produto coleta dados de uso
|
|||
Recursos
|
||||
• Documentação do .NET: https://aka.ms/dotnet-docs
|
||||
• Documentação do SDK: https://aka.ms/dotnet-sdk-docs
|
||||
• Notas sobre a Versão: https://aka.ms/dotnet5-release-notes
|
||||
• Notas sobre a Versão: https://aka.ms/dotnet6-release-notes
|
||||
• Tutoriais: https://aka.ms/dotnet-tutorials</String>
|
||||
<String Id="WelcomeHeaderMessage">SDK do .NET</String>
|
||||
<String Id="WelcomeDescription">
|
||||
|
|
@ -76,7 +76,10 @@ Recursos
|
|||
<String Id="InstallationNoteTitle">Nota de instalação</String>
|
||||
<String Id="InstallationNote">Um comando será executado durante o processo de instalação que melhorará a velocidade de restauração do projeto e habilitará o acesso offline. Isso levará até um minuto para ser concluído.
|
||||
</String>
|
||||
<String Id="VisualStudioWarning">Se você planeja usar o .NET 5.0 com o Visual Studio, é necessário usar o Visual Studio 2022 17.0 ou mais recente. <A HREF="https://aka.ms/dotnet5-release-notes">Saiba mais</A>.
|
||||
<String Id="VisualStudioWarning">Se você planeja usar o .NET 6.0 com o Visual Studio, é necessário usar o Visual Studio 2022 17.0 ou mais recente. <A HREF="https://aka.ms/dotnet6-release-notes">Saiba mais</A>.
|
||||
</String>
|
||||
<String Id="LicenseAssent">Ao clicar em instalar, você concorda com os termos a seguir.</String>
|
||||
<String Id="InstallPathx64x86">The installation path for x64 SDK installations: "[DOTNETHOME_X64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]"</String>
|
||||
<String Id="InstallPathARM64x86">The installation path for ARM64 SDK installations: "[DOTNETHOME_ARM64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]"</String>
|
||||
<String Id="InstallPathARM64x64">The installation path for ARM64 SDK installations: "[DOTNETHOME_ARM64]" cannot be the same as for x64 SDK installations: "[DOTNETHOME_X64]"</String>
|
||||
</WixLocalization>
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@
|
|||
Ресурсы
|
||||
• Документация по .NET: https://aka.ms/dotnet-docs
|
||||
• Документация по SDK: https://aka.ms/dotnet-sdk-docs
|
||||
• Заметки о выпуске: https://aka.ms/dotnet5-release-notes
|
||||
• Заметки о выпуске: https://aka.ms/dotnet6-release-notes
|
||||
• Учебники: https://aka.ms/dotnet-tutorials</String>
|
||||
<String Id="WelcomeHeaderMessage">Пакет SDK для .NET</String>
|
||||
<String Id="WelcomeDescription">
|
||||
|
|
@ -79,4 +79,7 @@
|
|||
<String Id="VisualStudioWarning">Если вы планируете использовать .NET 6.0 с Visual Studio, требуется Visual Studio 2022 версии 17.0 или более поздней. <A HREF="https://aka.ms/dotnet6-release-notes">Дополнительные сведения</A>.
|
||||
</String>
|
||||
<String Id="LicenseAssent">Нажимая кнопку "Установить", вы принимаете следующие условия.</String>
|
||||
<String Id="InstallPathx64x86">The installation path for x64 SDK installations: "[DOTNETHOME_X64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]"</String>
|
||||
<String Id="InstallPathARM64x86">The installation path for ARM64 SDK installations: "[DOTNETHOME_ARM64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]"</String>
|
||||
<String Id="InstallPathARM64x64">The installation path for ARM64 SDK installations: "[DOTNETHOME_ARM64]" cannot be the same as for x64 SDK installations: "[DOTNETHOME_X64]"</String>
|
||||
</WixLocalization>
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ Bu ürün, kullanım verilerini toplar
|
|||
Kaynaklar
|
||||
• .NET Belgeleri https://aka.ms/dotnet-docs
|
||||
• SDK Belgeleri https://aka.ms/dotnet-sdk-docs
|
||||
• Sürüm Notları https://aka.ms/dotnet5-release-notes
|
||||
• Sürüm Notları https://aka.ms/dotnet6-release-notes
|
||||
• Öğreticiler https://aka.ms/dotnet-tutorials</String>
|
||||
<String Id="WelcomeHeaderMessage">.NET SDK'sı</String>
|
||||
<String Id="WelcomeDescription">
|
||||
|
|
@ -76,7 +76,10 @@ Kaynaklar
|
|||
<String Id="InstallationNoteTitle">Yükleme notu</String>
|
||||
<String Id="InstallationNote">Yükleme işlemi sırasında, proje geri yükleme hızını artıran ve çevrimdışı erişimi etkinleştiren bir komut çalıştırılır. Tamamlanması bir dakikanızı alır.
|
||||
</String>
|
||||
<String Id="VisualStudioWarning">Visual Studio ile .NET 5.0 kullanmayı planlıyorsanız Visual Studio 2022 17.0 veya üzeri bir sürüm gerekir. <A HREF="https://aka.ms/dotnet5-release-notes">Daha Fazla Bilgi</A>.
|
||||
<String Id="VisualStudioWarning">Visual Studio ile .NET 6.0 kullanmayı planlıyorsanız Visual Studio 2022 17.0 veya üzeri bir sürüm gerekir. <A HREF="https://aka.ms/dotnet6-release-notes">Daha Fazla Bilgi</A>.
|
||||
</String>
|
||||
<String Id="LicenseAssent">Yükle'ye tıklayarak aşağıdaki koşulları kabul etmiş olursunuz.</String>
|
||||
<String Id="InstallPathx64x86">The installation path for x64 SDK installations: "[DOTNETHOME_X64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]"</String>
|
||||
<String Id="InstallPathARM64x86">The installation path for ARM64 SDK installations: "[DOTNETHOME_ARM64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]"</String>
|
||||
<String Id="InstallPathARM64x64">The installation path for ARM64 SDK installations: "[DOTNETHOME_ARM64]" cannot be the same as for x64 SDK installations: "[DOTNETHOME_X64]"</String>
|
||||
</WixLocalization>
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@
|
|||
资源
|
||||
• .NET 文档: https://aka.ms/dotnet-docs
|
||||
• SDK 文档: https://aka.ms/dotnet-sdk-docs
|
||||
• 发行说明: https://aka.ms/dotnet5-release-notes
|
||||
• 发行说明: https://aka.ms/dotnet6-release-notes
|
||||
• 教程: https://aka.ms/dotnet-tutorials</String>
|
||||
<String Id="WelcomeHeaderMessage">.NET SDK</String>
|
||||
<String Id="WelcomeDescription">
|
||||
|
|
@ -76,7 +76,10 @@
|
|||
<String Id="InstallationNoteTitle">安装说明</String>
|
||||
<String Id="InstallationNote">将在要提升项目还原速度并实现脱机访问的安装进程期间运行命令。此操作最多 1 分钟即可完成。
|
||||
</String>
|
||||
<String Id="VisualStudioWarning">如果打算结合使用 .NET 5.0 和 Visual Studio，需要 Visual Studio 2022 17.0 或更高版本。<A HREF="https://aka.ms/dotnet5-release-notes">了解详细信息</A>。
|
||||
<String Id="VisualStudioWarning">如果打算结合使用 .NET 6.0 和 Visual Studio，需要 Visual Studio 2022 17.0 或更高版本。<A HREF="https://aka.ms/dotnet6-release-notes">了解详细信息</A>。
|
||||
</String>
|
||||
<String Id="LicenseAssent">单击“安装”即表示你同意以下条款。</String>
|
||||
<String Id="InstallPathx64x86">The installation path for x64 SDK installations: "[DOTNETHOME_X64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]"</String>
|
||||
<String Id="InstallPathARM64x86">The installation path for ARM64 SDK installations: "[DOTNETHOME_ARM64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]"</String>
|
||||
<String Id="InstallPathARM64x64">The installation path for ARM64 SDK installations: "[DOTNETHOME_ARM64]" cannot be the same as for x64 SDK installations: "[DOTNETHOME_X64]"</String>
|
||||
</WixLocalization>
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ Este producto recopila datos de uso
|
|||
Recursos
|
||||
• Documentación de .NET https://aka.ms/dotnet-docs
|
||||
• Documentación del SDK https://aka.ms/dotnet-sdk-docs
|
||||
• Notas de la versión https://aka.ms/dotnet5-release-notes
|
||||
• Notas de la versión https://aka.ms/dotnet6-release-notes
|
||||
• Tutoriales https://aka.ms/dotnet-tutorials</String>
|
||||
<String Id="WelcomeHeaderMessage">SDK de .NET</String>
|
||||
<String Id="WelcomeDescription">
|
||||
|
|
@ -76,7 +76,10 @@ Recursos
|
|||
<String Id="InstallationNoteTitle">Nota de instalación</String>
|
||||
<String Id="InstallationNote">Se ejecutará un comando durante el proceso de instalación que mejorará la velocidad de restauración del proyecto y permitirá el acceso sin conexión. La operación tardará hasta un minuto en completarse.
|
||||
</String>
|
||||
<String Id="VisualStudioWarning">Si tiene previsto usar .NET 5.0 con Visual Studio, se requiere Visual Studio 2022 17.0 o una versión más reciente. <A HREF="https://aka.ms/dotnet5-release-notes">Obtenga más información</A>.
|
||||
<String Id="VisualStudioWarning">Si tiene previsto usar .NET 6.0 con Visual Studio, se requiere Visual Studio 2022 17.0 o una versión más reciente. <A HREF="https://aka.ms/dotnet6-release-notes">Obtenga más información</A>.
|
||||
</String>
|
||||
<String Id="LicenseAssent">Al hacer clic en Instalar, acepta los términos siguientes.</String>
|
||||
<String Id="InstallPathx64x86">The installation path for x64 SDK installations: "[DOTNETHOME_X64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]"</String>
|
||||
<String Id="InstallPathARM64x86">The installation path for ARM64 SDK installations: "[DOTNETHOME_ARM64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]"</String>
|
||||
<String Id="InstallPathARM64x64">The installation path for ARM64 SDK installations: "[DOTNETHOME_ARM64]" cannot be the same as for x64 SDK installations: "[DOTNETHOME_X64]"</String>
|
||||
</WixLocalization>
|
||||
|
|
|
|||
|
|
@ -1,18 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
|
||||
<metadata>
|
||||
<id>VS.Redist.Common.NetCore.Manifest.$ARCH$</id>
|
||||
<version>1.0.0</version>
|
||||
<title>VS.Redist.Common.NetCore.Manifest.$ARCH$</title>
|
||||
<authors>Microsoft</authors>
|
||||
<owners>Microsoft</owners>
|
||||
<licenseUrl>https://www.microsoft.com/net/dotnet_library_license.htm</licenseUrl>
|
||||
<projectUrl>https://github.com/dotnet/core-sdk</projectUrl>
|
||||
<requireLicenseAcceptance>true</requireLicenseAcceptance>
|
||||
<description>.NET Core $MAJOR_MINOR$ SDK Manifests ($ARCH$) Windows Installer MSI as a .nupkg for internal Visual Studio build consumption</description>
|
||||
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
|
||||
</metadata>
|
||||
<files>
|
||||
<file src="$PAYLOAD_FILES$" />
|
||||
</files>
|
||||
</package>
|
||||
|
|
@ -10,16 +10,16 @@
|
|||
AboutUrl="https://aka.ms/netcorehelp/"
|
||||
Compressed="yes">
|
||||
|
||||
<bal:Condition Message="The installation path for x64 SDK installations: "[DOTNETHOME_X64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]"">
|
||||
<bal:Condition Message="#(loc.InstallPathx64x86)">
|
||||
WixBundleInstalled OR (NOT DOTNETHOME_X64 ~= DOTNETHOME_X86) OR DOTNETHOMESIMILARITYCHECKOVERRIDE
|
||||
</bal:Condition>
|
||||
|
||||
<bal:Condition Message="The installation path for ARM64 SDK installations: "[DOTNETHOME_ARM64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]"">
|
||||
<bal:Condition Message="#(loc.InstallPathARM64x86)">
|
||||
WixBundleInstalled OR (NOT DOTNETHOME_ARM64 ~= DOTNETHOME_X86) OR DOTNETHOMESIMILARITYCHECKOVERRIDE
|
||||
</bal:Condition>
|
||||
|
||||
<!-- Permit same path on non-ARM64 machines since past SDKs always wrote this value -->
|
||||
<bal:Condition Message="The installation path for ARM64 SDK installations: "[DOTNETHOME_ARM64]" cannot be the same as for x64 SDK installations: "[DOTNETHOME_X64]"">
|
||||
<bal:Condition Message="#(loc.InstallPathARM64x64)">
|
||||
WixBundleInstalled OR (NOT DOTNETHOME_ARM64 ~= DOTNETHOME_X64) OR (NOT NativeMachine="$(var.NativeMachine_arm64)") OR DOTNETHOMESIMILARITYCHECKOVERRIDE
|
||||
</bal:Condition>
|
||||
|
||||
|
|
@ -194,10 +194,7 @@
|
|||
<MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
|
||||
<MsiProperty Name="ALLOWMSIINSTALL" Value="True" />
|
||||
</MsiPackage>
|
||||
<MsiPackage SourceFile="$(var.ManifestsMsiSourcePath)">
|
||||
<MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
|
||||
<MsiProperty Name="ALLOWMSIINSTALL" Value="True" />
|
||||
</MsiPackage>
|
||||
<PackageGroupRef Id="PG_WorkloadManifests" />
|
||||
<MsiPackage SourceFile="$(var.CLISDKMsiSourcePath)">
|
||||
<MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
|
||||
<MsiProperty Name="EXEFULLPATH" Value="[WixBundleOriginalSource]" />
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
# Licensed under the MIT license. See LICENSE file in the project root for full license information.
|
||||
|
||||
param(
|
||||
[Parameter(Mandatory=$true)][string]$WorkloadManifestWxsFile,
|
||||
[Parameter(Mandatory=$true)][string]$CLISDKMSIFile,
|
||||
[Parameter(Mandatory=$true)][string]$ASPNETRuntimeWixLibFile,
|
||||
[Parameter(Mandatory=$true)][string]$SharedFxMSIFile,
|
||||
|
|
@ -18,7 +19,6 @@ param(
|
|||
[Parameter(Mandatory=$true)][string]$WindowsDesktopTargetingPackMSIFile,
|
||||
[Parameter(Mandatory=$true)][string]$FinalizerExe,
|
||||
[Parameter(Mandatory=$true)][string]$TemplatesMSIFile,
|
||||
[Parameter(Mandatory=$true)][string]$ManifestsMSIFile,
|
||||
[Parameter(Mandatory=$true)][string]$DotnetBundleOutput,
|
||||
[Parameter(Mandatory=$true)][string]$WixRoot,
|
||||
[Parameter(Mandatory=$true)][string]$ProductMoniker,
|
||||
|
|
@ -78,7 +78,7 @@ function RunCandleForBundle
|
|||
-ext WixBalExtension.dll `
|
||||
-ext WixUtilExtension.dll `
|
||||
-ext WixTagExtension.dll `
|
||||
"$AuthWsxRoot\bundle.wxs"
|
||||
"$AuthWsxRoot\bundle.wxs" "$WorkloadManifestWxsFile"
|
||||
|
||||
Write-Information "Candle output: $candleOutput"
|
||||
|
||||
|
|
@ -97,11 +97,14 @@ function RunLightForBundle
|
|||
$result = $true
|
||||
pushd "$WixRoot"
|
||||
|
||||
$WorkloadManifestWixobjFile = [System.IO.Path]::GetFileNameWithoutExtension($WorkloadManifestWxsFile) + ".wixobj"
|
||||
|
||||
Write-Information "Running light for bundle.."
|
||||
|
||||
$lightOutput = .\light.exe -nologo `
|
||||
-cultures:en-us `
|
||||
bundle.wixobj `
|
||||
$WorkloadManifestWixobjFile `
|
||||
$ASPNETRuntimeWixlibFile `
|
||||
-ext WixBalExtension.dll `
|
||||
-ext WixUtilExtension.dll `
|
||||
|
|
|
|||
|
|
@ -1,153 +0,0 @@
|
|||
# Copyright (c) .NET Foundation and contributors. All rights reserved.
|
||||
# Licensed under the MIT license. See LICENSE file in the project root for full license information.
|
||||
|
||||
param(
|
||||
[Parameter(Mandatory=$true)][string]$inputDir,
|
||||
[Parameter(Mandatory=$true)][string]$DotnetMSIOutput,
|
||||
[Parameter(Mandatory=$true)][string]$WixRoot,
|
||||
[Parameter(Mandatory=$true)][string]$ProductMoniker,
|
||||
[Parameter(Mandatory=$true)][string]$DotnetMSIVersion,
|
||||
[Parameter(Mandatory=$true)][string]$SDKBundleVersion,
|
||||
[Parameter(Mandatory=$true)][string]$DotnetCLINugetVersion,
|
||||
[Parameter(Mandatory=$true)][string]$UpgradeCode,
|
||||
[Parameter(Mandatory=$true)][string]$DependencyKeyName,
|
||||
[Parameter(Mandatory=$true)][string]$Architecture
|
||||
)
|
||||
|
||||
$InstallFileswsx = ".\manifest-install-files.wxs"
|
||||
$InstallFilesWixobj = "manifest-install-files.wixobj"
|
||||
|
||||
function RunHeat
|
||||
{
|
||||
$result = $true
|
||||
pushd "$WixRoot"
|
||||
|
||||
Write-Information "Running heat.."
|
||||
|
||||
$heatOutput = .\heat.exe dir `"$inputDir`" -template fragment `
|
||||
-sreg -ag `
|
||||
-var var.DotnetSrc `
|
||||
-cg InstallFiles `
|
||||
-srd `
|
||||
-dr DOTNETHOME `
|
||||
-out manifest-install-files.wxs
|
||||
|
||||
Write-Information "Heat output: $heatOutput"
|
||||
|
||||
if($LastExitCode -ne 0)
|
||||
{
|
||||
$result = $false
|
||||
Write-Information "Heat failed with exit code $LastExitCode."
|
||||
}
|
||||
|
||||
popd
|
||||
Write-Information "RunHeat result: $result"
|
||||
return $result
|
||||
}
|
||||
|
||||
function RunCandle
|
||||
{
|
||||
$result = $true
|
||||
pushd "$WixRoot"
|
||||
|
||||
Write-Information "Running candle.."
|
||||
|
||||
$candleOutput = .\candle.exe -nologo `
|
||||
-dDotnetSrc="$inputDir" `
|
||||
-dMicrosoftEula="$PSScriptRoot\dummyeula.rtf" `
|
||||
-dProductMoniker="$ProductMoniker" `
|
||||
-dBuildVersion="$DotnetMSIVersion" `
|
||||
-dSDKBundleVersion="$SDKBundleVersion" `
|
||||
-dNugetVersion="$DotnetCLINugetVersion" `
|
||||
-dUpgradeCode="$UpgradeCode" `
|
||||
-dDependencyKeyName="$DependencyKeyName" `
|
||||
-arch "$Architecture" `
|
||||
-ext WixDependencyExtension.dll `
|
||||
"$PSScriptRoot\manifests.wxs" `
|
||||
"$PSScriptRoot\provider.wxs" `
|
||||
"$PSScriptRoot\dotnethome_x64.wxs" `
|
||||
$InstallFileswsx
|
||||
|
||||
Write-Information "Candle output: $candleOutput"
|
||||
|
||||
if($LastExitCode -ne 0)
|
||||
{
|
||||
$result = $false
|
||||
Write-Information "Candle failed with exit code $LastExitCode."
|
||||
}
|
||||
|
||||
popd
|
||||
return $result
|
||||
}
|
||||
|
||||
function RunLight
|
||||
{
|
||||
$result = $true
|
||||
pushd "$WixRoot"
|
||||
|
||||
Write-Information "Running light.."
|
||||
$CabCache = Join-Path $WixRoot "cabcache"
|
||||
|
||||
$lightOutput = .\light.exe -nologo -ext WixUIExtension -ext WixDependencyExtension -ext WixUtilExtension `
|
||||
-cultures:en-us `
|
||||
manifests.wixobj `
|
||||
provider.wixobj `
|
||||
dotnethome_x64.wixobj `
|
||||
$InstallFilesWixobj `
|
||||
-b "$inputDir" `
|
||||
-b "$PSScriptRoot" `
|
||||
-reusecab `
|
||||
-cc "$CabCache" `
|
||||
-out $DotnetMSIOutput
|
||||
|
||||
Write-Information "Light output: $lightOutput"
|
||||
|
||||
if($LastExitCode -ne 0)
|
||||
{
|
||||
$result = $false
|
||||
Write-Information "Light failed with exit code $LastExitCode."
|
||||
}
|
||||
|
||||
popd
|
||||
return $result
|
||||
}
|
||||
|
||||
if(!(Test-Path $inputDir))
|
||||
{
|
||||
throw "$inputDir not found"
|
||||
}
|
||||
|
||||
Write-Information "Creating manifests MSI at $DotnetMSIOutput"
|
||||
|
||||
if([string]::IsNullOrEmpty($WixRoot))
|
||||
{
|
||||
Exit -1
|
||||
}
|
||||
|
||||
if(-Not (RunHeat))
|
||||
{
|
||||
Write-Information "Heat failed"
|
||||
Exit -1
|
||||
}
|
||||
|
||||
if(-Not (RunCandle))
|
||||
{
|
||||
Write-Information "Candle failed"
|
||||
Exit -1
|
||||
}
|
||||
|
||||
if(-Not (RunLight))
|
||||
{
|
||||
Write-Information "Light failed"
|
||||
Exit -1
|
||||
}
|
||||
|
||||
if(!(Test-Path $DotnetMSIOutput))
|
||||
{
|
||||
throw "Unable to create the manifests MSI."
|
||||
Exit -1
|
||||
}
|
||||
|
||||
Write-Information "Successfully created manifests MSI - $DotnetMSIOutput"
|
||||
|
||||
exit $LastExitCode
|
||||
|
|
@ -96,13 +96,20 @@ namespace EndToEnd.Tests
|
|||
.Should().Pass().And.HaveStdOutContaining("Hello, World!");
|
||||
}
|
||||
|
||||
[WindowsOnlyFact]
|
||||
public void ItCanPublishArm64Winforms()
|
||||
[WindowsOnlyTheory]
|
||||
[InlineData("net5.0")]
|
||||
[InlineData("current")]
|
||||
public void ItCanPublishArm64Winforms(string TargetFramework)
|
||||
{
|
||||
DirectoryInfo directory = TestAssets.CreateTestDirectory();
|
||||
string projectDirectory = directory.FullName;
|
||||
string TargetFrameworkParameter = "";
|
||||
|
||||
string newArgs = "winforms --no-restore";
|
||||
if (TargetFramework != "current")
|
||||
{
|
||||
TargetFrameworkParameter = $"-f {TargetFramework}";
|
||||
}
|
||||
string newArgs = $"winforms {TargetFrameworkParameter} --no-restore";
|
||||
new NewCommandShim()
|
||||
.WithWorkingDirectory(projectDirectory)
|
||||
.Execute(newArgs)
|
||||
|
|
@ -122,13 +129,21 @@ namespace EndToEnd.Tests
|
|||
selfContainedPublishDir.Should().HaveFilesMatching($"{directory.Name}.dll", SearchOption.TopDirectoryOnly);
|
||||
}
|
||||
|
||||
[WindowsOnlyFact]
|
||||
public void ItCanPublishArm64Wpf()
|
||||
[WindowsOnlyTheory]
|
||||
[InlineData("net5.0")]
|
||||
[InlineData("current")]
|
||||
public void ItCanPublishArm64Wpf(string TargetFramework)
|
||||
{
|
||||
DirectoryInfo directory = TestAssets.CreateTestDirectory();
|
||||
string projectDirectory = directory.FullName;
|
||||
string TargetFrameworkParameter = "";
|
||||
|
||||
string newArgs = "wpf --no-restore";
|
||||
if (TargetFramework != "current")
|
||||
{
|
||||
TargetFrameworkParameter = $"-f {TargetFramework}";
|
||||
}
|
||||
|
||||
string newArgs = $"wpf {TargetFrameworkParameter} --no-restore";
|
||||
new NewCommandShim()
|
||||
.WithWorkingDirectory(projectDirectory)
|
||||
.Execute(newArgs)
|
||||
|
|
@ -346,7 +361,7 @@ namespace EndToEnd.Tests
|
|||
[InlineData("winformscontrollib", "VB")]
|
||||
public void ItCanCreateAndBuildTemplatesWithDefaultFramework_Windows(string templateName, string language = "")
|
||||
{
|
||||
string framework = DetectExpectedDefaultFramework();
|
||||
string framework = DetectExpectedDefaultFramework(templateName);
|
||||
TestTemplateCreateAndBuild(templateName, selfContained: true, language: language, framework: $"{framework}-windows");
|
||||
}
|
||||
|
||||
|
|
@ -371,7 +386,7 @@ namespace EndToEnd.Tests
|
|||
}
|
||||
}
|
||||
|
||||
private static string DetectExpectedDefaultFramework()
|
||||
private static string DetectExpectedDefaultFramework(string template = "")
|
||||
{
|
||||
string dotnetFolder = Path.GetDirectoryName(RepoDirectoriesProvider.DotnetUnderTest);
|
||||
string[] runtimeFolders = Directory.GetDirectories(Path.Combine(dotnetFolder, "shared", "Microsoft.NETCore.App"));
|
||||
|
|
@ -379,9 +394,16 @@ namespace EndToEnd.Tests
|
|||
int latestMajorVersion = runtimeFolders.Select(folder => int.Parse(Path.GetFileName(folder).Split('.').First())).Max();
|
||||
if (latestMajorVersion == 7)
|
||||
{
|
||||
// TODO: Update
|
||||
// TODO: This block need to be updated when every template updates their default tfm.
|
||||
// Currently winforms updated their default templates target but not others.
|
||||
if (template.StartsWith("winforms"))
|
||||
{
|
||||
return $"net{latestMajorVersion}.0";
|
||||
}
|
||||
|
||||
return "net6.0";
|
||||
}
|
||||
|
||||
throw new Exception("Unsupported version of SDK");
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netcoreapp3.1</TargetFramework>
|
||||
<TargetFramework>netcoreapp6.0</TargetFramework>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -9,6 +9,9 @@ let inputBranches =
|
|||
[ { GitBranchName = "main"
|
||||
DisplayName = "main<br>(7.0.x Runtime)"
|
||||
AkaMsChannel = Some("7.0.1xx/daily") }
|
||||
{ GitBranchName = "release/6.0.2xx"
|
||||
DisplayName = "Release/6.0.2XX<br>(6.0.x Runtime)"
|
||||
AkaMsChannel = Some("6.0.2xx/daily") }
|
||||
{ GitBranchName = "release/6.0.1xx"
|
||||
DisplayName = "Release/6.0.1XX<br>(6.0.x Runtime)"
|
||||
AkaMsChannel = Some("6.0.1xx/daily") }
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
<PropertyGroup>
|
||||
<OutputType>Exe</OutputType>
|
||||
<TargetFramework>netcoreapp3.1</TargetFramework>
|
||||
<TargetFramework>netcoreapp6.0</TargetFramework>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
|||
Loading…
Reference in a new issue