From dcf5998b163bdf901a5969f22893087b2e595986 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Tue, 20 Aug 2019 15:09:14 -0700 Subject: [PATCH 001/420] Update README to point to 3.0.100-preview9 bits. --- README.md | 122 +++++++++++++++++++++++++++--------------------------- 1 file changed, 61 insertions(+), 61 deletions(-) diff --git a/README.md b/README.md index 02d22a5a8..012af6aea 100644 --- a/README.md +++ b/README.md @@ -51,18 +51,18 @@ With development builds, internal NuGet feeds are necessary for some scenarios ( ``` -| Platform | Master
(3.0.x Runtime) | Release/3.0.1XX
(3.0.x Runtime) | Release/3.0.100-preview8
(3.0.x Runtime) | Release/2.2.3XX
(2.2.x Runtime) | Release/2.2.2XX
(2.2.x Runtime) | Release/2.2.1XX
(2.2.x Runtime) | Release/2.1.7XX
(2.1.7 Runtime) | Release/2.1.6XX
(2.1.6 Runtime) | Release/2.1.5XX
(2.1.5 Runtime) | +| Platform | Master
(3.0.x Runtime) | Release/3.0.1XX
(3.0.x Runtime) | Release/3.0.100-preview9
(3.0.x Runtime) | Release/2.2.3XX
(2.2.x Runtime) | Release/2.2.2XX
(2.2.x Runtime) | Release/2.2.1XX
(2.2.x Runtime) | Release/2.1.7XX
(2.1.7 Runtime) | Release/2.1.6XX
(2.1.6 Runtime) | Release/2.1.5XX
(2.1.5 Runtime) | |---------|:----------:|:----------:|:----------:|:----------:|:----------:|:----------:|:----------:|:----------:|:----------:| -| **Windows x64** | [![][win-x64-badge-master]][win-x64-version-master]
[Installer][win-x64-installer-master] - [Checksum][win-x64-installer-checksum-master]
[zip][win-x64-zip-master] - [Checksum][win-x64-zip-checksum-master] | [![][win-x64-badge-3.0.1xx]][win-x64-version-3.0.1xx]
[Installer][win-x64-installer-3.0.1xx] - [Checksum][win-x64-installer-checksum-3.0.1xx]
[zip][win-x64-zip-3.0.1xx] - [Checksum][win-x64-zip-checksum-3.0.1xx] | [![][win-x64-badge-3.0.100-preview8]][win-x64-version-3.0.100-preview8]
[Installer][win-x64-installer-3.0.100-preview8] - [Checksum][win-x64-installer-checksum-3.0.100-preview8]
[zip][win-x64-zip-3.0.100-preview8] - [Checksum][win-x64-zip-checksum-3.0.100-preview8] | [![][win-x64-badge-2.2.3XX]][win-x64-version-2.2.3XX]
[Installer][win-x64-installer-2.2.3XX] - [Checksum][win-x64-installer-checksum-2.2.3XX]
[zip][win-x64-zip-2.2.3XX] - [Checksum][win-x64-zip-checksum-2.2.3XX] |[![][win-x64-badge-2.2.2XX]][win-x64-version-2.2.2XX]
[Installer][win-x64-installer-2.2.2XX] - [Checksum][win-x64-installer-checksum-2.2.2XX]
[zip][win-x64-zip-2.2.2XX] - [Checksum][win-x64-zip-checksum-2.2.2XX] |[![][win-x64-badge-2.2.1XX]][win-x64-version-2.2.1XX]
[Installer][win-x64-installer-2.2.1XX] - [Checksum][win-x64-installer-checksum-2.2.1XX]
[zip][win-x64-zip-2.2.1XX] - [Checksum][win-x64-zip-checksum-2.2.1XX] |[![][win-x64-badge-2.1.7XX]][win-x64-version-2.1.7XX]
[Installer][win-x64-installer-2.1.7XX] - [Checksum][win-x64-installer-checksum-2.1.7XX]
[zip][win-x64-zip-2.1.7XX] - [Checksum][win-x64-zip-checksum-2.1.7XX] | [![][win-x64-badge-2.1.6XX]][win-x64-version-2.1.6XX]
[Installer][win-x64-installer-2.1.6XX] - [Checksum][win-x64-installer-checksum-2.1.6XX]
[zip][win-x64-zip-2.1.6XX] - [Checksum][win-x64-zip-checksum-2.1.6XX] | [![][win-x64-badge-2.1.5XX]][win-x64-version-2.1.5XX]
[Installer][win-x64-installer-2.1.5XX] - [Checksum][win-x64-installer-checksum-2.1.5XX]
[zip][win-x64-zip-2.1.5XX] - [Checksum][win-x64-zip-checksum-2.1.5XX] | -| **Windows x86** | [![][win-x86-badge-master]][win-x86-version-master]
[Installer][win-x86-installer-master] - [Checksum][win-x86-installer-checksum-master]
[zip][win-x86-zip-master] - [Checksum][win-x86-zip-checksum-master] | [![][win-x86-badge-3.0.1xx]][win-x86-version-3.0.1xx]
[Installer][win-x86-installer-3.0.1xx] - [Checksum][win-x86-installer-checksum-3.0.1xx]
[zip][win-x86-zip-3.0.1xx] - [Checksum][win-x86-zip-checksum-3.0.1xx] | [![][win-x86-badge-3.0.100-preview8]][win-x86-version-3.0.100-preview8]
[Installer][win-x86-installer-3.0.100-preview8] - [Checksum][win-x86-installer-checksum-3.0.100-preview8]
[zip][win-x86-zip-3.0.100-preview8] - [Checksum][win-x86-zip-checksum-3.0.100-preview8] | [![][win-x86-badge-2.2.3XX]][win-x86-version-2.2.3XX]
[Installer][win-x86-installer-2.2.3XX] - [Checksum][win-x86-installer-checksum-2.2.3XX]
[zip][win-x86-zip-2.2.3XX] - [Checksum][win-x86-zip-checksum-2.2.3XX] |[![][win-x86-badge-2.2.2XX]][win-x86-version-2.2.2XX]
[Installer][win-x86-installer-2.2.2XX] - [Checksum][win-x86-installer-checksum-2.2.2XX]
[zip][win-x86-zip-2.2.2XX] - [Checksum][win-x86-zip-checksum-2.2.2XX] |[![][win-x86-badge-2.2.1XX]][win-x86-version-2.2.1XX]
[Installer][win-x86-installer-2.2.1XX] - [Checksum][win-x86-installer-checksum-2.2.1XX]
[zip][win-x86-zip-2.2.1XX] - [Checksum][win-x86-zip-checksum-2.2.1XX] |[![][win-x86-badge-2.1.7XX]][win-x86-version-2.1.7XX]
[Installer][win-x86-installer-2.1.7XX] - [Checksum][win-x86-installer-checksum-2.1.7XX]
[zip][win-x86-zip-2.1.7XX] - [Checksum][win-x86-zip-checksum-2.1.7XX] | [![][win-x86-badge-2.1.6XX]][win-x86-version-2.1.6XX]
[Installer][win-x86-installer-2.1.6XX] - [Checksum][win-x86-installer-checksum-2.1.6XX]
[zip][win-x86-zip-2.1.6XX] - [Checksum][win-x86-zip-checksum-2.1.6XX] | [![][win-x86-badge-2.1.5XX]][win-x86-version-2.1.5XX]
[Installer][win-x86-installer-2.1.5XX] - [Checksum][win-x86-installer-checksum-2.1.5XX]
[zip][win-x86-zip-2.1.5XX] - [Checksum][win-x86-zip-checksum-2.1.5XX] | -| **macOS** | [![][osx-badge-master]][osx-version-master]
[Installer][osx-installer-master] - [Checksum][osx-installer-checksum-master]
[tar.gz][osx-targz-master] - [Checksum][osx-targz-checksum-master] | [![][osx-badge-3.0.1xx]][osx-version-3.0.1xx]
[Installer][osx-installer-3.0.1xx] - [Checksum][osx-installer-checksum-3.0.1xx]
[tar.gz][osx-targz-3.0.1xx] - [Checksum][osx-targz-checksum-3.0.1xx] | [![][osx-badge-3.0.100-preview8]][osx-version-3.0.100-preview8]
[Installer][osx-installer-3.0.100-preview8] - [Checksum][osx-installer-checksum-3.0.100-preview8]
[tar.gz][osx-targz-3.0.100-preview8] - [Checksum][osx-targz-checksum-3.0.100-preview8] | [![][osx-badge-2.2.3XX]][osx-version-2.2.3XX]
[Installer][osx-installer-2.2.3XX] - [Checksum][osx-installer-checksum-2.2.3XX]
[tar.gz][osx-targz-2.2.3XX] - [Checksum][osx-targz-checksum-2.2.3XX] |[![][osx-badge-2.2.2XX]][osx-version-2.2.2XX]
[Installer][osx-installer-2.2.2XX] - [Checksum][osx-installer-checksum-2.2.2XX]
[tar.gz][osx-targz-2.2.2XX] - [Checksum][osx-targz-checksum-2.2.2XX] |[![][osx-badge-2.2.1XX]][osx-version-2.2.1XX]
[Installer][osx-installer-2.2.1XX] - [Checksum][osx-installer-checksum-2.2.1XX]
[tar.gz][osx-targz-2.2.1XX] - [Checksum][osx-targz-checksum-2.2.1XX] |[![][osx-badge-2.1.7XX]][osx-version-2.1.7XX]
[Installer][osx-installer-2.1.7XX] - [Checksum][osx-installer-checksum-2.1.7XX]
[tar.gz][osx-targz-2.1.7XX] - [Checksum][osx-targz-checksum-2.1.7XX] | [![][osx-badge-2.1.6XX]][osx-version-2.1.6XX]
[Installer][osx-installer-2.1.6XX] - [Checksum][osx-installer-checksum-2.1.6XX]
[tar.gz][osx-targz-2.1.6XX] - [Checksum][osx-targz-checksum-2.1.6XX] | [![][osx-badge-2.1.5XX]][osx-version-2.1.5XX]
[Installer][osx-installer-2.1.5XX] - [Checksum][osx-installer-checksum-2.1.5XX]
[tar.gz][osx-targz-2.1.5XX] - [Checksum][osx-targz-checksum-2.1.5XX] | -| **Linux x64** | [![][linux-badge-master]][linux-version-master]
[DEB Installer][linux-DEB-installer-master] - [Checksum][linux-DEB-installer-checksum-master]
[RPM Installer][linux-RPM-installer-master] - [Checksum][linux-RPM-installer-checksum-master]
_see installer note below_1
[tar.gz][linux-targz-master] - [Checksum][linux-targz-checksum-master] | [![][linux-badge-3.0.1xx]][linux-version-3.0.1xx]
[DEB Installer][linux-DEB-installer-3.0.1xx] - [Checksum][linux-DEB-installer-checksum-3.0.1xx]
[RPM Installer][linux-RPM-installer-3.0.1xx] - [Checksum][linux-RPM-installer-checksum-3.0.1xx]
_see installer note below_1
[tar.gz][linux-targz-3.0.1xx] - [Checksum][linux-targz-checksum-3.0.1xx] | [![][linux-badge-3.0.100-preview8]][linux-version-3.0.100-preview8]
[DEB Installer][linux-DEB-installer-3.0.100-preview8] - [Checksum][linux-DEB-installer-checksum-3.0.100-preview8]
[RPM Installer][linux-RPM-installer-3.0.100-preview8] - [Checksum][linux-RPM-installer-checksum-3.0.100-preview8]
_see installer note below_1
[tar.gz][linux-targz-3.0.100-preview8] - [Checksum][linux-targz-checksum-3.0.100-preview8] | [![][linux-badge-2.2.3xx]][linux-version-2.2.3xx]
[DEB Installer][linux-DEB-installer-2.2.3XX] - [Checksum][linux-DEB-installer-checksum-2.2.3XX]
[RPM Installer][linux-RPM-installer-2.2.3XX] - [Checksum][linux-RPM-installer-checksum-2.2.3XX]
_see installer note below_1
[tar.gz][linux-targz-2.2.3XX] - [Checksum][linux-targz-checksum-2.2.3XX] |[![][linux-badge-2.2.2xx]][linux-version-2.2.2xx]
[DEB Installer][linux-DEB-installer-2.2.2XX] - [Checksum][linux-DEB-installer-checksum-2.2.2XX]
[RPM Installer][linux-RPM-installer-2.2.2XX] - [Checksum][linux-RPM-installer-checksum-2.2.2XX]
_see installer note below_1
[tar.gz][linux-targz-2.2.2XX] - [Checksum][linux-targz-checksum-2.2.2XX] |[![][linux-badge-2.2.1xx]][linux-version-2.2.1xx]
[DEB Installer][linux-DEB-installer-2.2.1XX] - [Checksum][linux-DEB-installer-checksum-2.2.1XX]
[RPM Installer][linux-RPM-installer-2.2.1XX] - [Checksum][linux-RPM-installer-checksum-2.2.1XX]
_see installer note below_1
[tar.gz][linux-targz-2.2.1XX] - [Checksum][linux-targz-checksum-2.2.1XX] |[![][linux-badge-2.1.7XX]][linux-version-2.1.7XX]
[DEB Installer][linux-DEB-installer-2.1.7XX] - [Checksum][linux-DEB-installer-checksum-2.1.7XX]
[RPM Installer][linux-RPM-installer-2.1.7XX] - [Checksum][linux-RPM-installer-checksum-2.1.7XX]
_see installer note below_1
[tar.gz][linux-targz-2.1.7XX] - [Checksum][linux-targz-checksum-2.1.7XX] | [![][linux-badge-2.1.6XX]][linux-version-2.1.6XX]
[DEB Installer][linux-DEB-installer-2.1.6XX] - [Checksum][linux-DEB-installer-checksum-2.1.6XX]
[RPM Installer][linux-RPM-installer-2.1.6XX] - [Checksum][linux-RPM-installer-checksum-2.1.6XX]
_see installer note below_1
[tar.gz][linux-targz-2.1.6XX] - [Checksum][linux-targz-checksum-2.1.6XX] | [![][linux-badge-2.1.5XX]][linux-version-2.1.5XX]
[DEB Installer][linux-DEB-installer-2.1.5XX] - [Checksum][linux-DEB-installer-checksum-2.1.5XX]
[RPM Installer][linux-RPM-installer-2.1.5XX] - [Checksum][linux-RPM-installer-checksum-2.1.5XX]
_see installer note below_1
[tar.gz][linux-targz-2.1.5XX] - [Checksum][linux-targz-checksum-2.1.5XX] | -| **Linux arm** | [![][linux-arm-badge-master]][linux-arm-version-master]
[tar.gz][linux-arm-targz-master] - [Checksum][linux-arm-targz-checksum-master] | [![][linux-arm-badge-3.0.1xx]][linux-arm-version-3.0.1xx]
[tar.gz][linux-arm-targz-3.0.1xx] - [Checksum][linux-arm-targz-checksum-3.0.1xx] | [![][linux-arm-badge-3.0.100-preview8]][linux-arm-version-3.0.100-preview8]
[tar.gz][linux-arm-targz-3.0.100-preview8] - [Checksum][linux-arm-targz-checksum-3.0.100-preview8] | [![][linux-arm-badge-2.2.3XX]][linux-arm-version-2.2.3XX]
[tar.gz][linux-arm-targz-2.2.3XX] - [Checksum][linux-arm-targz-checksum-2.2.3XX] |[![][linux-arm-badge-2.2.2XX]][linux-arm-version-2.2.2XX]
[tar.gz][linux-arm-targz-2.2.2XX] - [Checksum][linux-arm-targz-checksum-2.2.2XX] |[![][linux-arm-badge-2.2.1XX]][linux-arm-version-2.2.1XX]
[tar.gz][linux-arm-targz-2.2.1XX] - [Checksum][linux-arm-targz-checksum-2.2.1XX] |[![][linux-arm-badge-2.1.7XX]][linux-arm-version-2.1.7XX]
[tar.gz][linux-arm-targz-2.1.7XX] - [Checksum][linux-arm-targz-checksum-2.1.7XX] | [![][linux-arm-badge-2.1.6XX]][linux-arm-version-2.1.6XX]
[tar.gz][linux-arm-targz-2.1.6XX] - [Checksum][linux-arm-targz-checksum-2.1.6XX] | [![][linux-arm-badge-2.1.5XX]][linux-arm-version-2.1.5XX]
[tar.gz][linux-arm-targz-2.1.5XX] - [Checksum][linux-arm-targz-checksum-2.1.5XX] | -| **Linux arm64** | [![][linux-arm64-badge-master]][linux-arm64-version-master]
[tar.gz][linux-arm64-targz-master] - [Checksum][linux-arm64-targz-checksum-master] | [![][linux-arm64-badge-3.0.1xx]][linux-arm64-version-3.0.1xx]
[tar.gz][linux-arm64-targz-3.0.1xx] - [Checksum][linux-arm64-targz-checksum-3.0.1xx] | [![][linux-arm64-badge-3.0.100-preview8]][linux-arm64-version-3.0.100-preview8]
[tar.gz][linux-arm64-targz-3.0.100-preview8] - [Checksum][linux-arm64-targz-checksum-3.0.100-preview8] | [![][linux-arm64-badge-2.2.3XX]][linux-arm64-version-2.2.3XX]
[tar.gz][linux-arm64-targz-2.2.3XX] - [Checksum][linux-arm64-targz-checksum-2.2.3XX] |[![][linux-arm64-badge-2.2.2XX]][linux-arm64-version-2.2.2XX]
[tar.gz][linux-arm64-targz-2.2.2XX] - [Checksum][linux-arm64-targz-checksum-2.2.2XX] |[![][linux-arm64-badge-2.2.1XX]][linux-arm64-version-2.2.1XX]
[tar.gz][linux-arm64-targz-2.2.1XX] - [Checksum][linux-arm64-targz-checksum-2.2.1XX] |[![][linux-arm64-badge-2.1.7XX]][linux-arm64-version-2.1.7XX]
[tar.gz][linux-arm64-targz-2.1.7XX] - [Checksum][linux-arm64-targz-checksum-2.1.7XX] | [![][linux-arm64-badge-2.1.6XX]][linux-arm64-version-2.1.6XX]
[tar.gz][linux-arm64-targz-2.1.6XX] - [Checksum][linux-arm64-targz-checksum-2.1.6XX] | [![][linux-arm64-badge-2.1.5XX]][linux-arm64-version-2.1.5XX]
[tar.gz][linux-arm64-targz-2.1.5XX] - [Checksum][linux-arm64-targz-checksum-2.1.5XX] | -| **RHEL 6** | [![][rhel-6-badge-master]][rhel-6-version-master]
[tar.gz][rhel-6-targz-master] - [Checksum][rhel-6-targz-checksum-master] | [![][rhel-6-badge-3.0.1xx]][rhel-6-version-3.0.1xx]
[tar.gz][rhel-6-targz-3.0.1xx] - [Checksum][rhel-6-targz-checksum-3.0.1xx] | [![][rhel-6-badge-3.0.100-preview8]][rhel-6-version-3.0.100-preview8]
[tar.gz][rhel-6-targz-3.0.100-preview8] - [Checksum][rhel-6-targz-checksum-3.0.100-preview8] | [![][rhel-6-badge-2.2.3XX]][rhel-6-version-2.2.3XX]
[tar.gz][rhel-6-targz-2.2.3XX] - [Checksum][rhel-6-targz-checksum-2.2.3XX] | [![][rhel-6-badge-2.2.2XX]][rhel-6-version-2.2.2XX]
[tar.gz][rhel-6-targz-2.2.2XX] - [Checksum][rhel-6-targz-checksum-2.2.2XX] | [![][rhel-6-badge-2.2.1XX]][rhel-6-version-2.2.1XX]
[tar.gz][rhel-6-targz-2.2.1XX] - [Checksum][rhel-6-targz-checksum-2.2.1XX] | [![][rhel-6-badge-2.1.7XX]][rhel-6-version-2.1.7XX]
[tar.gz][rhel-6-targz-2.1.7XX] - [Checksum][rhel-6-targz-checksum-2.1.7XX] | [![][rhel-6-badge-2.1.6XX]][rhel-6-version-2.1.6XX]
[tar.gz][rhel-6-targz-2.1.6XX] - [Checksum][rhel-6-targz-checksum-2.1.6XX] | [![][rhel-6-badge-2.1.5XX]][rhel-6-version-2.1.5XX]
[tar.gz][rhel-6-targz-2.1.5XX] - [Checksum][rhel-6-targz-checksum-2.1.5XX] | -| **Linux-musl** | [![][linux-musl-badge-master]][linux-musl-version-master]
[tar.gz][linux-musl-targz-master] - [Checksum][linux-musl-targz-checksum-master] | [![][linux-musl-badge-3.0.1xx]][linux-musl-version-3.0.1xx]
[tar.gz][linux-musl-targz-3.0.1xx] - [Checksum][linux-musl-targz-checksum-3.0.1xx] | [![][linux-musl-badge-3.0.100-preview8]][linux-musl-version-3.0.100-preview8]
[tar.gz][linux-musl-targz-3.0.100-preview8] - [Checksum][linux-musl-targz-checksum-3.0.100-preview8] | [![][linux-musl-badge-2.2.3XX]][linux-musl-version-2.2.3XX]
[tar.gz][linux-musl-targz-2.2.3XX] - [Checksum][linux-musl-targz-checksum-2.2.3XX] |[![][linux-musl-badge-2.2.2XX]][linux-musl-version-2.2.2XX]
[tar.gz][linux-musl-targz-2.2.2XX] - [Checksum][linux-musl-targz-checksum-2.2.2XX] |[![][linux-musl-badge-2.2.1XX]][linux-musl-version-2.2.1XX]
[tar.gz][linux-musl-targz-2.2.1XX] - [Checksum][linux-musl-targz-checksum-2.2.1XX] |[![][linux-musl-badge-2.1.7XX]][linux-musl-version-2.1.7XX]
[tar.gz][linux-musl-targz-2.1.7XX] - [Checksum][linux-musl-targz-checksum-2.1.7XX] | [![][linux-musl-badge-2.1.6XX]][linux-musl-version-2.1.6XX]
[tar.gz][linux-musl-targz-2.1.6XX] - [Checksum][linux-musl-targz-checksum-2.1.6XX] | [![][linux-musl-badge-2.1.5XX]][linux-musl-version-2.1.5XX]
[tar.gz][linux-musl-targz-2.1.5XX] - [Checksum][linux-musl-targz-checksum-2.1.5XX] | -| **Windows arm** | [![][win-arm-badge-master]][win-arm-version-master]
[zip][win-arm-zip-master] - [Checksum][win-arm-zip-checksum-master] | [![][win-arm-badge-3.0.1xx]][win-arm-version-3.0.1xx]
[zip][win-arm-zip-3.0.1xx] - [Checksum][win-arm-zip-checksum-3.0.1xx] | [![][win-arm-badge-3.0.100-preview8]][win-arm-version-3.0.100-preview8]
[zip][win-arm-zip-3.0.100-preview8] - [Checksum][win-arm-zip-checksum-3.0.100-preview8] | [![][win-arm-badge-2.2.3XX]][win-arm-version-2.2.3XX]
[zip][win-arm-zip-2.2.3XX] - [Checksum][win-arm-zip-checksum-2.2.3XX] | [![][win-arm-badge-2.2.2XX]][win-arm-version-2.2.2XX]
[zip][win-arm-zip-2.2.2XX] - [Checksum][win-arm-zip-checksum-2.2.2XX] | [![][win-arm-badge-2.2.1XX]][win-arm-version-2.2.1XX]
[zip][win-arm-zip-2.2.1XX] - [Checksum][win-arm-zip-checksum-2.2.1XX] | **N/A** | **N/A** | **N/A** | -| **FreeBSD x64** | [![][freebsd-x64-badge-master]][freebsd-x64-version-master]
[tar.gz][freebsd-x64-zip-master] - [Checksum][freebsd-x64-zip-checksum-master] | [![][freebsd-x64-badge-3.0.1xx]][freebsd-x64-version-3.0.1xx]
[tar.gz][freebsd-x64-zip-3.0.1xx] - [Checksum][freebsd-x64-zip-checksum-3.0.1xx] | [![][freebsd-x64-badge-3.0.100-preview8]][freebsd-x64-version-3.0.100-preview8]
[tar.gz][freebsd-x64-zip-3.0.100-preview8] - [Checksum][freebsd-x64-zip-checksum-3.0.100-preview8] | **N/A** | **N/A** | **N/A** | **N/A** | **N/A** | **N/A** | +| **Windows x64** | [![][win-x64-badge-master]][win-x64-version-master]
[Installer][win-x64-installer-master] - [Checksum][win-x64-installer-checksum-master]
[zip][win-x64-zip-master] - [Checksum][win-x64-zip-checksum-master] | [![][win-x64-badge-3.0.1xx]][win-x64-version-3.0.1xx]
[Installer][win-x64-installer-3.0.1xx] - [Checksum][win-x64-installer-checksum-3.0.1xx]
[zip][win-x64-zip-3.0.1xx] - [Checksum][win-x64-zip-checksum-3.0.1xx] | [![][win-x64-badge-3.0.100-preview9]][win-x64-version-3.0.100-preview9]
[Installer][win-x64-installer-3.0.100-preview9] - [Checksum][win-x64-installer-checksum-3.0.100-preview9]
[zip][win-x64-zip-3.0.100-preview9] - [Checksum][win-x64-zip-checksum-3.0.100-preview9] | [![][win-x64-badge-2.2.3XX]][win-x64-version-2.2.3XX]
[Installer][win-x64-installer-2.2.3XX] - [Checksum][win-x64-installer-checksum-2.2.3XX]
[zip][win-x64-zip-2.2.3XX] - [Checksum][win-x64-zip-checksum-2.2.3XX] |[![][win-x64-badge-2.2.2XX]][win-x64-version-2.2.2XX]
[Installer][win-x64-installer-2.2.2XX] - [Checksum][win-x64-installer-checksum-2.2.2XX]
[zip][win-x64-zip-2.2.2XX] - [Checksum][win-x64-zip-checksum-2.2.2XX] |[![][win-x64-badge-2.2.1XX]][win-x64-version-2.2.1XX]
[Installer][win-x64-installer-2.2.1XX] - [Checksum][win-x64-installer-checksum-2.2.1XX]
[zip][win-x64-zip-2.2.1XX] - [Checksum][win-x64-zip-checksum-2.2.1XX] |[![][win-x64-badge-2.1.7XX]][win-x64-version-2.1.7XX]
[Installer][win-x64-installer-2.1.7XX] - [Checksum][win-x64-installer-checksum-2.1.7XX]
[zip][win-x64-zip-2.1.7XX] - [Checksum][win-x64-zip-checksum-2.1.7XX] | [![][win-x64-badge-2.1.6XX]][win-x64-version-2.1.6XX]
[Installer][win-x64-installer-2.1.6XX] - [Checksum][win-x64-installer-checksum-2.1.6XX]
[zip][win-x64-zip-2.1.6XX] - [Checksum][win-x64-zip-checksum-2.1.6XX] | [![][win-x64-badge-2.1.5XX]][win-x64-version-2.1.5XX]
[Installer][win-x64-installer-2.1.5XX] - [Checksum][win-x64-installer-checksum-2.1.5XX]
[zip][win-x64-zip-2.1.5XX] - [Checksum][win-x64-zip-checksum-2.1.5XX] | +| **Windows x86** | [![][win-x86-badge-master]][win-x86-version-master]
[Installer][win-x86-installer-master] - [Checksum][win-x86-installer-checksum-master]
[zip][win-x86-zip-master] - [Checksum][win-x86-zip-checksum-master] | [![][win-x86-badge-3.0.1xx]][win-x86-version-3.0.1xx]
[Installer][win-x86-installer-3.0.1xx] - [Checksum][win-x86-installer-checksum-3.0.1xx]
[zip][win-x86-zip-3.0.1xx] - [Checksum][win-x86-zip-checksum-3.0.1xx] | [![][win-x86-badge-3.0.100-preview9]][win-x86-version-3.0.100-preview9]
[Installer][win-x86-installer-3.0.100-preview9] - [Checksum][win-x86-installer-checksum-3.0.100-preview9]
[zip][win-x86-zip-3.0.100-preview9] - [Checksum][win-x86-zip-checksum-3.0.100-preview9] | [![][win-x86-badge-2.2.3XX]][win-x86-version-2.2.3XX]
[Installer][win-x86-installer-2.2.3XX] - [Checksum][win-x86-installer-checksum-2.2.3XX]
[zip][win-x86-zip-2.2.3XX] - [Checksum][win-x86-zip-checksum-2.2.3XX] |[![][win-x86-badge-2.2.2XX]][win-x86-version-2.2.2XX]
[Installer][win-x86-installer-2.2.2XX] - [Checksum][win-x86-installer-checksum-2.2.2XX]
[zip][win-x86-zip-2.2.2XX] - [Checksum][win-x86-zip-checksum-2.2.2XX] |[![][win-x86-badge-2.2.1XX]][win-x86-version-2.2.1XX]
[Installer][win-x86-installer-2.2.1XX] - [Checksum][win-x86-installer-checksum-2.2.1XX]
[zip][win-x86-zip-2.2.1XX] - [Checksum][win-x86-zip-checksum-2.2.1XX] |[![][win-x86-badge-2.1.7XX]][win-x86-version-2.1.7XX]
[Installer][win-x86-installer-2.1.7XX] - [Checksum][win-x86-installer-checksum-2.1.7XX]
[zip][win-x86-zip-2.1.7XX] - [Checksum][win-x86-zip-checksum-2.1.7XX] | [![][win-x86-badge-2.1.6XX]][win-x86-version-2.1.6XX]
[Installer][win-x86-installer-2.1.6XX] - [Checksum][win-x86-installer-checksum-2.1.6XX]
[zip][win-x86-zip-2.1.6XX] - [Checksum][win-x86-zip-checksum-2.1.6XX] | [![][win-x86-badge-2.1.5XX]][win-x86-version-2.1.5XX]
[Installer][win-x86-installer-2.1.5XX] - [Checksum][win-x86-installer-checksum-2.1.5XX]
[zip][win-x86-zip-2.1.5XX] - [Checksum][win-x86-zip-checksum-2.1.5XX] | +| **macOS** | [![][osx-badge-master]][osx-version-master]
[Installer][osx-installer-master] - [Checksum][osx-installer-checksum-master]
[tar.gz][osx-targz-master] - [Checksum][osx-targz-checksum-master] | [![][osx-badge-3.0.1xx]][osx-version-3.0.1xx]
[Installer][osx-installer-3.0.1xx] - [Checksum][osx-installer-checksum-3.0.1xx]
[tar.gz][osx-targz-3.0.1xx] - [Checksum][osx-targz-checksum-3.0.1xx] | [![][osx-badge-3.0.100-preview9]][osx-version-3.0.100-preview9]
[Installer][osx-installer-3.0.100-preview9] - [Checksum][osx-installer-checksum-3.0.100-preview9]
[tar.gz][osx-targz-3.0.100-preview9] - [Checksum][osx-targz-checksum-3.0.100-preview9] | [![][osx-badge-2.2.3XX]][osx-version-2.2.3XX]
[Installer][osx-installer-2.2.3XX] - [Checksum][osx-installer-checksum-2.2.3XX]
[tar.gz][osx-targz-2.2.3XX] - [Checksum][osx-targz-checksum-2.2.3XX] |[![][osx-badge-2.2.2XX]][osx-version-2.2.2XX]
[Installer][osx-installer-2.2.2XX] - [Checksum][osx-installer-checksum-2.2.2XX]
[tar.gz][osx-targz-2.2.2XX] - [Checksum][osx-targz-checksum-2.2.2XX] |[![][osx-badge-2.2.1XX]][osx-version-2.2.1XX]
[Installer][osx-installer-2.2.1XX] - [Checksum][osx-installer-checksum-2.2.1XX]
[tar.gz][osx-targz-2.2.1XX] - [Checksum][osx-targz-checksum-2.2.1XX] |[![][osx-badge-2.1.7XX]][osx-version-2.1.7XX]
[Installer][osx-installer-2.1.7XX] - [Checksum][osx-installer-checksum-2.1.7XX]
[tar.gz][osx-targz-2.1.7XX] - [Checksum][osx-targz-checksum-2.1.7XX] | [![][osx-badge-2.1.6XX]][osx-version-2.1.6XX]
[Installer][osx-installer-2.1.6XX] - [Checksum][osx-installer-checksum-2.1.6XX]
[tar.gz][osx-targz-2.1.6XX] - [Checksum][osx-targz-checksum-2.1.6XX] | [![][osx-badge-2.1.5XX]][osx-version-2.1.5XX]
[Installer][osx-installer-2.1.5XX] - [Checksum][osx-installer-checksum-2.1.5XX]
[tar.gz][osx-targz-2.1.5XX] - [Checksum][osx-targz-checksum-2.1.5XX] | +| **Linux x64** | [![][linux-badge-master]][linux-version-master]
[DEB Installer][linux-DEB-installer-master] - [Checksum][linux-DEB-installer-checksum-master]
[RPM Installer][linux-RPM-installer-master] - [Checksum][linux-RPM-installer-checksum-master]
_see installer note below_1
[tar.gz][linux-targz-master] - [Checksum][linux-targz-checksum-master] | [![][linux-badge-3.0.1xx]][linux-version-3.0.1xx]
[DEB Installer][linux-DEB-installer-3.0.1xx] - [Checksum][linux-DEB-installer-checksum-3.0.1xx]
[RPM Installer][linux-RPM-installer-3.0.1xx] - [Checksum][linux-RPM-installer-checksum-3.0.1xx]
_see installer note below_1
[tar.gz][linux-targz-3.0.1xx] - [Checksum][linux-targz-checksum-3.0.1xx] | [![][linux-badge-3.0.100-preview9]][linux-version-3.0.100-preview9]
[DEB Installer][linux-DEB-installer-3.0.100-preview9] - [Checksum][linux-DEB-installer-checksum-3.0.100-preview9]
[RPM Installer][linux-RPM-installer-3.0.100-preview9] - [Checksum][linux-RPM-installer-checksum-3.0.100-preview9]
_see installer note below_1
[tar.gz][linux-targz-3.0.100-preview9] - [Checksum][linux-targz-checksum-3.0.100-preview9] | [![][linux-badge-2.2.3xx]][linux-version-2.2.3xx]
[DEB Installer][linux-DEB-installer-2.2.3XX] - [Checksum][linux-DEB-installer-checksum-2.2.3XX]
[RPM Installer][linux-RPM-installer-2.2.3XX] - [Checksum][linux-RPM-installer-checksum-2.2.3XX]
_see installer note below_1
[tar.gz][linux-targz-2.2.3XX] - [Checksum][linux-targz-checksum-2.2.3XX] |[![][linux-badge-2.2.2xx]][linux-version-2.2.2xx]
[DEB Installer][linux-DEB-installer-2.2.2XX] - [Checksum][linux-DEB-installer-checksum-2.2.2XX]
[RPM Installer][linux-RPM-installer-2.2.2XX] - [Checksum][linux-RPM-installer-checksum-2.2.2XX]
_see installer note below_1
[tar.gz][linux-targz-2.2.2XX] - [Checksum][linux-targz-checksum-2.2.2XX] |[![][linux-badge-2.2.1xx]][linux-version-2.2.1xx]
[DEB Installer][linux-DEB-installer-2.2.1XX] - [Checksum][linux-DEB-installer-checksum-2.2.1XX]
[RPM Installer][linux-RPM-installer-2.2.1XX] - [Checksum][linux-RPM-installer-checksum-2.2.1XX]
_see installer note below_1
[tar.gz][linux-targz-2.2.1XX] - [Checksum][linux-targz-checksum-2.2.1XX] |[![][linux-badge-2.1.7XX]][linux-version-2.1.7XX]
[DEB Installer][linux-DEB-installer-2.1.7XX] - [Checksum][linux-DEB-installer-checksum-2.1.7XX]
[RPM Installer][linux-RPM-installer-2.1.7XX] - [Checksum][linux-RPM-installer-checksum-2.1.7XX]
_see installer note below_1
[tar.gz][linux-targz-2.1.7XX] - [Checksum][linux-targz-checksum-2.1.7XX] | [![][linux-badge-2.1.6XX]][linux-version-2.1.6XX]
[DEB Installer][linux-DEB-installer-2.1.6XX] - [Checksum][linux-DEB-installer-checksum-2.1.6XX]
[RPM Installer][linux-RPM-installer-2.1.6XX] - [Checksum][linux-RPM-installer-checksum-2.1.6XX]
_see installer note below_1
[tar.gz][linux-targz-2.1.6XX] - [Checksum][linux-targz-checksum-2.1.6XX] | [![][linux-badge-2.1.5XX]][linux-version-2.1.5XX]
[DEB Installer][linux-DEB-installer-2.1.5XX] - [Checksum][linux-DEB-installer-checksum-2.1.5XX]
[RPM Installer][linux-RPM-installer-2.1.5XX] - [Checksum][linux-RPM-installer-checksum-2.1.5XX]
_see installer note below_1
[tar.gz][linux-targz-2.1.5XX] - [Checksum][linux-targz-checksum-2.1.5XX] | +| **Linux arm** | [![][linux-arm-badge-master]][linux-arm-version-master]
[tar.gz][linux-arm-targz-master] - [Checksum][linux-arm-targz-checksum-master] | [![][linux-arm-badge-3.0.1xx]][linux-arm-version-3.0.1xx]
[tar.gz][linux-arm-targz-3.0.1xx] - [Checksum][linux-arm-targz-checksum-3.0.1xx] | [![][linux-arm-badge-3.0.100-preview9]][linux-arm-version-3.0.100-preview9]
[tar.gz][linux-arm-targz-3.0.100-preview9] - [Checksum][linux-arm-targz-checksum-3.0.100-preview9] | [![][linux-arm-badge-2.2.3XX]][linux-arm-version-2.2.3XX]
[tar.gz][linux-arm-targz-2.2.3XX] - [Checksum][linux-arm-targz-checksum-2.2.3XX] |[![][linux-arm-badge-2.2.2XX]][linux-arm-version-2.2.2XX]
[tar.gz][linux-arm-targz-2.2.2XX] - [Checksum][linux-arm-targz-checksum-2.2.2XX] |[![][linux-arm-badge-2.2.1XX]][linux-arm-version-2.2.1XX]
[tar.gz][linux-arm-targz-2.2.1XX] - [Checksum][linux-arm-targz-checksum-2.2.1XX] |[![][linux-arm-badge-2.1.7XX]][linux-arm-version-2.1.7XX]
[tar.gz][linux-arm-targz-2.1.7XX] - [Checksum][linux-arm-targz-checksum-2.1.7XX] | [![][linux-arm-badge-2.1.6XX]][linux-arm-version-2.1.6XX]
[tar.gz][linux-arm-targz-2.1.6XX] - [Checksum][linux-arm-targz-checksum-2.1.6XX] | [![][linux-arm-badge-2.1.5XX]][linux-arm-version-2.1.5XX]
[tar.gz][linux-arm-targz-2.1.5XX] - [Checksum][linux-arm-targz-checksum-2.1.5XX] | +| **Linux arm64** | [![][linux-arm64-badge-master]][linux-arm64-version-master]
[tar.gz][linux-arm64-targz-master] - [Checksum][linux-arm64-targz-checksum-master] | [![][linux-arm64-badge-3.0.1xx]][linux-arm64-version-3.0.1xx]
[tar.gz][linux-arm64-targz-3.0.1xx] - [Checksum][linux-arm64-targz-checksum-3.0.1xx] | [![][linux-arm64-badge-3.0.100-preview9]][linux-arm64-version-3.0.100-preview9]
[tar.gz][linux-arm64-targz-3.0.100-preview9] - [Checksum][linux-arm64-targz-checksum-3.0.100-preview9] | [![][linux-arm64-badge-2.2.3XX]][linux-arm64-version-2.2.3XX]
[tar.gz][linux-arm64-targz-2.2.3XX] - [Checksum][linux-arm64-targz-checksum-2.2.3XX] |[![][linux-arm64-badge-2.2.2XX]][linux-arm64-version-2.2.2XX]
[tar.gz][linux-arm64-targz-2.2.2XX] - [Checksum][linux-arm64-targz-checksum-2.2.2XX] |[![][linux-arm64-badge-2.2.1XX]][linux-arm64-version-2.2.1XX]
[tar.gz][linux-arm64-targz-2.2.1XX] - [Checksum][linux-arm64-targz-checksum-2.2.1XX] |[![][linux-arm64-badge-2.1.7XX]][linux-arm64-version-2.1.7XX]
[tar.gz][linux-arm64-targz-2.1.7XX] - [Checksum][linux-arm64-targz-checksum-2.1.7XX] | [![][linux-arm64-badge-2.1.6XX]][linux-arm64-version-2.1.6XX]
[tar.gz][linux-arm64-targz-2.1.6XX] - [Checksum][linux-arm64-targz-checksum-2.1.6XX] | [![][linux-arm64-badge-2.1.5XX]][linux-arm64-version-2.1.5XX]
[tar.gz][linux-arm64-targz-2.1.5XX] - [Checksum][linux-arm64-targz-checksum-2.1.5XX] | +| **RHEL 6** | [![][rhel-6-badge-master]][rhel-6-version-master]
[tar.gz][rhel-6-targz-master] - [Checksum][rhel-6-targz-checksum-master] | [![][rhel-6-badge-3.0.1xx]][rhel-6-version-3.0.1xx]
[tar.gz][rhel-6-targz-3.0.1xx] - [Checksum][rhel-6-targz-checksum-3.0.1xx] | [![][rhel-6-badge-3.0.100-preview9]][rhel-6-version-3.0.100-preview9]
[tar.gz][rhel-6-targz-3.0.100-preview9] - [Checksum][rhel-6-targz-checksum-3.0.100-preview9] | [![][rhel-6-badge-2.2.3XX]][rhel-6-version-2.2.3XX]
[tar.gz][rhel-6-targz-2.2.3XX] - [Checksum][rhel-6-targz-checksum-2.2.3XX] | [![][rhel-6-badge-2.2.2XX]][rhel-6-version-2.2.2XX]
[tar.gz][rhel-6-targz-2.2.2XX] - [Checksum][rhel-6-targz-checksum-2.2.2XX] | [![][rhel-6-badge-2.2.1XX]][rhel-6-version-2.2.1XX]
[tar.gz][rhel-6-targz-2.2.1XX] - [Checksum][rhel-6-targz-checksum-2.2.1XX] | [![][rhel-6-badge-2.1.7XX]][rhel-6-version-2.1.7XX]
[tar.gz][rhel-6-targz-2.1.7XX] - [Checksum][rhel-6-targz-checksum-2.1.7XX] | [![][rhel-6-badge-2.1.6XX]][rhel-6-version-2.1.6XX]
[tar.gz][rhel-6-targz-2.1.6XX] - [Checksum][rhel-6-targz-checksum-2.1.6XX] | [![][rhel-6-badge-2.1.5XX]][rhel-6-version-2.1.5XX]
[tar.gz][rhel-6-targz-2.1.5XX] - [Checksum][rhel-6-targz-checksum-2.1.5XX] | +| **Linux-musl** | [![][linux-musl-badge-master]][linux-musl-version-master]
[tar.gz][linux-musl-targz-master] - [Checksum][linux-musl-targz-checksum-master] | [![][linux-musl-badge-3.0.1xx]][linux-musl-version-3.0.1xx]
[tar.gz][linux-musl-targz-3.0.1xx] - [Checksum][linux-musl-targz-checksum-3.0.1xx] | [![][linux-musl-badge-3.0.100-preview9]][linux-musl-version-3.0.100-preview9]
[tar.gz][linux-musl-targz-3.0.100-preview9] - [Checksum][linux-musl-targz-checksum-3.0.100-preview9] | [![][linux-musl-badge-2.2.3XX]][linux-musl-version-2.2.3XX]
[tar.gz][linux-musl-targz-2.2.3XX] - [Checksum][linux-musl-targz-checksum-2.2.3XX] |[![][linux-musl-badge-2.2.2XX]][linux-musl-version-2.2.2XX]
[tar.gz][linux-musl-targz-2.2.2XX] - [Checksum][linux-musl-targz-checksum-2.2.2XX] |[![][linux-musl-badge-2.2.1XX]][linux-musl-version-2.2.1XX]
[tar.gz][linux-musl-targz-2.2.1XX] - [Checksum][linux-musl-targz-checksum-2.2.1XX] |[![][linux-musl-badge-2.1.7XX]][linux-musl-version-2.1.7XX]
[tar.gz][linux-musl-targz-2.1.7XX] - [Checksum][linux-musl-targz-checksum-2.1.7XX] | [![][linux-musl-badge-2.1.6XX]][linux-musl-version-2.1.6XX]
[tar.gz][linux-musl-targz-2.1.6XX] - [Checksum][linux-musl-targz-checksum-2.1.6XX] | [![][linux-musl-badge-2.1.5XX]][linux-musl-version-2.1.5XX]
[tar.gz][linux-musl-targz-2.1.5XX] - [Checksum][linux-musl-targz-checksum-2.1.5XX] | +| **Windows arm** | [![][win-arm-badge-master]][win-arm-version-master]
[zip][win-arm-zip-master] - [Checksum][win-arm-zip-checksum-master] | [![][win-arm-badge-3.0.1xx]][win-arm-version-3.0.1xx]
[zip][win-arm-zip-3.0.1xx] - [Checksum][win-arm-zip-checksum-3.0.1xx] | [![][win-arm-badge-3.0.100-preview9]][win-arm-version-3.0.100-preview9]
[zip][win-arm-zip-3.0.100-preview9] - [Checksum][win-arm-zip-checksum-3.0.100-preview9] | [![][win-arm-badge-2.2.3XX]][win-arm-version-2.2.3XX]
[zip][win-arm-zip-2.2.3XX] - [Checksum][win-arm-zip-checksum-2.2.3XX] | [![][win-arm-badge-2.2.2XX]][win-arm-version-2.2.2XX]
[zip][win-arm-zip-2.2.2XX] - [Checksum][win-arm-zip-checksum-2.2.2XX] | [![][win-arm-badge-2.2.1XX]][win-arm-version-2.2.1XX]
[zip][win-arm-zip-2.2.1XX] - [Checksum][win-arm-zip-checksum-2.2.1XX] | **N/A** | **N/A** | **N/A** | +| **FreeBSD x64** | [![][freebsd-x64-badge-master]][freebsd-x64-version-master]
[tar.gz][freebsd-x64-zip-master] - [Checksum][freebsd-x64-zip-checksum-master] | [![][freebsd-x64-badge-3.0.1xx]][freebsd-x64-version-3.0.1xx]
[tar.gz][freebsd-x64-zip-3.0.1xx] - [Checksum][freebsd-x64-zip-checksum-3.0.1xx] | [![][freebsd-x64-badge-3.0.100-preview9]][freebsd-x64-version-3.0.100-preview9]
[tar.gz][freebsd-x64-zip-3.0.100-preview9] - [Checksum][freebsd-x64-zip-checksum-3.0.100-preview9] | **N/A** | **N/A** | **N/A** | **N/A** | **N/A** | **N/A** | | **Constituent Repo Shas** | **N/A** | [Git SHAs][sdk-shas-2.2.1XX] | **N/A** | **N/A** | **N/A** | **N/A** | **N/A** | **N/A** | Reference notes: @@ -85,12 +85,12 @@ Reference notes: [win-x64-zip-3.0.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.1xx/dotnet-sdk-latest-win-x64.zip [win-x64-zip-checksum-3.0.1XX]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.0.1xx/dotnet-sdk-latest-win-x64.zip.sha -[win-x64-badge-3.0.100-preview8]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview8/win_x64_Release_version_badge.svg -[win-x64-version-3.0.100-preview8]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview8/latest.version -[win-x64-installer-3.0.100-preview8]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview8/dotnet-sdk-latest-win-x64.exe -[win-x64-installer-checksum-3.0.100-preview8]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview8/dotnet-sdk-latest-win-x64.exe.sha -[win-x64-zip-3.0.100-preview8]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview8/dotnet-sdk-latest-win-x64.zip -[win-x64-zip-checksum-3.0.100-preview8]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview8/dotnet-sdk-latest-win-x64.zip.sha +[win-x64-badge-3.0.100-preview9]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview9/win_x64_Release_version_badge.svg +[win-x64-version-3.0.100-preview9]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview9/latest.version +[win-x64-installer-3.0.100-preview9]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview9/dotnet-sdk-latest-win-x64.exe +[win-x64-installer-checksum-3.0.100-preview9]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview9/dotnet-sdk-latest-win-x64.exe.sha +[win-x64-zip-3.0.100-preview9]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview9/dotnet-sdk-latest-win-x64.zip +[win-x64-zip-checksum-3.0.100-preview9]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview9/dotnet-sdk-latest-win-x64.zip.sha [win-x64-badge-2.2.3XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.2.3xx/win_x64_Release_version_badge.svg [win-x64-version-2.2.3XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.2.3xx/latest.version @@ -148,12 +148,12 @@ Reference notes: [win-x86-zip-3.0.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.1xx/dotnet-sdk-latest-win-x86.zip [win-x86-zip-checksum-3.0.1XX]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.0.1xx/dotnet-sdk-latest-win-x86.zip.sha -[win-x86-badge-3.0.100-preview8]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview8/win_x86_Release_version_badge.svg -[win-x86-version-3.0.100-preview8]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview8/latest.version -[win-x86-installer-3.0.100-preview8]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview8/dotnet-sdk-latest-win-x86.exe -[win-x86-installer-checksum-3.0.100-preview8]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview8/dotnet-sdk-latest-win-x86.exe.sha -[win-x86-zip-3.0.100-preview8]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview8/dotnet-sdk-latest-win-x86.zip -[win-x86-zip-checksum-3.0.100-preview8]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview8/dotnet-sdk-latest-win-x86.zip.sha +[win-x86-badge-3.0.100-preview9]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview9/win_x86_Release_version_badge.svg +[win-x86-version-3.0.100-preview9]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview9/latest.version +[win-x86-installer-3.0.100-preview9]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview9/dotnet-sdk-latest-win-x86.exe +[win-x86-installer-checksum-3.0.100-preview9]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview9/dotnet-sdk-latest-win-x86.exe.sha +[win-x86-zip-3.0.100-preview9]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview9/dotnet-sdk-latest-win-x86.zip +[win-x86-zip-checksum-3.0.100-preview9]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview9/dotnet-sdk-latest-win-x86.zip.sha [win-x86-badge-2.2.3XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.2.3xx/win_x86_Release_version_badge.svg [win-x86-version-2.2.3XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.2.3xx/latest.version @@ -211,12 +211,12 @@ Reference notes: [osx-targz-3.0.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.1xx/dotnet-sdk-latest-osx-x64.tar.gz [osx-targz-checksum-3.0.1XX]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.0.1xx/dotnet-sdk-latest-osx-x64.tar.gz.sha -[osx-badge-3.0.100-preview8]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview8/osx_x64_Release_version_badge.svg -[osx-version-3.0.100-preview8]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview8/latest.version -[osx-installer-3.0.100-preview8]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview8/dotnet-sdk-latest-osx-x64.pkg -[osx-installer-checksum-3.0.100-preview8]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview8/dotnet-sdk-latest-osx-x64.pkg.sha -[osx-targz-3.0.100-preview8]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview8/dotnet-sdk-latest-osx-x64.tar.gz -[osx-targz-checksum-3.0.100-preview8]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview8/dotnet-sdk-latest-osx-x64.tar.gz.sha +[osx-badge-3.0.100-preview9]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview9/osx_x64_Release_version_badge.svg +[osx-version-3.0.100-preview9]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview9/latest.version +[osx-installer-3.0.100-preview9]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview9/dotnet-sdk-latest-osx-x64.pkg +[osx-installer-checksum-3.0.100-preview9]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview9/dotnet-sdk-latest-osx-x64.pkg.sha +[osx-targz-3.0.100-preview9]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview9/dotnet-sdk-latest-osx-x64.tar.gz +[osx-targz-checksum-3.0.100-preview9]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview9/dotnet-sdk-latest-osx-x64.tar.gz.sha [osx-badge-2.2.3XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.2.3xx/osx_x64_Release_version_badge.svg [osx-version-2.2.3XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.2.3xx/latest.version @@ -278,14 +278,14 @@ Reference notes: [linux-targz-3.0.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.1xx/dotnet-sdk-latest-linux-x64.tar.gz [linux-targz-checksum-3.0.1XX]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.0.1xx/dotnet-sdk-latest-linux-x64.tar.gz.sha -[linux-badge-3.0.100-preview8]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview8/linux_x64_Release_version_badge.svg -[linux-version-3.0.100-preview8]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview8/latest.version -[linux-DEB-installer-3.0.100-preview8]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview8/dotnet-sdk-latest-x64.deb -[linux-DEB-installer-checksum-3.0.100-preview8]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview8/dotnet-sdk-latest-x64.deb.sha -[linux-RPM-installer-3.0.100-preview8]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview8/dotnet-sdk-latest-x64.rpm -[linux-RPM-installer-checksum-3.0.100-preview8]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview8/dotnet-sdk-latest-x64.rpm.sha -[linux-targz-3.0.100-preview8]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview8/dotnet-sdk-latest-linux-x64.tar.gz -[linux-targz-checksum-3.0.100-preview8]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview8/dotnet-sdk-latest-linux-x64.tar.gz.sha +[linux-badge-3.0.100-preview9]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview9/linux_x64_Release_version_badge.svg +[linux-version-3.0.100-preview9]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview9/latest.version +[linux-DEB-installer-3.0.100-preview9]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview9/dotnet-sdk-latest-x64.deb +[linux-DEB-installer-checksum-3.0.100-preview9]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview9/dotnet-sdk-latest-x64.deb.sha +[linux-RPM-installer-3.0.100-preview9]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview9/dotnet-sdk-latest-x64.rpm +[linux-RPM-installer-checksum-3.0.100-preview9]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview9/dotnet-sdk-latest-x64.rpm.sha +[linux-targz-3.0.100-preview9]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview9/dotnet-sdk-latest-linux-x64.tar.gz +[linux-targz-checksum-3.0.100-preview9]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview9/dotnet-sdk-latest-linux-x64.tar.gz.sha [linux-badge-2.2.3xx]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.2.3xx/linux_x64_Release_version_badge.svg [linux-version-2.2.3xx]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.2.3xx/latest.version @@ -351,10 +351,10 @@ Reference notes: [linux-arm-targz-3.0.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.1xx/dotnet-sdk-latest-linux-arm.tar.gz [linux-arm-targz-checksum-3.0.1XX]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.0.1xx/dotnet-sdk-latest-linux-arm.tar.gz.sha -[linux-arm-badge-3.0.100-preview8]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview8/linux_arm_Release_version_badge.svg -[linux-arm-version-3.0.100-preview8]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview8/latest.version -[linux-arm-targz-3.0.100-preview8]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview8/dotnet-sdk-latest-linux-arm.tar.gz -[linux-arm-targz-checksum-3.0.100-preview8]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview8/dotnet-sdk-latest-linux-arm.tar.gz.sha +[linux-arm-badge-3.0.100-preview9]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview9/linux_arm_Release_version_badge.svg +[linux-arm-version-3.0.100-preview9]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview9/latest.version +[linux-arm-targz-3.0.100-preview9]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview9/dotnet-sdk-latest-linux-arm.tar.gz +[linux-arm-targz-checksum-3.0.100-preview9]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview9/dotnet-sdk-latest-linux-arm.tar.gz.sha [linux-arm-badge-2.2.3XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.2.3xx/linux_arm_Release_version_badge.svg [linux-arm-version-2.2.3XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.2.3xx/latest.version @@ -396,10 +396,10 @@ Reference notes: [linux-arm64-targz-3.0.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.1xx/dotnet-sdk-latest-linux-arm64.tar.gz [linux-arm64-targz-checksum-3.0.1XX]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.0.1xx/dotnet-sdk-latest-linux-arm64.tar.gz.sha -[linux-arm64-badge-3.0.100-preview8]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview8/linux_arm64_Release_version_badge.svg -[linux-arm64-version-3.0.100-preview8]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview8/latest.version -[linux-arm64-targz-3.0.100-preview8]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview8/dotnet-sdk-latest-linux-arm64.tar.gz -[linux-arm64-targz-checksum-3.0.100-preview8]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview8/dotnet-sdk-latest-linux-arm64.tar.gz.sha +[linux-arm64-badge-3.0.100-preview9]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview9/linux_arm64_Release_version_badge.svg +[linux-arm64-version-3.0.100-preview9]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview9/latest.version +[linux-arm64-targz-3.0.100-preview9]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview9/dotnet-sdk-latest-linux-arm64.tar.gz +[linux-arm64-targz-checksum-3.0.100-preview9]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview9/dotnet-sdk-latest-linux-arm64.tar.gz.sha [linux-arm64-badge-2.2.3XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.2.3xx/linux_arm64_Release_version_badge.svg [linux-arm64-version-2.2.3XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.2.3xx/latest.version @@ -441,10 +441,10 @@ Reference notes: [rhel-6-targz-3.0.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.1xx/dotnet-sdk-latest-rhel.6-x64.tar.gz [rhel-6-targz-checksum-3.0.1XX]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.0.1xx/dotnet-sdk-latest-rhel.6-x64.tar.gz.sha -[rhel-6-badge-3.0.100-preview8]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview8/rhel.6_x64_Release_version_badge.svg -[rhel-6-version-3.0.100-preview8]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview8/latest.version -[rhel-6-targz-3.0.100-preview8]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview8/dotnet-sdk-latest-rhel.6-x64.tar.gz -[rhel-6-targz-checksum-3.0.100-preview8]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview8/dotnet-sdk-latest-rhel.6-x64.tar.gz.sha +[rhel-6-badge-3.0.100-preview9]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview9/rhel.6_x64_Release_version_badge.svg +[rhel-6-version-3.0.100-preview9]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview9/latest.version +[rhel-6-targz-3.0.100-preview9]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview9/dotnet-sdk-latest-rhel.6-x64.tar.gz +[rhel-6-targz-checksum-3.0.100-preview9]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview9/dotnet-sdk-latest-rhel.6-x64.tar.gz.sha [rhel-6-badge-2.2.3XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.2.3xx/rhel.6_x64_Release_version_badge.svg [rhel-6-version-2.2.3XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.2.3xx/latest.version @@ -486,10 +486,10 @@ Reference notes: [linux-musl-targz-3.0.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.1xx/dotnet-sdk-latest-linux-musl-x64.tar.gz [linux-musl-targz-checksum-3.0.1XX]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.0.1xx/dotnet-sdk-latest-linux-musl-x64.tar.gz.sha -[linux-musl-badge-3.0.100-preview8]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview8/linux_musl_x64_Release_version_badge.svg -[linux-musl-version-3.0.100-preview8]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview8/latest.version -[linux-musl-targz-3.0.100-preview8]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview8/dotnet-sdk-latest-linux-musl-x64.tar.gz -[linux-musl-targz-checksum-3.0.100-preview8]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview8/dotnet-sdk-latest-linux-musl-x64.tar.gz.sha +[linux-musl-badge-3.0.100-preview9]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview9/linux_musl_x64_Release_version_badge.svg +[linux-musl-version-3.0.100-preview9]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview9/latest.version +[linux-musl-targz-3.0.100-preview9]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview9/dotnet-sdk-latest-linux-musl-x64.tar.gz +[linux-musl-targz-checksum-3.0.100-preview9]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview9/dotnet-sdk-latest-linux-musl-x64.tar.gz.sha [linux-musl-badge-2.2.3XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.2.3xx/linux_musl_x64_Release_version_badge.svg [linux-musl-version-2.2.3XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.2.3xx/latest.version @@ -531,10 +531,10 @@ Reference notes: [win-arm-zip-3.0.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.1xx/dotnet-sdk-latest-win-arm.zip [win-arm-zip-checksum-3.0.1XX]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.0.1xx/dotnet-sdk-latest-win-arm.zip.sha -[win-arm-badge-3.0.100-preview8]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview8/win_arm_Release_version_badge.svg -[win-arm-version-3.0.100-preview8]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview8/latest.version -[win-arm-zip-3.0.100-preview8]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview8/dotnet-sdk-latest-win-arm.zip -[win-arm-zip-checksum-3.0.100-preview8]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview8/dotnet-sdk-latest-win-arm.zip.sha +[win-arm-badge-3.0.100-preview9]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview9/win_arm_Release_version_badge.svg +[win-arm-version-3.0.100-preview9]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview9/latest.version +[win-arm-zip-3.0.100-preview9]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview9/dotnet-sdk-latest-win-arm.zip +[win-arm-zip-checksum-3.0.100-preview9]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview9/dotnet-sdk-latest-win-arm.zip.sha [win-arm-badge-2.2.3XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.2.3xx/win_arm_Release_version_badge.svg [win-arm-version-2.2.3XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.2.3xx/latest.version @@ -561,10 +561,10 @@ Reference notes: [freebsd-x64-zip-3.0.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.1xx/dotnet-sdk-latest-freebsd-x64.tar.gz [freebsd-x64-zip-checksum-3.0.1XX]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.0.1xx/dotnet-sdk-latest-freebsd-x64.tar.gz.sha -[freebsd-x64-badge-3.0.100-preview8]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview8/freebsd_x64_Release_version_badge.svg -[freebsd-x64-version-3.0.100-preview8]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview8/latest.version -[freebsd-x64-zip-3.0.100-preview8]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview8/dotnet-sdk-latest-freebsd-x64.tar.gz -[freebsd-x64-zip-checksum-3.0.100-preview8]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview8/dotnet-sdk-latest-freebsd-x64.tar.gz.sha +[freebsd-x64-badge-3.0.100-preview9]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview9/freebsd_x64_Release_version_badge.svg +[freebsd-x64-version-3.0.100-preview9]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview9/latest.version +[freebsd-x64-zip-3.0.100-preview9]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview9/dotnet-sdk-latest-freebsd-x64.tar.gz +[freebsd-x64-zip-checksum-3.0.100-preview9]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.0.100-preview9/dotnet-sdk-latest-freebsd-x64.tar.gz.sha [sdk-shas-2.2.1XX]: https://github.com/dotnet/versions/tree/master/build-info/dotnet/product/cli/release/2.2#built-repositories From 3e976821ea0fc03e7dcbe2126931716e64c8d958 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 20 Aug 2019 22:33:52 +0000 Subject: [PATCH 002/420] Update dependencies from https://github.com/dotnet/toolset build 20190820.12 (#4116) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview9.19420.12 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview9.19420.2 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 53a36812e..55522f48d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - d3f396b8344d51f7ab7c792d508b040e96e8f78c + 16ad4ce66f73b1876c59980c7498d3873950fc59 https://github.com/dotnet/sdk 21ebcc7ff5b9136ecaaf2b1f362f5588c3cc520a - + https://github.com/dotnet/cli - d09bb4bfd02464d35eb8ff3c1f1b429629e14d49 + e56957011e5325933a186b5e63389bd7738a62fb diff --git a/eng/Versions.props b/eng/Versions.props index 9949f8ae9..fbfc2c494 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview9.19419.5 + 3.0.100-preview9.19420.12 @@ -33,7 +33,7 @@ - 3.0.100-preview9.19419.1 + 3.0.100-preview9.19420.2 0.2.0 From 053b2736c338e5e31d8ce630521db4c2f70b231c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 21 Aug 2019 00:27:57 +0000 Subject: [PATCH 003/420] Update dependencies from https://github.com/aspnet/AspNetCore build 20190820.5 (#4118) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview9.19420.5 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview9.19420.5 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview9.19420.5 - dotnet-watch - 3.0.0-preview9.19420.5 - dotnet-user-secrets - 3.0.0-preview9.19420.5 - dotnet-dev-certs - 3.0.0-preview9.19420.5 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 55522f48d..aea196450 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup 33656b4bd015e62836fb3ee52a914b73c40052e9 - + https://github.com/aspnet/AspNetCore - 5678f84d60fd76ce417838b8a7a14bcd48cf3f91 + 733218c6520edf03971f7befef4e39b6d4076a9f - + https://github.com/aspnet/AspNetCore - 5678f84d60fd76ce417838b8a7a14bcd48cf3f91 + 733218c6520edf03971f7befef4e39b6d4076a9f - + https://github.com/aspnet/AspNetCore - 5678f84d60fd76ce417838b8a7a14bcd48cf3f91 + 733218c6520edf03971f7befef4e39b6d4076a9f - + https://github.com/aspnet/AspNetCore - 5678f84d60fd76ce417838b8a7a14bcd48cf3f91 + 733218c6520edf03971f7befef4e39b6d4076a9f - + https://github.com/aspnet/AspNetCore - 5678f84d60fd76ce417838b8a7a14bcd48cf3f91 + 733218c6520edf03971f7befef4e39b6d4076a9f - + https://github.com/aspnet/AspNetCore - 5678f84d60fd76ce417838b8a7a14bcd48cf3f91 + 733218c6520edf03971f7befef4e39b6d4076a9f https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index fbfc2c494..757e0d4f8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-preview9.19419.1 - 3.0.0-preview9.19419.1 - 3.0.0-preview9.19419.1 - 3.0.0-preview9.19419.1 - 3.0.0-preview9.19419.1 - 3.0.0-preview9.19419.1 + 3.0.0-preview9.19420.5 + 3.0.0-preview9.19420.5 + 3.0.0-preview9.19420.5 + 3.0.0-preview9.19420.5 + 3.0.0-preview9.19420.5 + 3.0.0-preview9.19420.5 From 9f5aaa62402c46a4187c7470476db9b2c8df03ce Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 21 Aug 2019 15:32:46 +0000 Subject: [PATCH 004/420] Update dependencies from https://github.com/dotnet/arcade build 20190821.1 (#4133) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19421.1 --- eng/Version.Details.xml | 4 +- eng/common/init-tools-native.sh | 4 +- eng/common/native/install-cmake-test.sh | 117 +++++++++++++ eng/common/native/install-cmake.sh | 2 +- eng/common/performance/performance-setup.ps1 | 4 +- eng/common/performance/performance-setup.sh | 43 +++-- eng/common/post-build/darc-gather-drop.ps1 | 10 ++ eng/common/post-build/dotnetsymbol-init.ps1 | 29 --- eng/common/post-build/sourcelink-cli-init.ps1 | 29 --- .../post-build/sourcelink-validation.ps1 | 82 ++++++--- eng/common/sdl/execute-all-sdl-tools.ps1 | 4 +- eng/common/sdl/packages.config | 2 +- eng/common/sdl/run-sdl.ps1 | 30 ++-- eng/common/templates/job/execute-sdl.yml | 4 +- eng/common/templates/job/job.yml | 6 +- .../channels/internal-servicing.yml | 23 ++- .../post-build/channels/netcore-dev-5.yml | 165 ++++++++++++++++++ .../channels/netcore-tools-latest.yml | 165 ++++++++++++++++++ .../channels/public-dev-release.yml | 29 ++- .../post-build/channels/public-release.yml | 24 ++- .../channels/public-validation-release.yml | 14 +- .../templates/post-build/common-variables.yml | 15 ++ .../templates/post-build/darc-gather-drop.yml | 2 +- .../templates/post-build/post-build.yml | 38 +++- .../templates/post-build/promote-build.yml | 2 +- eng/common/tools.ps1 | 9 +- eng/common/tools.sh | 6 +- global.json | 2 +- 28 files changed, 704 insertions(+), 160 deletions(-) create mode 100644 eng/common/native/install-cmake-test.sh delete mode 100644 eng/common/post-build/dotnetsymbol-init.ps1 delete mode 100644 eng/common/post-build/sourcelink-cli-init.ps1 create mode 100644 eng/common/templates/post-build/channels/netcore-dev-5.yml create mode 100644 eng/common/templates/post-build/channels/netcore-tools-latest.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aea196450..8defa1ed7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,9 +65,9 @@ - + https://github.com/dotnet/arcade - 8b670142ae1b65aa4d834257b0b64d4f69f30eb8 + 7aa107d818fe87e627154c0331d6de5d47f39a45 diff --git a/eng/common/init-tools-native.sh b/eng/common/init-tools-native.sh index 5f2e77f44..4dafaaca1 100755 --- a/eng/common/init-tools-native.sh +++ b/eng/common/init-tools-native.sh @@ -70,8 +70,7 @@ function ReadGlobalJsonNativeTools { # Only extract the contents of the object. local native_tools_list=$(echo $native_tools_section | awk -F"[{}]" '{print $2}') native_tools_list=${native_tools_list//[\" ]/} - native_tools_list=${native_tools_list//,/$'\n'} - native_tools_list="$(echo -e "${native_tools_list}" | tr -d '[[:space:]]')" + native_tools_list=$( echo "$native_tools_list" | sed 's/\s//g' | sed 's/,/\n/g' ) local old_IFS=$IFS while read -r line; do @@ -108,6 +107,7 @@ else installer_command+=" --baseuri $base_uri" installer_command+=" --installpath $install_bin" installer_command+=" --version $tool_version" + echo $installer_command if [[ $force = true ]]; then installer_command+=" --force" diff --git a/eng/common/native/install-cmake-test.sh b/eng/common/native/install-cmake-test.sh new file mode 100644 index 000000000..53ddf4e68 --- /dev/null +++ b/eng/common/native/install-cmake-test.sh @@ -0,0 +1,117 @@ +#!/usr/bin/env bash + +source="${BASH_SOURCE[0]}" +scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + +. $scriptroot/common-library.sh + +base_uri= +install_path= +version= +clean=false +force=false +download_retries=5 +retry_wait_time_seconds=30 + +while (($# > 0)); do + lowerI="$(echo $1 | awk '{print tolower($0)}')" + case $lowerI in + --baseuri) + base_uri=$2 + shift 2 + ;; + --installpath) + install_path=$2 + shift 2 + ;; + --version) + version=$2 + shift 2 + ;; + --clean) + clean=true + shift 1 + ;; + --force) + force=true + shift 1 + ;; + --downloadretries) + download_retries=$2 + shift 2 + ;; + --retrywaittimeseconds) + retry_wait_time_seconds=$2 + shift 2 + ;; + --help) + echo "Common settings:" + echo " --baseuri Base file directory or Url wrom which to acquire tool archives" + echo " --installpath Base directory to install native tool to" + echo " --clean Don't install the tool, just clean up the current install of the tool" + echo " --force Force install of tools even if they previously exist" + echo " --help Print help and exit" + echo "" + echo "Advanced settings:" + echo " --downloadretries Total number of retry attempts" + echo " --retrywaittimeseconds Wait time between retry attempts in seconds" + echo "" + exit 0 + ;; + esac +done + +tool_name="cmake-test" +tool_os=$(GetCurrentOS) +tool_folder=$(echo $tool_os | awk '{print tolower($0)}') +tool_arch="x86_64" +tool_name_moniker="$tool_name-$version-$tool_os-$tool_arch" +tool_install_directory="$install_path/$tool_name/$version" +tool_file_path="$tool_install_directory/$tool_name_moniker/bin/$tool_name" +shim_path="$install_path/$tool_name.sh" +uri="${base_uri}/$tool_folder/$tool_name/$tool_name_moniker.tar.gz" + +# Clean up tool and installers +if [[ $clean = true ]]; then + echo "Cleaning $tool_install_directory" + if [[ -d $tool_install_directory ]]; then + rm -rf $tool_install_directory + fi + + echo "Cleaning $shim_path" + if [[ -f $shim_path ]]; then + rm -rf $shim_path + fi + + tool_temp_path=$(GetTempPathFileName $uri) + echo "Cleaning $tool_temp_path" + if [[ -f $tool_temp_path ]]; then + rm -rf $tool_temp_path + fi + + exit 0 +fi + +# Install tool +if [[ -f $tool_file_path ]] && [[ $force = false ]]; then + echo "$tool_name ($version) already exists, skipping install" + exit 0 +fi + +DownloadAndExtract $uri $tool_install_directory $force $download_retries $retry_wait_time_seconds + +if [[ $? != 0 ]]; then + echo "Installation failed" >&2 + exit 1 +fi + +# Generate Shim +# Always rewrite shims so that we are referencing the expected version +NewScriptShim $shim_path $tool_file_path true + +if [[ $? != 0 ]]; then + echo "Shim generation failed" >&2 + exit 1 +fi + +exit 0 \ No newline at end of file diff --git a/eng/common/native/install-cmake.sh b/eng/common/native/install-cmake.sh index 293af6017..5f1a182fa 100755 --- a/eng/common/native/install-cmake.sh +++ b/eng/common/native/install-cmake.sh @@ -69,7 +69,7 @@ tool_name_moniker="$tool_name-$version-$tool_os-$tool_arch" tool_install_directory="$install_path/$tool_name/$version" tool_file_path="$tool_install_directory/$tool_name_moniker/bin/$tool_name" shim_path="$install_path/$tool_name.sh" -uri="${base_uri}/$tool_folder/cmake/$tool_name_moniker.tar.gz" +uri="${base_uri}/$tool_folder/$tool_name/$tool_name_moniker.tar.gz" # Clean up tool and installers if [[ $clean = true ]]; then diff --git a/eng/common/performance/performance-setup.ps1 b/eng/common/performance/performance-setup.ps1 index 7e5441f79..4a6706b63 100644 --- a/eng/common/performance/performance-setup.ps1 +++ b/eng/common/performance/performance-setup.ps1 @@ -2,7 +2,7 @@ Param( [string] $SourceDirectory=$env:BUILD_SOURCESDIRECTORY, [string] $CoreRootDirectory, [string] $Architecture="x64", - [string] $Framework="netcoreapp3.0", + [string] $Framework="netcoreapp5.0", [string] $CompilationMode="Tiered", [string] $Repository=$env:BUILD_REPOSITORY_NAME, [string] $Branch=$env:BUILD_SOURCEBRANCH, @@ -33,7 +33,7 @@ if ($Framework.StartsWith("netcoreapp")) { } if ($Internal) { - $Queue = "Windows.10.Amd64.ClientRS5.Perf" + $Queue = "Windows.10.Amd64.19H1.Tiger.Perf" $PerfLabArguments = "--upload-to-perflab-container" $ExtraBenchmarkDotNetArguments = "" $Creator = "" diff --git a/eng/common/performance/performance-setup.sh b/eng/common/performance/performance-setup.sh index 126da5f76..76126b1f8 100755 --- a/eng/common/performance/performance-setup.sh +++ b/eng/common/performance/performance-setup.sh @@ -3,7 +3,7 @@ source_directory=$BUILD_SOURCESDIRECTORY core_root_directory= architecture=x64 -framework=netcoreapp3.0 +framework=netcoreapp5.0 compilation_mode=tiered repository=$BUILD_REPOSITORY_NAME branch=$BUILD_SOURCEBRANCH @@ -132,7 +132,7 @@ if [[ "$internal" == true ]]; then if [[ "$architecture" = "arm64" ]]; then queue=Ubuntu.1804.Arm64.Perf else - queue=Ubuntu.1804.Amd64.Perf + queue=Ubuntu.1804.Amd64.Tiger.Perf fi fi @@ -156,21 +156,26 @@ if [[ "$use_core_run" = true ]]; then mv $core_root_directory $new_core_root fi +ci=true + +_script_dir=$(pwd)/eng/common +. "$_script_dir/pipeline-logging-functions.sh" + # Make sure all of our variables are available for future steps -echo "##vso[task.setvariable variable=UseCoreRun]$use_core_run" -echo "##vso[task.setvariable variable=Architecture]$architecture" -echo "##vso[task.setvariable variable=PayloadDirectory]$payload_directory" -echo "##vso[task.setvariable variable=PerformanceDirectory]$performance_directory" -echo "##vso[task.setvariable variable=WorkItemDirectory]$workitem_directory" -echo "##vso[task.setvariable variable=Queue]$queue" -echo "##vso[task.setvariable variable=SetupArguments]$setup_arguments" -echo "##vso[task.setvariable variable=Python]python3" -echo "##vso[task.setvariable variable=PerfLabArguments]$perflab_arguments" -echo "##vso[task.setvariable variable=ExtraBenchmarkDotNetArguments]$extra_benchmark_dotnet_arguments" -echo "##vso[task.setvariable variable=BDNCategories]$run_categories" -echo "##vso[task.setvariable variable=TargetCsproj]$csproj" -echo "##vso[task.setvariable variable=RunFromPerfRepo]$run_from_perf_repo" -echo "##vso[task.setvariable variable=Creator]$creator" -echo "##vso[task.setvariable variable=HelixSourcePrefix]$helix_source_prefix" -echo "##vso[task.setvariable variable=Kind]$kind" -echo "##vso[task.setvariable variable=_BuildConfig]$architecture.$kind.$framework" \ No newline at end of file +Write-PipelineSetVariable -name "UseCoreRun" -value "$use_core_run" -is_multi_job_variable false +Write-PipelineSetVariable -name "Architecture" -value "$architecture" -is_multi_job_variable false +Write-PipelineSetVariable -name "PayloadDirectory" -value "$payload_directory" -is_multi_job_variable false +Write-PipelineSetVariable -name "PerformanceDirectory" -value "$performance_directory" -is_multi_job_variable false +Write-PipelineSetVariable -name "WorkItemDirectory" -value "$workitem_directory" -is_multi_job_variable false +Write-PipelineSetVariable -name "Queue" -value "$queue" -is_multi_job_variable false +Write-PipelineSetVariable -name "SetupArguments" -value "$setup_arguments" -is_multi_job_variable false +Write-PipelineSetVariable -name "Python" -value "$python3" -is_multi_job_variable false +Write-PipelineSetVariable -name "PerfLabArguments" -value "$perflab_arguments" -is_multi_job_variable false +Write-PipelineSetVariable -name "ExtraBenchmarkDotNetArguments" -value "$extra_benchmark_dotnet_arguments" -is_multi_job_variable false +Write-PipelineSetVariable -name "BDNCategories" -value "$run_categories" -is_multi_job_variable false +Write-PipelineSetVariable -name "TargetCsproj" -value "$csproj" -is_multi_job_variable false +Write-PipelineSetVariable -name "RunFromPerfRepo" -value "$run_from_perf_repo" -is_multi_job_variable false +Write-PipelineSetVariable -name "Creator" -value "$creator" -is_multi_job_variable false +Write-PipelineSetVariable -name "HelixSourcePrefix" -value "$helix_source_prefix" -is_multi_job_variable false +Write-PipelineSetVariable -name "Kind" -value "$kind" -is_multi_job_variable false +Write-PipelineSetVariable -name "_BuildConfig" -value "$architecture.$kind.$framework" -is_multi_job_variable false \ No newline at end of file diff --git a/eng/common/post-build/darc-gather-drop.ps1 b/eng/common/post-build/darc-gather-drop.ps1 index 93a0bd832..89854d3c1 100644 --- a/eng/common/post-build/darc-gather-drop.ps1 +++ b/eng/common/post-build/darc-gather-drop.ps1 @@ -19,7 +19,17 @@ try { ExitWithExitCode $exitCode } + # For now, only use a dry run. + # Ideally we would change darc to enable a quick request that + # would check whether the file exists that you can download it, + # and that it won't conflict with other files. + # https://github.com/dotnet/arcade/issues/3674 + # Right now we can't remove continue-on-error because we ocassionally will have + # dependencies that have no associated builds (e.g. an old dependency). + # We need to add an option to baseline specific dependencies away, or add them manually + # to the BAR. darc gather-drop --non-shipping ` + --dry-run ` --continue-on-error ` --id $BarBuildId ` --output-dir $DropLocation ` diff --git a/eng/common/post-build/dotnetsymbol-init.ps1 b/eng/common/post-build/dotnetsymbol-init.ps1 deleted file mode 100644 index e7659b98c..000000000 --- a/eng/common/post-build/dotnetsymbol-init.ps1 +++ /dev/null @@ -1,29 +0,0 @@ -param ( - $dotnetsymbolVersion = $null -) - -$ErrorActionPreference = "Stop" -Set-StrictMode -Version 2.0 - -. $PSScriptRoot\..\tools.ps1 - -$verbosity = "minimal" - -function Installdotnetsymbol ($dotnetsymbolVersion) { - $dotnetsymbolPackageName = "dotnet-symbol" - - $dotnetRoot = InitializeDotNetCli -install:$true - $dotnet = "$dotnetRoot\dotnet.exe" - $toolList = & "$dotnet" tool list --global - - if (($toolList -like "*$dotnetsymbolPackageName*") -and ($toolList -like "*$dotnetsymbolVersion*")) { - Write-Host "dotnet-symbol version $dotnetsymbolVersion is already installed." - } - else { - Write-Host "Installing dotnet-symbol version $dotnetsymbolVersion..." - Write-Host "You may need to restart your command window if this is the first dotnet tool you have installed." - & "$dotnet" tool install $dotnetsymbolPackageName --version $dotnetsymbolVersion --verbosity $verbosity --global - } -} - -Installdotnetsymbol $dotnetsymbolVersion diff --git a/eng/common/post-build/sourcelink-cli-init.ps1 b/eng/common/post-build/sourcelink-cli-init.ps1 deleted file mode 100644 index 9eaa25b3b..000000000 --- a/eng/common/post-build/sourcelink-cli-init.ps1 +++ /dev/null @@ -1,29 +0,0 @@ -param ( - $sourcelinkCliVersion = $null -) - -$ErrorActionPreference = "Stop" -Set-StrictMode -Version 2.0 - -. $PSScriptRoot\..\tools.ps1 - -$verbosity = "minimal" - -function InstallSourcelinkCli ($sourcelinkCliVersion) { - $sourcelinkCliPackageName = "sourcelink" - - $dotnetRoot = InitializeDotNetCli -install:$true - $dotnet = "$dotnetRoot\dotnet.exe" - $toolList = & "$dotnet" tool list --global - - if (($toolList -like "*$sourcelinkCliPackageName*") -and ($toolList -like "*$sourcelinkCliVersion*")) { - Write-Host "SourceLink CLI version $sourcelinkCliVersion is already installed." - } - else { - Write-Host "Installing SourceLink CLI version $sourcelinkCliVersion..." - Write-Host "You may need to restart your command window if this is the first dotnet tool you have installed." - & "$dotnet" tool install $sourcelinkCliPackageName --version $sourcelinkCliVersion --verbosity $verbosity --global - } -} - -InstallSourcelinkCli $sourcelinkCliVersion diff --git a/eng/common/post-build/sourcelink-validation.ps1 b/eng/common/post-build/sourcelink-validation.ps1 index 41e01ae6e..428e8c960 100644 --- a/eng/common/post-build/sourcelink-validation.ps1 +++ b/eng/common/post-build/sourcelink-validation.ps1 @@ -1,8 +1,8 @@ param( [Parameter(Mandatory=$true)][string] $InputPath, # Full path to directory where Symbols.NuGet packages to be checked are stored [Parameter(Mandatory=$true)][string] $ExtractPath, # Full path to directory where the packages will be extracted during validation - [Parameter(Mandatory=$true)][string] $GHRepoName, # GitHub name of the repo including the Org. E.g., dotnet/arcade - [Parameter(Mandatory=$true)][string] $GHCommit, # GitHub commit SHA used to build the packages + [Parameter(Mandatory=$false)][string] $GHRepoName, # GitHub name of the repo including the Org. E.g., dotnet/arcade + [Parameter(Mandatory=$false)][string] $GHCommit, # GitHub commit SHA used to build the packages [Parameter(Mandatory=$true)][string] $SourcelinkCliVersion # Version of SourceLink CLI to use ) @@ -13,6 +13,12 @@ param( # all files present in the repo at a specific commit point. $global:RepoFiles = @{} +# Maximum number of jobs to run in parallel +$MaxParallelJobs = 6 + +# Wait time between check for system load +$SecondsBetweenLoadChecks = 10 + $ValidatePackage = { param( [string] $PackagePath # Full path to a Symbols.NuGet package @@ -22,8 +28,8 @@ $ValidatePackage = { # Ensure input file exist if (!(Test-Path $PackagePath)) { - Write-PipelineTaskError "Input file does not exist: $PackagePath" - ExitWithExitCode 1 + Write-Host "Input file does not exist: $PackagePath" + return 1 } # Extensions for which we'll look for SourceLink information @@ -38,7 +44,7 @@ $ValidatePackage = { Add-Type -AssemblyName System.IO.Compression.FileSystem - [System.IO.Directory]::CreateDirectory($ExtractPath); + [System.IO.Directory]::CreateDirectory($ExtractPath) | Out-Null try { $zip = [System.IO.Compression.ZipFile]::OpenRead($PackagePath) @@ -138,16 +144,18 @@ $ValidatePackage = { if ($FailedFiles -eq 0) { Write-Host "Passed." + return 0 } else { - Write-PipelineTaskError "$PackagePath has broken SourceLink links." + Write-Host "$PackagePath has broken SourceLink links." + return 1 } } function ValidateSourceLinkLinks { - if (!($GHRepoName -Match "^[^\s\/]+/[^\s\/]+$")) { + if ($GHRepoName -ne "" -and !($GHRepoName -Match "^[^\s\/]+/[^\s\/]+$")) { if (!($GHRepoName -Match "^[^\s-]+-[^\s]+$")) { - Write-PipelineTaskError "GHRepoName should be in the format / or -" + Write-PipelineTaskError "GHRepoName should be in the format / or -. '$GHRepoName'" ExitWithExitCode 1 } else { @@ -155,30 +163,33 @@ function ValidateSourceLinkLinks { } } - if (!($GHCommit -Match "^[0-9a-fA-F]{40}$")) { - Write-PipelineTaskError "GHCommit should be a 40 chars hexadecimal string" + if ($GHCommit -ne "" -and !($GHCommit -Match "^[0-9a-fA-F]{40}$")) { + Write-PipelineTaskError "GHCommit should be a 40 chars hexadecimal string. '$GHCommit'" ExitWithExitCode 1 } - $RepoTreeURL = -Join("http://api.github.com/repos/", $GHRepoName, "/git/trees/", $GHCommit, "?recursive=1") - $CodeExtensions = @(".cs", ".vb", ".fs", ".fsi", ".fsx", ".fsscript") + if ($GHRepoName -ne "" -and $GHCommit -ne "") { + $RepoTreeURL = -Join("http://api.github.com/repos/", $GHRepoName, "/git/trees/", $GHCommit, "?recursive=1") + $CodeExtensions = @(".cs", ".vb", ".fs", ".fsi", ".fsx", ".fsscript") - try { - # Retrieve the list of files in the repo at that particular commit point and store them in the RepoFiles hash - $Data = Invoke-WebRequest $RepoTreeURL -UseBasicParsing | ConvertFrom-Json | Select-Object -ExpandProperty tree + try { + # Retrieve the list of files in the repo at that particular commit point and store them in the RepoFiles hash + $Data = Invoke-WebRequest $RepoTreeURL -UseBasicParsing | ConvertFrom-Json | Select-Object -ExpandProperty tree - foreach ($file in $Data) { - $Extension = [System.IO.Path]::GetExtension($file.path) + foreach ($file in $Data) { + $Extension = [System.IO.Path]::GetExtension($file.path) - if ($CodeExtensions.Contains($Extension)) { - $RepoFiles[$file.path] = 1 + if ($CodeExtensions.Contains($Extension)) { + $RepoFiles[$file.path] = 1 + } } } + catch { + Write-Host "Problems downloading the list of files from the repo. Url used: $RepoTreeURL . Execution will proceed without caching." + } } - catch { - Write-PipelineTaskError "Problems downloading the list of files from the repo. Url used: $RepoTreeURL" - Write-Host $_ - ExitWithExitCode 1 + elseif ($GHRepoName -ne "" -or $GHCommit -ne "") { + Write-Host "For using the http caching mechanism both GHRepoName and GHCommit should be informed." } if (Test-Path $ExtractPath) { @@ -186,14 +197,33 @@ function ValidateSourceLinkLinks { } # Process each NuGet package in parallel - $Jobs = @() Get-ChildItem "$InputPath\*.symbols.nupkg" | ForEach-Object { - $Jobs += Start-Job -ScriptBlock $ValidatePackage -ArgumentList $_.FullName + Start-Job -ScriptBlock $ValidatePackage -ArgumentList $_.FullName | Out-Null + $NumJobs = @(Get-Job -State 'Running').Count + + while ($NumJobs -ge $MaxParallelJobs) { + Write-Host "There are $NumJobs validation jobs running right now. Waiting $SecondsBetweenLoadChecks seconds to check again." + sleep $SecondsBetweenLoadChecks + $NumJobs = @(Get-Job -State 'Running').Count + } + + foreach ($Job in @(Get-Job -State 'Completed')) { + Receive-Job -Id $Job.Id + Remove-Job -Id $Job.Id + } } + $ValidationFailures = 0 foreach ($Job in $Jobs) { - Wait-Job -Id $Job.Id | Receive-Job + $jobResult = Wait-Job -Id $Job.Id | Receive-Job + if ($jobResult -ne "0") { + $ValidationFailures++ + } + } + if ($ValidationFailures -gt 0) { + Write-PipelineTaskError " $ValidationFailures package(s) failed validation." + ExitWithExitCode 1 } } diff --git a/eng/common/sdl/execute-all-sdl-tools.ps1 b/eng/common/sdl/execute-all-sdl-tools.ps1 index aab7589f2..6d9bdcf72 100644 --- a/eng/common/sdl/execute-all-sdl-tools.ps1 +++ b/eng/common/sdl/execute-all-sdl-tools.ps1 @@ -86,8 +86,8 @@ if ($TsaPublish) { if (-not $TsaRepositoryName) { $TsaRepositoryName = "$($Repository)-$($BranchName)" } - Write-Host "$guardianCliLocation tsa-publish --all-tools --repository-name `"$TsaRepositoryName`" --branch-name `"$TsaBranchName`" --build-number `"$BuildNumber`" --codebase-name `"$TsaCodebaseName`" --notification-alias `"$TsaNotificationEmail`" --codebase-admin `"$TsaCodebaseAdmin`" --instance-url `"$TsaInstanceUrl`" --project-name `"$TsaProjectName`" --area-path `"$TsaBugAreaPath`" --iteration-path `"$TsaIterationPath`" --working-directory $SourceDirectory --logger-level $GuardianLoggerLevel" - & $guardianCliLocation tsa-publish --all-tools --repository-name "$TsaRepositoryName" --branch-name "$TsaBranchName" --build-number "$BuildNumber" --codebase-name "$TsaCodebaseName" --notification-alias "$TsaNotificationEmail" --codebase-admin "$TsaCodebaseAdmin" --instance-url "$TsaInstanceUrl" --project-name "$TsaProjectName" --area-path "$TsaBugAreaPath" --iteration-path "$TsaIterationPath" --working-directory $ArtifactsDirectory --logger-level $GuardianLoggerLevel + Write-Host "$guardianCliLocation tsa-publish --all-tools --repository-name `"$TsaRepositoryName`" --branch-name `"$TsaBranchName`" --build-number `"$BuildNumber`" --codebase-name `"$TsaCodebaseName`" --notification-alias `"$TsaNotificationEmail`" --codebase-admin `"$TsaCodebaseAdmin`" --instance-url `"$TsaInstanceUrl`" --project-name `"$TsaProjectName`" --area-path `"$TsaBugAreaPath`" --iteration-path `"$TsaIterationPath`" --working-directory $ArtifactsDirectory --logger-level $GuardianLoggerLevel" + & $guardianCliLocation tsa-publish --all-tools --repository-name "$TsaRepositoryName" --branch-name "$TsaBranchName" --build-number "$BuildNumber" --onboard $True --codebase-name "$TsaCodebaseName" --notification-alias "$TsaNotificationEmail" --codebase-admin "$TsaCodebaseAdmin" --instance-url "$TsaInstanceUrl" --project-name "$TsaProjectName" --area-path "$TsaBugAreaPath" --iteration-path "$TsaIterationPath" --working-directory $ArtifactsDirectory --logger-level $GuardianLoggerLevel if ($LASTEXITCODE -ne 0) { Write-Host "Guardian tsa-publish failed with exit code $LASTEXITCODE." exit $LASTEXITCODE diff --git a/eng/common/sdl/packages.config b/eng/common/sdl/packages.config index fb9b71286..3f97ac2f1 100644 --- a/eng/common/sdl/packages.config +++ b/eng/common/sdl/packages.config @@ -1,4 +1,4 @@  - + diff --git a/eng/common/sdl/run-sdl.ps1 b/eng/common/sdl/run-sdl.ps1 index d7b856445..b90c4399b 100644 --- a/eng/common/sdl/run-sdl.ps1 +++ b/eng/common/sdl/run-sdl.ps1 @@ -25,19 +25,19 @@ if ($ValidPath -eq $False) exit 1 } +$configParam = @("--config") + foreach ($tool in $ToolsList) { $gdnConfigFile = Join-Path $gdnConfigPath "$tool-configure.gdnconfig" - $config = $False Write-Host $tool # We have to manually configure tools that run on source to look at the source directory only if ($tool -eq "credscan") { - Write-Host "$GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args `" TargetDirectory : $TargetDirectory `" $(If ($CrScanAdditionalRunConfigParams) {$CrScanAdditionalRunConfigParams})" - & $GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args " TargetDirectory : $TargetDirectory " $(If ($CrScanAdditionalRunConfigParams) {$CrScanAdditionalRunConfigParams}) + Write-Host "$GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args `" TargetDirectory : $TargetDirectory `" `" OutputType : pre `" $(If ($CrScanAdditionalRunConfigParams) {$CrScanAdditionalRunConfigParams})" + & $GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args " TargetDirectory : $TargetDirectory " "OutputType : pre" $(If ($CrScanAdditionalRunConfigParams) {$CrScanAdditionalRunConfigParams}) if ($LASTEXITCODE -ne 0) { Write-Host "Guardian configure for $tool failed with exit code $LASTEXITCODE." exit $LASTEXITCODE } - $config = $True } if ($tool -eq "policheck") { Write-Host "$GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args `" Target : $TargetDirectory `" $(If ($PoliCheckAdditionalRunConfigParams) {$PoliCheckAdditionalRunConfigParams})" @@ -46,22 +46,14 @@ foreach ($tool in $ToolsList) { Write-Host "Guardian configure for $tool failed with exit code $LASTEXITCODE." exit $LASTEXITCODE } - $config = $True } - Write-Host "$GuardianCliLocation run --working-directory $WorkingDirectory --tool $tool --baseline mainbaseline --update-baseline $UpdateBaseline --logger-level $GuardianLoggerLevel --config $gdnConfigFile $config" - if ($config) { - & $GuardianCliLocation run --working-directory $WorkingDirectory --tool $tool --baseline mainbaseline --update-baseline $UpdateBaseline --logger-level $GuardianLoggerLevel --config $gdnConfigFile - if ($LASTEXITCODE -ne 0) { - Write-Host "Guardian run for $tool using $gdnConfigFile failed with exit code $LASTEXITCODE." - exit $LASTEXITCODE - } - } else { - & $GuardianCliLocation run --working-directory $WorkingDirectory --tool $tool --baseline mainbaseline --update-baseline $UpdateBaseline --logger-level $GuardianLoggerLevel - if ($LASTEXITCODE -ne 0) { - Write-Host "Guardian run for $tool failed with exit code $LASTEXITCODE." - exit $LASTEXITCODE - } - } + $configParam+=$gdnConfigFile } +Write-Host "$GuardianCliLocation run --working-directory $WorkingDirectory --baseline mainbaseline --update-baseline $UpdateBaseline --logger-level $GuardianLoggerLevel $configParam" +& $GuardianCliLocation run --working-directory $WorkingDirectory --tool $tool --baseline mainbaseline --update-baseline $UpdateBaseline --logger-level $GuardianLoggerLevel $configParam +if ($LASTEXITCODE -ne 0) { + Write-Host "Guardian run for $ToolsList using $configParam failed with exit code $LASTEXITCODE." + exit $LASTEXITCODE +} \ No newline at end of file diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index 5837f3d56..91621cf88 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -10,6 +10,8 @@ jobs: displayName: Run SDL tool variables: - group: DotNet-VSTS-Bot + pool: + name: Hosted VS2017 steps: - checkout: self clean: true @@ -46,7 +48,7 @@ jobs: continueOnError: ${{ parameters.continueOnError }} - ${{ if eq(parameters.overrideParameters, '') }}: - powershell: eng/common/sdl/execute-all-sdl-tools.ps1 - -GuardianPackageName Microsoft.Guardian.Cli.0.6.0 + -GuardianPackageName Microsoft.Guardian.Cli.0.7.1 -NugetPackageDirectory $(Build.SourcesDirectory)\.packages -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw) ${{ parameters.additionalParameters }} diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 1814e0ab6..8db456bb7 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -37,6 +37,9 @@ parameters: # Optional: Enable publishing to the build asset registry enablePublishBuildAssets: false + # Optional: Prevent gather/push manifest from executing when using publishing pipelines + enablePublishUsingPipelines: false + # Optional: Include PublishTestResults task enablePublishTestResults: false @@ -187,7 +190,7 @@ jobs: continueOnError: true condition: always() - - ${{ if and(eq(parameters.enablePublishBuildAssets, true), ne(variables['_PublishUsingPipelines'], 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - ${{ if and(eq(parameters.enablePublishBuildAssets, true), ne(parameters.enablePublishUsingPipelines, 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - task: CopyFiles@2 displayName: Gather Asset Manifests inputs: @@ -195,6 +198,7 @@ jobs: TargetFolder: '$(Build.StagingDirectory)/AssetManifests' continueOnError: ${{ parameters.continueOnError }} condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true')) + - task: PublishBuildArtifacts@1 displayName: Push Asset Manifests inputs: diff --git a/eng/common/templates/post-build/channels/internal-servicing.yml b/eng/common/templates/post-build/channels/internal-servicing.yml index 12fd2b465..4ca36358d 100644 --- a/eng/common/templates/post-build/channels/internal-servicing.yml +++ b/eng/common/templates/post-build/channels/internal-servicing.yml @@ -1,5 +1,7 @@ parameters: enableSymbolValidation: true + symbolPublishingAdditionalParameters: '' + artifactsPublishingAdditionalParameters: '' stages: - stage: IS_Publish @@ -13,17 +15,23 @@ stages: - job: displayName: Symbol Publishing dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.InternalServicing_30_Channel_Id) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.InternalServicing_30_Channel_Id)) variables: - group: DotNet-Symbol-Server-Pats pool: vmImage: 'windows-2019' steps: - task: DownloadBuildArtifacts@0 - displayName: Download Artifacts + displayName: Download Blob Artifacts inputs: - downloadType: specific files - matchingPattern: "*Artifacts*" + artifactName: 'BlobArtifacts' + continueOnError: true + + - task: DownloadBuildArtifacts@0 + displayName: Download PDB Artifacts + inputs: + artifactName: 'PDBArtifacts' + continueOnError: true - task: PowerShell@2 displayName: Publish @@ -34,7 +42,9 @@ stages: /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' + /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' /p:Configuration=Release + ${{ parameters.symbolPublishingAdditionalParameters }} - job: publish_assets displayName: Publish Assets @@ -46,7 +56,7 @@ stages: value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - name: IsStableBuild value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.InternalServicing_30_Channel_Id) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.InternalServicing_30_Channel_Id)) pool: vmImage: 'windows-2019' steps: @@ -92,6 +102,7 @@ stages: /p:BlobBasePath='$(Build.ArtifactStagingDirectory)\BlobArtifacts' /p:PackageBasePath='$(Build.ArtifactStagingDirectory)\PackageArtifacts' /p:Configuration=Release + ${{ parameters.artifactsPublishingAdditionalParameters }} - task: NuGetCommand@2 displayName: Publish Packages to AzDO Feed @@ -126,7 +137,7 @@ stages: - job: displayName: Symbol Availability dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.InternalServicing_30_Channel_Id) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.InternalServicing_30_Channel_Id)) pool: vmImage: 'windows-2019' steps: diff --git a/eng/common/templates/post-build/channels/netcore-dev-5.yml b/eng/common/templates/post-build/channels/netcore-dev-5.yml new file mode 100644 index 000000000..812def315 --- /dev/null +++ b/eng/common/templates/post-build/channels/netcore-dev-5.yml @@ -0,0 +1,165 @@ +parameters: + enableSymbolValidation: true + symbolPublishingAdditionalParameters: '' + artifactsPublishingAdditionalParameters: '' + publishInstallersAndChecksums: false + +stages: +- stage: NetCore_Dev5_Publish + dependsOn: validate + variables: + - template: ../common-variables.yml + displayName: .NET Core 5 Dev Channel + jobs: + - template: ../setup-maestro-vars.yml + + - job: + displayName: Symbol Publishing + dependsOn: setupMaestroVars + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_5_Dev_Channel_Id)) + variables: + - group: DotNet-Symbol-Server-Pats + pool: + vmImage: 'windows-2019' + steps: + - task: DownloadBuildArtifacts@0 + displayName: Download Blob Artifacts + inputs: + artifactName: 'BlobArtifacts' + continueOnError: true + + - task: DownloadBuildArtifacts@0 + displayName: Download PDB Artifacts + inputs: + artifactName: 'PDBArtifacts' + continueOnError: true + + - task: PowerShell@2 + displayName: Publish + inputs: + filePath: eng\common\sdk-task.ps1 + arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet + /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) + /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) + /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' + /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' + /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' + /p:Configuration=Release + ${{ parameters.symbolPublishingAdditionalParameters }} + + - job: + displayName: Publish Assets + dependsOn: setupMaestroVars + variables: + - group: DotNet-Blob-Feed + - group: AzureDevOps-Artifact-Feeds-Pats + - name: BARBuildId + value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] + - name: IsStableBuild + value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_5_Dev_Channel_Id)) + pool: + vmImage: 'windows-2019' + steps: + - task: DownloadBuildArtifacts@0 + displayName: Download Package Artifacts + inputs: + buildType: current + artifactName: PackageArtifacts + + - task: DownloadBuildArtifacts@0 + displayName: Download Blob Artifacts + inputs: + buildType: current + artifactName: BlobArtifacts + + - task: DownloadBuildArtifacts@0 + displayName: Download Asset Manifests + inputs: + buildType: current + artifactName: AssetManifests + + - task: PowerShell@2 + displayName: Add Assets Location + env: + AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-unviersal-packages-rw) + inputs: + filePath: eng\common\sdk-task.ps1 + arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet + /p:ChannelId=$(NetCore_5_Dev_Channel_Id) + /p:ArtifactsCategory=$(_DotNetArtifactsCategory) + /p:IsStableBuild=$(IsStableBuild) + /p:IsInternalBuild=$(IsInternalBuild) + /p:RepositoryName=$(Build.Repository.Name) + /p:CommitSha=$(Build.SourceVersion) + /p:NugetPath=$(Agent.BuildDirectory)\Nuget\NuGet.exe + /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-unviersal-packages-rw)' + /p:TargetFeedPAT='$(dn-bot-dnceng-unviersal-packages-rw)' + /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' + /p:BARBuildId=$(BARBuildId) + /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' + /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' + /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' + /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' + /p:Configuration=Release + /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) + /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) + /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} + /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) + /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) + ${{ parameters.artifactsPublishingAdditionalParameters }} + + - task: NuGetCommand@2 + displayName: Publish Packages to AzDO Feed + condition: contains(variables['TargetAzDOFeed'], 'pkgs.visualstudio.com') + inputs: + command: push + vstsFeed: $(AzDoFeedName) + packagesToPush: $(Build.ArtifactStagingDirectory)\PackageArtifacts\*.nupkg + publishVstsFeed: $(AzDoFeedName) + + - task: PowerShell@2 + displayName: Publish Blobs to AzDO Feed + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-blobs-to-azdo.ps1 + arguments: -FeedName $(AzDoFeedName) + -SourceFolderCollection $(Build.ArtifactStagingDirectory)/BlobArtifacts/ + -PersonalAccessToken $(dn-bot-dnceng-unviersal-packages-rw) + enabled: false + + +- stage: NetCore_Dev5_PublishValidation + displayName: Publish Validation + variables: + - template: ../common-variables.yml + jobs: + - template: ../setup-maestro-vars.yml + + - ${{ if eq(parameters.enableSymbolValidation, 'true') }}: + - job: + displayName: Symbol Availability + dependsOn: setupMaestroVars + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_5_Dev_Channel_Id)) + pool: + vmImage: 'windows-2019' + steps: + - task: DownloadBuildArtifacts@0 + displayName: Download Package Artifacts + inputs: + buildType: current + artifactName: PackageArtifacts + + - task: PowerShell@2 + displayName: Check Symbol Availability + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/symbols-validation.ps1 + arguments: -InputPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ -ExtractPath $(Agent.BuildDirectory)/Temp/ -DotnetSymbolVersion $(SymbolToolVersion) + + - template: ../darc-gather-drop.yml + parameters: + ChannelId: ${{ variables.NetCore_5_Dev_Channel_Id }} + + - template: ../promote-build.yml + parameters: + ChannelId: ${{ variables.NetCore_5_Dev_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-tools-latest.yml b/eng/common/templates/post-build/channels/netcore-tools-latest.yml new file mode 100644 index 000000000..c2d207673 --- /dev/null +++ b/eng/common/templates/post-build/channels/netcore-tools-latest.yml @@ -0,0 +1,165 @@ +parameters: + enableSymbolValidation: true + symbolPublishingAdditionalParameters: '' + artifactsPublishingAdditionalParameters: '' + publishInstallersAndChecksums: false + +stages: +- stage: NetCore_Tools_Latest_Publish + dependsOn: validate + variables: + - template: ../common-variables.yml + displayName: .NET Tools - Latest + jobs: + - template: ../setup-maestro-vars.yml + + - job: + displayName: Symbol Publishing + dependsOn: setupMaestroVars + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_Tools_Latest_Channel_Id)) + variables: + - group: DotNet-Symbol-Server-Pats + pool: + vmImage: 'windows-2019' + steps: + - task: DownloadBuildArtifacts@0 + displayName: Download Blob Artifacts + inputs: + artifactName: 'BlobArtifacts' + continueOnError: true + + - task: DownloadBuildArtifacts@0 + displayName: Download PDB Artifacts + inputs: + artifactName: 'PDBArtifacts' + continueOnError: true + + - task: PowerShell@2 + displayName: Publish + inputs: + filePath: eng\common\sdk-task.ps1 + arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet + /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) + /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) + /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' + /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' + /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' + /p:Configuration=Release + ${{ parameters.symbolPublishingAdditionalParameters }} + + - job: + displayName: Publish Assets + dependsOn: setupMaestroVars + variables: + - group: DotNet-Blob-Feed + - group: AzureDevOps-Artifact-Feeds-Pats + - name: BARBuildId + value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] + - name: IsStableBuild + value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_Tools_Latest_Channel_Id)) + pool: + vmImage: 'windows-2019' + steps: + - task: DownloadBuildArtifacts@0 + displayName: Download Package Artifacts + inputs: + buildType: current + artifactName: PackageArtifacts + + - task: DownloadBuildArtifacts@0 + displayName: Download Blob Artifacts + inputs: + buildType: current + artifactName: BlobArtifacts + + - task: DownloadBuildArtifacts@0 + displayName: Download Asset Manifests + inputs: + buildType: current + artifactName: AssetManifests + + - task: PowerShell@2 + displayName: Add Assets Location + env: + AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-unviersal-packages-rw) + inputs: + filePath: eng\common\sdk-task.ps1 + arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet + /p:ChannelId=$(NetCore_Tools_Latest_Channel_Id) + /p:ArtifactsCategory=$(_DotNetArtifactsCategory) + /p:IsStableBuild=$(IsStableBuild) + /p:IsInternalBuild=$(IsInternalBuild) + /p:RepositoryName=$(Build.Repository.Name) + /p:CommitSha=$(Build.SourceVersion) + /p:NugetPath=$(Agent.BuildDirectory)\Nuget\NuGet.exe + /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-unviersal-packages-rw)' + /p:TargetFeedPAT='$(dn-bot-dnceng-unviersal-packages-rw)' + /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' + /p:BARBuildId=$(BARBuildId) + /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' + /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' + /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' + /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' + /p:Configuration=Release + /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) + /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} + /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) + /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) + /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) + ${{ parameters.artifactsPublishingAdditionalParameters }} + + - task: NuGetCommand@2 + displayName: Publish Packages to AzDO Feed + condition: contains(variables['TargetAzDOFeed'], 'pkgs.visualstudio.com') + inputs: + command: push + vstsFeed: $(AzDoFeedName) + packagesToPush: $(Build.ArtifactStagingDirectory)\PackageArtifacts\*.nupkg + publishVstsFeed: $(AzDoFeedName) + + - task: PowerShell@2 + displayName: Publish Blobs to AzDO Feed + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-blobs-to-azdo.ps1 + arguments: -FeedName $(AzDoFeedName) + -SourceFolderCollection $(Build.ArtifactStagingDirectory)/BlobArtifacts/ + -PersonalAccessToken $(dn-bot-dnceng-unviersal-packages-rw) + enabled: false + + +- stage: NetCore_Tools_Latest_PublishValidation + displayName: Publish Validation + variables: + - template: ../common-variables.yml + jobs: + - template: ../setup-maestro-vars.yml + + - ${{ if eq(parameters.enableSymbolValidation, 'true') }}: + - job: + displayName: Symbol Availability + dependsOn: setupMaestroVars + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_Tools_Latest_Channel_Id)) + pool: + vmImage: 'windows-2019' + steps: + - task: DownloadBuildArtifacts@0 + displayName: Download Package Artifacts + inputs: + buildType: current + artifactName: PackageArtifacts + + - task: PowerShell@2 + displayName: Check Symbol Availability + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/symbols-validation.ps1 + arguments: -InputPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ -ExtractPath $(Agent.BuildDirectory)/Temp/ -DotnetSymbolVersion $(SymbolToolVersion) + + - template: ../darc-gather-drop.yml + parameters: + ChannelId: ${{ variables.NetCore_Tools_Latest_Channel_Id }} + + - template: ../promote-build.yml + parameters: + ChannelId: ${{ variables.NetCore_Tools_Latest_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/public-dev-release.yml b/eng/common/templates/post-build/channels/public-dev-release.yml index b0f085b14..afa954214 100644 --- a/eng/common/templates/post-build/channels/public-dev-release.yml +++ b/eng/common/templates/post-build/channels/public-dev-release.yml @@ -1,5 +1,8 @@ parameters: enableSymbolValidation: true + symbolPublishingAdditionalParameters: '' + artifactsPublishingAdditionalParameters: '' + publishInstallersAndChecksums: false stages: - stage: Publish @@ -13,17 +16,23 @@ stages: - job: displayName: Symbol Publishing dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.PublicDevRelease_30_Channel_Id) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicDevRelease_30_Channel_Id)) variables: - group: DotNet-Symbol-Server-Pats pool: vmImage: 'windows-2019' steps: - task: DownloadBuildArtifacts@0 - displayName: Download Artifacts + displayName: Download Blob Artifacts inputs: - downloadType: specific files - matchingPattern: "*Artifacts*" + artifactName: 'BlobArtifacts' + continueOnError: true + + - task: DownloadBuildArtifacts@0 + displayName: Download PDB Artifacts + inputs: + artifactName: 'PDBArtifacts' + continueOnError: true - task: PowerShell@2 displayName: Publish @@ -34,7 +43,9 @@ stages: /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' + /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' /p:Configuration=Release + ${{ parameters.symbolPublishingAdditionalParameters }} - job: displayName: Publish Assets @@ -46,7 +57,7 @@ stages: value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - name: IsStableBuild value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.PublicDevRelease_30_Channel_Id) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicDevRelease_30_Channel_Id)) pool: vmImage: 'windows-2019' steps: @@ -92,6 +103,12 @@ stages: /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' /p:Configuration=Release + /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} + /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) + /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) + /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) + /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) + ${{ parameters.artifactsPublishingAdditionalParameters }} - task: NuGetCommand@2 displayName: Publish Packages to AzDO Feed @@ -123,7 +140,7 @@ stages: - job: displayName: Symbol Availability dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.PublicDevRelease_30_Channel_Id) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicDevRelease_30_Channel_Id)) pool: vmImage: 'windows-2019' steps: diff --git a/eng/common/templates/post-build/channels/public-release.yml b/eng/common/templates/post-build/channels/public-release.yml index 4c63fb43f..7ec1f89c0 100644 --- a/eng/common/templates/post-build/channels/public-release.yml +++ b/eng/common/templates/post-build/channels/public-release.yml @@ -1,5 +1,7 @@ parameters: enableSymbolValidation: true + symbolPublishingAdditionalParameters: '' + artifactsPublishingAdditionalParameters: '' stages: - stage: PubRel_Publish @@ -13,17 +15,23 @@ stages: - job: displayName: Symbol Publishing dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.PublicRelease_30_Channel_Id) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicRelease_30_Channel_Id)) variables: - group: DotNet-Symbol-Server-Pats pool: vmImage: 'windows-2019' steps: - task: DownloadBuildArtifacts@0 - displayName: Download Artifacts + displayName: Download Blob Artifacts inputs: - downloadType: specific files - matchingPattern: "*Artifacts*" + artifactName: 'BlobArtifacts' + continueOnError: true + + - task: DownloadBuildArtifacts@0 + displayName: Download PDB Artifacts + inputs: + artifactName: 'PDBArtifacts' + continueOnError: true - task: PowerShell@2 displayName: Publish @@ -34,7 +42,9 @@ stages: /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' + /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' /p:Configuration=Release + ${{ parameters.symbolPublishingAdditionalParameters }} - job: publish_assets displayName: Publish Assets @@ -46,7 +56,7 @@ stages: value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - name: IsStableBuild value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.PublicRelease_30_Channel_Id) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicRelease_30_Channel_Id)) pool: vmImage: 'windows-2019' steps: @@ -80,6 +90,7 @@ stages: /p:IsInternalBuild=$(IsInternalBuild) /p:RepositoryName=$(Build.Repository.Name) /p:CommitSha=$(Build.SourceVersion) + /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' /p:AzureStorageAccountName=$(ProxyBackedFeedsAccountName) /p:AzureStorageAccountKey=$(dotnetfeed-storage-access-key-1) /p:AzureDevOpsFeedsBaseUrl=$(dotnetfeed-internal-private-feed-url) @@ -92,6 +103,7 @@ stages: /p:BlobBasePath='$(Build.ArtifactStagingDirectory)\BlobArtifacts' /p:PackageBasePath='$(Build.ArtifactStagingDirectory)\PackageArtifacts' /p:Configuration=Release + ${{ parameters.artifactsPublishingAdditionalParameters }} - task: NuGetCommand@2 displayName: Publish Packages to AzDO Feed @@ -126,7 +138,7 @@ stages: - job: displayName: Symbol Availability dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.PublicRelease_30_Channel_Id) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicRelease_30_Channel_Id)) pool: vmImage: 'windows-2019' steps: diff --git a/eng/common/templates/post-build/channels/public-validation-release.yml b/eng/common/templates/post-build/channels/public-validation-release.yml index 1089ac5fa..12124d621 100644 --- a/eng/common/templates/post-build/channels/public-validation-release.yml +++ b/eng/common/templates/post-build/channels/public-validation-release.yml @@ -1,3 +1,7 @@ +parameters: + artifactsPublishingAdditionalParameters: '' + publishInstallersAndChecksums: false + stages: - stage: PVR_Publish dependsOn: validate @@ -17,7 +21,7 @@ stages: value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - name: IsStableBuild value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.PublicValidationRelease_30_Channel_Id) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicValidationRelease_30_Channel_Id)) pool: vmImage: 'windows-2019' steps: @@ -62,7 +66,13 @@ stages: /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' /p:BlobBasePath='$(Build.ArtifactStagingDirectory)\BlobArtifacts' /p:PackageBasePath='$(Build.ArtifactStagingDirectory)\PackageArtifacts' - /p:Configuration=Release + /p:Configuration=Release + /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) + /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) + /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} + /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) + /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) + ${{ parameters.artifactsPublishingAdditionalParameters }} - task: NuGetCommand@2 displayName: Publish Packages to AzDO Feed diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index bd0bc5e4d..b00d85d8c 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -1,14 +1,23 @@ variables: - group: Publish-Build-Assets + - group: DotNet-DotNetCli-Storage # .NET Core 3 Dev - name: PublicDevRelease_30_Channel_Id value: 3 + # .NET Core 5 Dev + - name: NetCore_5_Dev_Channel_Id + value: 131 + # .NET Tools - Validation - name: PublicValidationRelease_30_Channel_Id value: 9 + # .NET Tools - Latest + - name: NetCore_Tools_Latest_Channel_Id + value: 2 + # .NET Core 3.0 Internal Servicing - name: InternalServicing_30_Channel_Id value: 184 @@ -37,3 +46,9 @@ variables: value: 3.0.0 - name: SymbolToolVersion value: 1.0.1 + + # Default locations for Installers and checksums + - name: ChecksumsBlobFeedUrl + value: https://dotnetcli.blob.core.windows.net/dotnet/index.json + - name: InstallersBlobFeedUrl + value: https://dotnetclichecksums.blob.core.windows.net/dotnet/index.json diff --git a/eng/common/templates/post-build/darc-gather-drop.yml b/eng/common/templates/post-build/darc-gather-drop.yml index f4e3bfcf5..3268ccaa5 100644 --- a/eng/common/templates/post-build/darc-gather-drop.yml +++ b/eng/common/templates/post-build/darc-gather-drop.yml @@ -5,7 +5,7 @@ jobs: - job: gatherDrop displayName: Gather Drop dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], ${{ parameters.ChannelId }}) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.ChannelId }})) variables: - name: BARBuildId value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 0872db4ed..3f239fae2 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -3,10 +3,17 @@ parameters: enableSigningValidation: true enableSymbolValidation: true enableNugetValidation: true + publishInstallersAndChecksums: false SDLValidationParameters: enable: false params: '' + # These parameters let the user customize the call to sdk-task.ps1 for publishing + # symbols & general artifacts as well as for signing validation + symbolPublishingAdditionalParameters: '' + artifactsPublishingAdditionalParameters: '' + signingValidationAdditionalParameters: '' + # Which stages should finish execution before post-build stages start dependsOn: [build] @@ -52,7 +59,9 @@ stages: filePath: eng\common\sdk-task.ps1 arguments: -task SigningValidation -restore -msbuildEngine dotnet /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts' - /p:Configuration=Release + /p:SignCheckExclusionsFile='$(Build.SourcesDirectory)/eng/SignCheckExclusionsFile.txt' + /p:Configuration=Release + ${{ parameters.signingValidationAdditionalParameters }} - ${{ if eq(parameters.enableSourceLinkValidation, 'true') }}: - job: @@ -77,18 +86,45 @@ stages: -GHRepoName $(Build.Repository.Name) -GHCommit $(Build.SourceVersion) -SourcelinkCliVersion $(SourceLinkCLIVersion) + continueOnError: true - ${{ if eq(parameters.SDLValidationParameters.enable, 'true') }}: - template: /eng/common/templates/job/execute-sdl.yml parameters: additionalParameters: ${{ parameters.SDLValidationParameters.params }} +- template: \eng\common\templates\post-build\channels\netcore-dev-5.yml + parameters: + enableSymbolValidation: ${{ parameters.enableSymbolValidation }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + - template: \eng\common\templates\post-build\channels\public-dev-release.yml parameters: enableSymbolValidation: ${{ parameters.enableSymbolValidation }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + +- template: \eng\common\templates\post-build\channels\netcore-tools-latest.yml + parameters: + enableSymbolValidation: ${{ parameters.enableSymbolValidation }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - template: \eng\common\templates\post-build\channels\public-validation-release.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - template: \eng\common\templates\post-build\channels\public-release.yml + parameters: + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - template: \eng\common\templates\post-build\channels\internal-servicing.yml + parameters: + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} diff --git a/eng/common/templates/post-build/promote-build.yml b/eng/common/templates/post-build/promote-build.yml index 9387c583b..6b479c3b8 100644 --- a/eng/common/templates/post-build/promote-build.yml +++ b/eng/common/templates/post-build/promote-build.yml @@ -5,7 +5,7 @@ jobs: - job: displayName: Promote Build dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], ${{ parameters.ChannelId }}) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.ChannelId }})) variables: - name: BARBuildId value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 8fe2b11ad..9c12b1b4f 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -39,6 +39,10 @@ # installed on the machine instead of downloading one. [bool]$useInstalledDotNetCli = if (Test-Path variable:useInstalledDotNetCli) { $useInstalledDotNetCli } else { $true } +# Enable repos to use a particular version of the on-line dotnet-install scripts. +# default URL: https://dot.net/v1/dotnet-install.ps1 +[string]$dotnetInstallScriptVersion = if (Test-Path variable:dotnetInstallScriptVersion) { $dotnetInstallScriptVersion } else { "v1" } + # True to use global NuGet cache instead of restoring packages to repository-local directory. [bool]$useGlobalNuGetCache = if (Test-Path variable:useGlobalNuGetCache) { $useGlobalNuGetCache } else { !$ci } @@ -159,7 +163,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) { $installScript = Join-Path $dotnetRoot "dotnet-install.ps1" if (!(Test-Path $installScript)) { Create-Directory $dotnetRoot - Invoke-WebRequest "https://dot.net/v1/dotnet-install.ps1" -OutFile $installScript + Invoke-WebRequest "https://dot.net/$dotnetInstallScriptVersion/dotnet-install.ps1" -OutFile $installScript } return $installScript @@ -518,6 +522,9 @@ function MSBuild-Core() { if ($warnAsError) { $cmdArgs += " /warnaserror /p:TreatWarningsAsErrors=true" } + else { + $cmdArgs += " /p:TreatWarningsAsErrors=false" + } foreach ($arg in $args) { if ($arg -ne $null -and $arg.Trim() -ne "") { diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 738bb5669..3af9be615 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -45,6 +45,10 @@ warn_as_error=${warn_as_error:-true} # installed on the machine instead of downloading one. use_installed_dotnet_cli=${use_installed_dotnet_cli:-true} +# Enable repos to use a particular version of the on-line dotnet-install scripts. +# default URL: https://dot.net/v1/dotnet-install.sh +dotnetInstallScriptVersion=${dotnetInstallScriptVersion:-'v1'} + # True to use global NuGet cache instead of restoring packages to repository-local directory. if [[ "$ci" == true ]]; then use_global_nuget_cache=${use_global_nuget_cache:-false} @@ -195,7 +199,7 @@ function InstallDotNet { function GetDotNetInstallScript { local root=$1 local install_script="$root/dotnet-install.sh" - local install_script_url="https://dot.net/v1/dotnet-install.sh" + local install_script_url="https://dot.net/$dotnetInstallScriptVersion/dotnet-install.sh" if [[ ! -a "$install_script" ]]; then mkdir -p "$root" diff --git a/global.json b/global.json index 6c742c4eb..323946328 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.0.100-preview6-012264" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19377.2" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19421.1" } } From b98d352c990cc74dd975323a9c4beceea4085e68 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 21 Aug 2019 17:11:42 +0000 Subject: [PATCH 005/420] Update dependencies from https://github.com/dotnet/toolset build 20190821.7 (#4136) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview9.19421.7 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8defa1ed7..e0d744194 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 16ad4ce66f73b1876c59980c7498d3873950fc59 + 1f1f182252bee2acafc328db22139bd31a1f4808 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 757e0d4f8..647e00f3c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview9.19420.12 + 3.0.100-preview9.19421.7 From c419657055d456dc1e03f8a8f78d9b8835fc18e1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 21 Aug 2019 17:37:31 +0000 Subject: [PATCH 006/420] Update dependencies from https://github.com/dotnet/toolset build 20190821.9 (#4138) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview9.19421.9 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview9.19421.3 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e0d744194..499e123eb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 1f1f182252bee2acafc328db22139bd31a1f4808 + 743002b0e3df9920193d3f91612800d70ec4b473 https://github.com/dotnet/sdk 21ebcc7ff5b9136ecaaf2b1f362f5588c3cc520a - + https://github.com/dotnet/cli - e56957011e5325933a186b5e63389bd7738a62fb + 2d029fdb1a1469263f130c475cc0baf5658936bf diff --git a/eng/Versions.props b/eng/Versions.props index 647e00f3c..9eaf290f0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview9.19421.7 + 3.0.100-preview9.19421.9 @@ -33,7 +33,7 @@ - 3.0.100-preview9.19420.2 + 3.0.100-preview9.19421.3 0.2.0 From b27ea5a8359b67c6756e6f4459b27a8ec0061d13 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 21 Aug 2019 21:02:02 +0000 Subject: [PATCH 007/420] [release/3.0.100-preview9] Update dependencies from dotnet/toolset (#4140) * Update dependencies from https://github.com/dotnet/toolset build 20190821.10 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview9.19421.10 * Update dependencies from https://github.com/dotnet/toolset build 20190821.11 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview9.19421.11 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 499e123eb..6c5f8e4b6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 743002b0e3df9920193d3f91612800d70ec4b473 + 72c33fab267a81e386b0be80989d6487e8752a71 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 9eaf290f0..781a0211e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview9.19421.9 + 3.0.100-preview9.19421.11 From 67378c8002878b385a4681b08e1638c52521b0b2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 21 Aug 2019 22:06:30 +0000 Subject: [PATCH 008/420] Update dependencies from https://github.com/dotnet/toolset build 20190821.13 (#4141) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview9.19421.13 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6c5f8e4b6..3058f9740 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 72c33fab267a81e386b0be80989d6487e8752a71 + 13f308f5ddb7863b9ad2b5cd1d237e837cd7a4a3 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 781a0211e..b465e304c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview9.19421.11 + 3.0.100-preview9.19421.13 From 92b06fa1eb254ee9af9e250f2906cdecae09c4a0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 21 Aug 2019 23:41:15 +0000 Subject: [PATCH 009/420] Update dependencies from https://github.com/dotnet/toolset build 20190821.16 (#4144) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview9.19421.16 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3058f9740..540b20c8e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 13f308f5ddb7863b9ad2b5cd1d237e837cd7a4a3 + c7bb38a3b6eb5c80699d8a91fe70dc9fc8876048 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index b465e304c..b20cb55e5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview9.19421.13 + 3.0.100-preview9.19421.16 From 1a43883b21b315ff9d80f445b6665a6f08a3f919 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 22 Aug 2019 00:51:07 +0000 Subject: [PATCH 010/420] Update dependencies from https://github.com/dotnet/toolset build 20190821.19 (#4147) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview9.19421.19 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 540b20c8e..9bf602038 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - c7bb38a3b6eb5c80699d8a91fe70dc9fc8876048 + 3943eacb7478d5a232244db7970240428b2562a8 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index b20cb55e5..33a507153 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview9.19421.16 + 3.0.100-preview9.19421.19 From 42e0a57ea5674d39614fb517c443d3ad9e7aefb7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 22 Aug 2019 01:52:01 +0000 Subject: [PATCH 011/420] Update dependencies from https://github.com/dotnet/toolset build 20190821.23 (#4152) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview9.19421.23 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9bf602038..5334de0f4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 3943eacb7478d5a232244db7970240428b2562a8 + 2edf5bbd34fd3bf468697ea45712c3e5c138fec9 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 33a507153..09dfc79b3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview9.19421.19 + 3.0.100-preview9.19421.23 From 74c62be54923c4650012c4a613733e2e58dc4e10 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 22 Aug 2019 02:17:44 +0000 Subject: [PATCH 012/420] [release/3.0.100-preview9] Update dependencies from dotnet/toolset (#4154) * Update dependencies from https://github.com/dotnet/toolset build 20190821.25 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview9.19421.25 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview9.19421.5 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190821.26 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview9.19421.26 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview9.19421.5 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5334de0f4..c66ab5003 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 2edf5bbd34fd3bf468697ea45712c3e5c138fec9 + 8731d54d66569ad07e1ead6763c055570854c8d3 https://github.com/dotnet/sdk 21ebcc7ff5b9136ecaaf2b1f362f5588c3cc520a - + https://github.com/dotnet/cli - 2d029fdb1a1469263f130c475cc0baf5658936bf + 3d945d1513a0f118fc4581a5bea93489f945ef93 diff --git a/eng/Versions.props b/eng/Versions.props index 09dfc79b3..f99ab9b32 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview9.19421.23 + 3.0.100-preview9.19421.26 @@ -33,7 +33,7 @@ - 3.0.100-preview9.19421.3 + 3.0.100-preview9.19421.5 0.2.0 From 341e5bfde72a031a55abc8c6f6ab05cb72516abc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 21 Aug 2019 22:24:45 -0700 Subject: [PATCH 013/420] [release/3.0.100-preview9] Update dependencies from dotnet/core-setup (#4119) * Update dependencies from https://github.com/dotnet/core-setup build 20190820.07 - Microsoft.NETCore.App - 3.0.0-preview9-19420-07 - NETStandard.Library.Ref - 2.1.0-preview9-19420-07 - Microsoft.WindowsDesktop.App - 3.0.0-preview9-19420-07 * Update dependencies from https://github.com/dotnet/core-setup build 20190821.06 - Microsoft.NETCore.App - 3.0.0-preview9-19421-06 - NETStandard.Library.Ref - 2.1.0-preview9-19421-06 - Microsoft.WindowsDesktop.App - 3.0.0-preview9-19421-06 * Update dependencies from https://github.com/dotnet/core-setup build 20190821.10 - Microsoft.NETCore.App - 3.0.0-preview9-19421-10 - NETStandard.Library.Ref - 2.1.0-preview9-19421-10 - Microsoft.WindowsDesktop.App - 3.0.0-preview9-19421-10 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-preview8.19380.4 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-preview9.19421.2 (parent: Microsoft.WindowsDesktop.App) * Update dependencies from https://github.com/dotnet/core-setup build 20190821.20 - Microsoft.NETCore.App - 3.0.0-preview9-19421-20 - NETStandard.Library.Ref - 2.1.0-preview9-19421-20 - Microsoft.WindowsDesktop.App - 3.0.0-preview9-19421-20 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-preview9.19420.3 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-preview9.19421.3 (parent: Microsoft.WindowsDesktop.App) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c66ab5003..cd3108237 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 33656b4bd015e62836fb3ee52a914b73c40052e9 + 33c773a5c7602e599053fdbb3a12b7ecfda27e2e - + https://github.com/dotnet/core-setup - 33656b4bd015e62836fb3ee52a914b73c40052e9 + 33c773a5c7602e599053fdbb3a12b7ecfda27e2e - + https://github.com/dotnet/core-setup - 33656b4bd015e62836fb3ee52a914b73c40052e9 + 33c773a5c7602e599053fdbb3a12b7ecfda27e2e https://github.com/aspnet/AspNetCore @@ -55,13 +55,13 @@ 3d945d1513a0f118fc4581a5bea93489f945ef93 - + https://github.com/dotnet/winforms - 8b19141d6b0b221167bd7d1731cbc6aa9898da75 + 7f2c6adc229513b8a3690d0c59079073a783d33f - + https://github.com/dotnet/wpf - 105b673bddd8665580a94878db12ac97af8fa794 + 4524e3a8b4d8ebc8643b6e2185a597700261e1fb diff --git a/eng/Versions.props b/eng/Versions.props index f99ab9b32..54e3b6157 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,11 +16,11 @@ - 4.8.0-preview9.19415.10 + 4.8.0-preview9.19420.3 - 3.0.0-preview9.19416.2 + 3.0.0-preview9.19421.3 @@ -44,7 +44,7 @@ $(MicrosoftNETSdkPackageVersion) - 3.0.0-preview9-19420-04 + 3.0.0-preview9-19421-20 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -52,11 +52,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview9-19420-04 + 2.1.0-preview9-19421-20 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview9-19420-04 + 3.0.0-preview9-19421-20 $(MicrosoftWindowsDesktopAppPackageVersion) From 456b4f12ccebaa1c9a9fc996bc0c12f143abf400 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 22 Aug 2019 05:54:19 +0000 Subject: [PATCH 014/420] Update dependencies from https://github.com/dotnet/toolset build 20190821.28 (#4156) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview9.19421.28 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cd3108237..1e35d3801 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 8731d54d66569ad07e1ead6763c055570854c8d3 + 1b2a7c085afb4d8132621cac43247b21d2f71422 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 54e3b6157..a462dcebf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview9.19421.26 + 3.0.100-preview9.19421.28 From 9094dac9c7151119c475f8b9d9d962830fe971e9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 22 Aug 2019 10:00:36 +0000 Subject: [PATCH 015/420] Update dependencies from https://github.com/aspnet/AspNetCore build 20190822.1 (#4159) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview9.19422.1 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview9.19422.1 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview9.19422.1 - dotnet-watch - 3.0.0-preview9.19422.1 - dotnet-user-secrets - 3.0.0-preview9.19422.1 - dotnet-dev-certs - 3.0.0-preview9.19422.1 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1e35d3801..32af92345 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup 33c773a5c7602e599053fdbb3a12b7ecfda27e2e - + https://github.com/aspnet/AspNetCore - 733218c6520edf03971f7befef4e39b6d4076a9f + 30fbe3dcc5f89711808043c93bcdb900c32b3fae - + https://github.com/aspnet/AspNetCore - 733218c6520edf03971f7befef4e39b6d4076a9f + 30fbe3dcc5f89711808043c93bcdb900c32b3fae - + https://github.com/aspnet/AspNetCore - 733218c6520edf03971f7befef4e39b6d4076a9f + 30fbe3dcc5f89711808043c93bcdb900c32b3fae - + https://github.com/aspnet/AspNetCore - 733218c6520edf03971f7befef4e39b6d4076a9f + 30fbe3dcc5f89711808043c93bcdb900c32b3fae - + https://github.com/aspnet/AspNetCore - 733218c6520edf03971f7befef4e39b6d4076a9f + 30fbe3dcc5f89711808043c93bcdb900c32b3fae - + https://github.com/aspnet/AspNetCore - 733218c6520edf03971f7befef4e39b6d4076a9f + 30fbe3dcc5f89711808043c93bcdb900c32b3fae https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index a462dcebf..395beddf7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-preview9.19420.5 - 3.0.0-preview9.19420.5 - 3.0.0-preview9.19420.5 - 3.0.0-preview9.19420.5 - 3.0.0-preview9.19420.5 - 3.0.0-preview9.19420.5 + 3.0.0-preview9.19422.1 + 3.0.0-preview9.19422.1 + 3.0.0-preview9.19422.1 + 3.0.0-preview9.19422.1 + 3.0.0-preview9.19422.1 + 3.0.0-preview9.19422.1 From ae3e739a3b7582a1d9be02ba8dec6bd4fc4e7fd3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 22 Aug 2019 05:42:15 -0700 Subject: [PATCH 016/420] Update dependencies from https://github.com/dotnet/toolset build 20190821.29 (#4158) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview9.19421.29 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview9.19421.8 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 32af92345..fbd37edba 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 1b2a7c085afb4d8132621cac43247b21d2f71422 + 8dc0831dfc000806203d9c981d71facecd7ce54f https://github.com/dotnet/sdk 21ebcc7ff5b9136ecaaf2b1f362f5588c3cc520a - + https://github.com/dotnet/cli - 3d945d1513a0f118fc4581a5bea93489f945ef93 + 5eab98d0e2bd608879b23e0cbdaf92f01dbdc3ab diff --git a/eng/Versions.props b/eng/Versions.props index 395beddf7..ed9eea719 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview9.19421.28 + 3.0.100-preview9.19421.29 @@ -33,7 +33,7 @@ - 3.0.100-preview9.19421.5 + 3.0.100-preview9.19421.8 0.2.0 From f406b5503de6a30fb08901438ca8c3a75b8ae95c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 22 Aug 2019 14:16:35 +0000 Subject: [PATCH 017/420] Update dependencies from https://github.com/dotnet/toolset build 20190822.7 (#4165) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview9.19422.7 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fbd37edba..2ab70a73d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 8dc0831dfc000806203d9c981d71facecd7ce54f + 0ad8248e821a4208595f6e11a9c1aa519f779d59 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index ed9eea719..e4e01e31f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview9.19421.29 + 3.0.100-preview9.19422.7 From 660f225c2eaa6a095a7e63cb94b79a0987daa68e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 22 Aug 2019 14:57:31 +0000 Subject: [PATCH 018/420] Update dependencies from https://github.com/dotnet/toolset build 20190822.9 (#4168) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview9.19422.9 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview9.19422.3 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2ab70a73d..fa4e58f35 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 0ad8248e821a4208595f6e11a9c1aa519f779d59 + c649075700c1d440511e2cfa73a436b1f46cd679 https://github.com/dotnet/sdk 21ebcc7ff5b9136ecaaf2b1f362f5588c3cc520a - + https://github.com/dotnet/cli - 5eab98d0e2bd608879b23e0cbdaf92f01dbdc3ab + 31a95364d4dbe0de4772ea2b5a4e4bc4324688f9 diff --git a/eng/Versions.props b/eng/Versions.props index e4e01e31f..7cbbea38c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview9.19422.7 + 3.0.100-preview9.19422.9 @@ -33,7 +33,7 @@ - 3.0.100-preview9.19421.8 + 3.0.100-preview9.19422.3 0.2.0 From 1840abae6a9ba8fed12fb4c73af54faad6b64e23 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 22 Aug 2019 11:43:22 -0700 Subject: [PATCH 019/420] Update dependencies from https://github.com/aspnet/AspNetCore build 20190822.3 (#4171) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview9.19422.3 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview9.19422.3 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview9.19422.3 - dotnet-watch - 3.0.0-preview9.19422.3 - dotnet-user-secrets - 3.0.0-preview9.19422.3 - dotnet-dev-certs - 3.0.0-preview9.19422.3 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fa4e58f35..7053fff16 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup 33c773a5c7602e599053fdbb3a12b7ecfda27e2e - + https://github.com/aspnet/AspNetCore - 30fbe3dcc5f89711808043c93bcdb900c32b3fae + 1b2010768e7bb0e42736763ad6e5eecca1838446 - + https://github.com/aspnet/AspNetCore - 30fbe3dcc5f89711808043c93bcdb900c32b3fae + 1b2010768e7bb0e42736763ad6e5eecca1838446 - + https://github.com/aspnet/AspNetCore - 30fbe3dcc5f89711808043c93bcdb900c32b3fae + 1b2010768e7bb0e42736763ad6e5eecca1838446 - + https://github.com/aspnet/AspNetCore - 30fbe3dcc5f89711808043c93bcdb900c32b3fae + 1b2010768e7bb0e42736763ad6e5eecca1838446 - + https://github.com/aspnet/AspNetCore - 30fbe3dcc5f89711808043c93bcdb900c32b3fae + 1b2010768e7bb0e42736763ad6e5eecca1838446 - + https://github.com/aspnet/AspNetCore - 30fbe3dcc5f89711808043c93bcdb900c32b3fae + 1b2010768e7bb0e42736763ad6e5eecca1838446 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 7cbbea38c..f4635ae41 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-preview9.19422.1 - 3.0.0-preview9.19422.1 - 3.0.0-preview9.19422.1 - 3.0.0-preview9.19422.1 - 3.0.0-preview9.19422.1 - 3.0.0-preview9.19422.1 + 3.0.0-preview9.19422.3 + 3.0.0-preview9.19422.3 + 3.0.0-preview9.19422.3 + 3.0.0-preview9.19422.3 + 3.0.0-preview9.19422.3 + 3.0.0-preview9.19422.3 From cae25f4d2e99853fe0ea95d7606999fc036db5ed Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 22 Aug 2019 15:01:42 -0700 Subject: [PATCH 020/420] Update dependencies from https://github.com/dotnet/toolset build 20190822.16 (#4176) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview9.19422.16 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview9.19422.5 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7053fff16..193005a78 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - c649075700c1d440511e2cfa73a436b1f46cd679 + 5f4cbd190c1f603602e2f1d6c56dc9d0c5ff33a6 https://github.com/dotnet/sdk 21ebcc7ff5b9136ecaaf2b1f362f5588c3cc520a - + https://github.com/dotnet/cli - 31a95364d4dbe0de4772ea2b5a4e4bc4324688f9 + 40acde72a4d02045174281618a60c92f7593d074 diff --git a/eng/Versions.props b/eng/Versions.props index f4635ae41..152006b92 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview9.19422.9 + 3.0.100-preview9.19422.16 @@ -33,7 +33,7 @@ - 3.0.100-preview9.19422.3 + 3.0.100-preview9.19422.5 0.2.0 From 7532bd3f6290a025714118d6725ff8bb5a28b923 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Thu, 22 Aug 2019 15:58:51 -0700 Subject: [PATCH 021/420] Fix p9 branch channel. (#4179) --- src/CopyToLatest/targets/BranchInfo.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CopyToLatest/targets/BranchInfo.props b/src/CopyToLatest/targets/BranchInfo.props index d103b00f0..f11bec24c 100644 --- a/src/CopyToLatest/targets/BranchInfo.props +++ b/src/CopyToLatest/targets/BranchInfo.props @@ -1,5 +1,5 @@ - release/3.0.1xx + release/3.0.100-preview9 From ad34604e7eac1a6be7bfded40b7a50ee1c7be2c9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 23 Aug 2019 03:21:39 +0000 Subject: [PATCH 022/420] [release/3.0.1xx] Update dependencies from dotnet/core-setup (#4139) * Update dependencies from https://github.com/dotnet/core-setup build 20190821.04 - Microsoft.NETCore.App - 3.0.0-rc1-19421-04 - NETStandard.Library.Ref - 2.1.0-rc1-19421-04 - Microsoft.WindowsDesktop.App - 3.0.0-rc1-19421-04 * Update dependencies from https://github.com/dotnet/core-setup build 20190821.07 - Microsoft.NETCore.App - 3.0.0-rc1-19421-07 - NETStandard.Library.Ref - 2.1.0-rc1-19421-07 - Microsoft.WindowsDesktop.App - 3.0.0-rc1-19421-07 * Update dependencies from https://github.com/dotnet/core-setup build 20190821.11 - Microsoft.NETCore.App - 3.0.0-rc1-19421-11 - NETStandard.Library.Ref - 2.1.0-rc1-19421-11 - Microsoft.WindowsDesktop.App - 3.0.0-rc1-19421-11 * Update dependencies from https://github.com/dotnet/core-setup build 20190821.14 - Microsoft.NETCore.App - 3.0.0-rc1-19421-14 - NETStandard.Library.Ref - 2.1.0-rc1-19421-14 - Microsoft.WindowsDesktop.App - 3.0.0-rc1-19421-14 * Update dependencies from https://github.com/dotnet/core-setup build 20190821.19 - Microsoft.NETCore.App - 3.0.0-rc1-19421-19 - NETStandard.Library.Ref - 2.1.0-rc1-19421-19 - Microsoft.WindowsDesktop.App - 3.0.0-rc1-19421-19 * Update dependencies from https://github.com/dotnet/core-setup build 20190821.22 - Microsoft.NETCore.App - 3.0.0-rc1-19421-22 - NETStandard.Library.Ref - 2.1.0-rc1-19421-22 - Microsoft.WindowsDesktop.App - 3.0.0-rc1-19421-22 * Update dependencies from https://github.com/dotnet/core-setup build 20190822.03 - Microsoft.NETCore.App - 3.0.0-rc1-19422-03 - NETStandard.Library.Ref - 2.1.0-rc1-19422-03 - Microsoft.WindowsDesktop.App - 3.0.0-rc1-19422-03 * Update dependencies from https://github.com/dotnet/core-setup build 20190822.12 - Microsoft.NETCore.App - 3.0.0-rc1-19422-12 - NETStandard.Library.Ref - 2.1.0-rc1-19422-12 - Microsoft.WindowsDesktop.App - 3.0.0-rc1-19422-12 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ea444aff6..38638ba92 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - f385116c74c1513e7e241f0586675486e9b25115 + 31e5389965066423ddce7effac3ce14780bc64df - + https://github.com/dotnet/core-setup - f385116c74c1513e7e241f0586675486e9b25115 + 31e5389965066423ddce7effac3ce14780bc64df - + https://github.com/dotnet/core-setup - f385116c74c1513e7e241f0586675486e9b25115 + 31e5389965066423ddce7effac3ce14780bc64df https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index df7300974..363527244 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ $(MicrosoftNETSdkPackageVersion) - 3.0.0-rc1-19420-08 + 3.0.0-rc1-19422-12 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -52,11 +52,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-rc1-19420-08 + 2.1.0-rc1-19422-12 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-rc1-19420-08 + 3.0.0-rc1-19422-12 $(MicrosoftWindowsDesktopAppPackageVersion) From 8ef52b652afcd0172cc2683e5a4a99dd3e16f576 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 23 Aug 2019 04:00:27 +0000 Subject: [PATCH 023/420] Update dependencies from https://github.com/dotnet/toolset build 20190822.20 (#4185) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19422.20 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 38638ba92..c7c9b20dd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 828045ec3ee15784b34fd27d10b88b5d9adf560e + bdd2de9d4efaf8f977c9d43e5a7247ad3661e3c9 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 363527244..df93671b6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19422.19 + 3.0.100-rc1.19422.20 From 7b8c63b495e84198f7b582bf364e7dfcf5d88953 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 23 Aug 2019 04:40:19 +0000 Subject: [PATCH 024/420] Update dependencies from https://github.com/dotnet/toolset build 20190822.21 (#4186) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19422.21 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c7c9b20dd..6ed769b08 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - bdd2de9d4efaf8f977c9d43e5a7247ad3661e3c9 + ba7e3484b8453ba23fe56189177f62c77e5af4da https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index df93671b6..68d479010 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19422.20 + 3.0.100-rc1.19422.21 From d6f7a58b1f1fae0c81e0a09e82a6993c29566003 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 23 Aug 2019 05:21:06 +0000 Subject: [PATCH 025/420] Update dependencies from https://github.com/dotnet/toolset build 20190822.22 (#4187) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19422.22 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19422.6 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6ed769b08..1e5752efd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - ba7e3484b8453ba23fe56189177f62c77e5af4da + ba4c36cfc3b8d4decbcf8f037551307a78aad526 https://github.com/dotnet/sdk 83dffb6faab234c0c878e92c1679fa47c0cab3dd - + https://github.com/dotnet/cli - 71744d3163293fc31cd1c1917929cf172d22bcaa + bb2cc4be8079100228662e1668da30aaf2c71ffa diff --git a/eng/Versions.props b/eng/Versions.props index 68d479010..7eb74a8fa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19422.21 + 3.0.100-rc1.19422.22 @@ -33,7 +33,7 @@ - 3.0.100-rc1.19422.4 + 3.0.100-rc1.19422.6 0.2.0 From 8407e59c6dbc9ddde3517879016eb0d1dd833691 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 23 Aug 2019 07:45:47 +0000 Subject: [PATCH 026/420] Update dependencies from https://github.com/dotnet/core-setup build 20190822.14 (#4190) - Microsoft.NETCore.App - 3.0.0-rc1-19422-14 - NETStandard.Library.Ref - 2.1.0-rc1-19422-14 - Microsoft.WindowsDesktop.App - 3.0.0-rc1-19422-14 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1e5752efd..ba53f43d6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 31e5389965066423ddce7effac3ce14780bc64df + 24da14999a8c6d711972b72812ec0c0df82be0c9 - + https://github.com/dotnet/core-setup - 31e5389965066423ddce7effac3ce14780bc64df + 24da14999a8c6d711972b72812ec0c0df82be0c9 - + https://github.com/dotnet/core-setup - 31e5389965066423ddce7effac3ce14780bc64df + 24da14999a8c6d711972b72812ec0c0df82be0c9 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 7eb74a8fa..fa6c551e5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ $(MicrosoftNETSdkPackageVersion) - 3.0.0-rc1-19422-12 + 3.0.0-rc1-19422-14 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -52,11 +52,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-rc1-19422-12 + 2.1.0-rc1-19422-14 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-rc1-19422-12 + 3.0.0-rc1-19422-14 $(MicrosoftWindowsDesktopAppPackageVersion) From 51d9cc6d5abf4d0ac74a5610b7994528418df25c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 23 Aug 2019 08:15:46 +0000 Subject: [PATCH 027/420] Update dependencies from https://github.com/dotnet/toolset build 20190823.1 (#4191) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19423.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ba53f43d6..3665b159a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - ba4c36cfc3b8d4decbcf8f037551307a78aad526 + b45792b15c320c84659f12bfee193c255ce4a496 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index fa6c551e5..6b0e7c38b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19422.22 + 3.0.100-rc1.19423.1 From 5c30b26441c6dfb3016d23ba35198089d912fc7c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 23 Aug 2019 09:40:40 +0000 Subject: [PATCH 028/420] Update dependencies from https://github.com/dotnet/toolset build 20190823.2 (#4192) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19423.2 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19423.1 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3665b159a..d732f8933 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - b45792b15c320c84659f12bfee193c255ce4a496 + e5b8af3bf6af1af8e085f54e2289b8098fe9fb86 https://github.com/dotnet/sdk 83dffb6faab234c0c878e92c1679fa47c0cab3dd - + https://github.com/dotnet/cli - bb2cc4be8079100228662e1668da30aaf2c71ffa + 728902dd8d6c9ed090ec49cfc06b49ed2d2fda88 diff --git a/eng/Versions.props b/eng/Versions.props index 6b0e7c38b..715f3a334 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19423.1 + 3.0.100-rc1.19423.2 @@ -33,7 +33,7 @@ - 3.0.100-rc1.19422.6 + 3.0.100-rc1.19423.1 0.2.0 From 3927942e996b13e0286154925000c784ff4868b6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 23 Aug 2019 14:11:15 +0000 Subject: [PATCH 029/420] [release/3.0.1xx] Update dependencies from dotnet/toolset (#4196) * Update dependencies from https://github.com/dotnet/toolset build 20190823.5 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19423.5 * Update dependencies from https://github.com/dotnet/toolset build 20190823.7 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19423.7 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d732f8933..18aeb8fef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - e5b8af3bf6af1af8e085f54e2289b8098fe9fb86 + 249846c84d9b9f4a3190bae2a6dfb92e63535aeb https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 715f3a334..a8bd0f3e0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19423.2 + 3.0.100-rc1.19423.7 From 1953a324e56fab883525a5fae2c9d5dc8fc1f04a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 23 Aug 2019 16:52:44 +0000 Subject: [PATCH 030/420] Update dependencies from https://github.com/aspnet/AspNetCore build 20190822.5 (#4199) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview9.19422.5 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview9.19422.5 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview9.19422.5 - dotnet-watch - 3.0.0-preview9.19422.5 - dotnet-user-secrets - 3.0.0-preview9.19422.5 - dotnet-dev-certs - 3.0.0-preview9.19422.5 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 193005a78..01d62e67f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup 33c773a5c7602e599053fdbb3a12b7ecfda27e2e - + https://github.com/aspnet/AspNetCore - 1b2010768e7bb0e42736763ad6e5eecca1838446 + cfcffd82513ebd563d99c1805e0f629ee84dbd8c - + https://github.com/aspnet/AspNetCore - 1b2010768e7bb0e42736763ad6e5eecca1838446 + cfcffd82513ebd563d99c1805e0f629ee84dbd8c - + https://github.com/aspnet/AspNetCore - 1b2010768e7bb0e42736763ad6e5eecca1838446 + cfcffd82513ebd563d99c1805e0f629ee84dbd8c - + https://github.com/aspnet/AspNetCore - 1b2010768e7bb0e42736763ad6e5eecca1838446 + cfcffd82513ebd563d99c1805e0f629ee84dbd8c - + https://github.com/aspnet/AspNetCore - 1b2010768e7bb0e42736763ad6e5eecca1838446 + cfcffd82513ebd563d99c1805e0f629ee84dbd8c - + https://github.com/aspnet/AspNetCore - 1b2010768e7bb0e42736763ad6e5eecca1838446 + cfcffd82513ebd563d99c1805e0f629ee84dbd8c https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 152006b92..3f19a21a6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-preview9.19422.3 - 3.0.0-preview9.19422.3 - 3.0.0-preview9.19422.3 - 3.0.0-preview9.19422.3 - 3.0.0-preview9.19422.3 - 3.0.0-preview9.19422.3 + 3.0.0-preview9.19422.5 + 3.0.0-preview9.19422.5 + 3.0.0-preview9.19422.5 + 3.0.0-preview9.19422.5 + 3.0.0-preview9.19422.5 + 3.0.0-preview9.19422.5 From f0e787b1cdfad38f14132a0371cac0d583ada39e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 23 Aug 2019 17:37:22 +0000 Subject: [PATCH 031/420] Update dependencies from https://github.com/dotnet/toolset build 20190823.10 (#4201) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview9.19423.10 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 01d62e67f..7c46faccd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 5f4cbd190c1f603602e2f1d6c56dc9d0c5ff33a6 + 423d4afb3f9b2f28b4a316ed83635af718a37b4a https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 3f19a21a6..965213d9b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview9.19422.16 + 3.0.100-preview9.19423.10 From 6190c5ebd2f163cbb89f4a55b7aa206c5de28928 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 23 Aug 2019 18:26:40 +0000 Subject: [PATCH 032/420] Update dependencies from https://github.com/dotnet/toolset build 20190823.11 (#4203) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview9.19423.11 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview9.19423.4 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7c46faccd..2e876ce5a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 423d4afb3f9b2f28b4a316ed83635af718a37b4a + d8e5a6ccb10f822c885aefe806bacec63ab883ef https://github.com/dotnet/sdk 21ebcc7ff5b9136ecaaf2b1f362f5588c3cc520a - + https://github.com/dotnet/cli - 40acde72a4d02045174281618a60c92f7593d074 + 2ba76ce8bed1f10cdbd48272984b4fb0ae959c67 diff --git a/eng/Versions.props b/eng/Versions.props index 965213d9b..1eb8a434f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview9.19423.10 + 3.0.100-preview9.19423.11 @@ -33,7 +33,7 @@ - 3.0.100-preview9.19422.5 + 3.0.100-preview9.19423.4 0.2.0 From c78e42dd57cefb5239e4d24ae8ae28da6977d26d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 23 Aug 2019 19:40:43 +0000 Subject: [PATCH 033/420] Update dependencies from https://github.com/dotnet/toolset build 20190823.13 (#4207) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19423.13 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 18aeb8fef..ae3aaab2a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 249846c84d9b9f4a3190bae2a6dfb92e63535aeb + 5d6a3be6ef2676f62bd4e22255fb58ad45f9266d https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index a8bd0f3e0..c320c7996 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19423.7 + 3.0.100-rc1.19423.13 From 1492556cf79d92bfd8a9eb49c61f6d219a8d285e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 23 Aug 2019 21:10:52 +0000 Subject: [PATCH 034/420] Update dependencies from https://github.com/dotnet/toolset build 20190823.15 (#4209) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview9.19423.15 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2e876ce5a..bcf90fba1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - d8e5a6ccb10f822c885aefe806bacec63ab883ef + 3c311b3ad5b6d54419cfc172cfe28b135d91e413 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 1eb8a434f..7fb226685 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview9.19423.11 + 3.0.100-preview9.19423.15 From 970fd933dfb0b89ea61621d9c653df6c1b7cfe6c Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Mon, 15 Apr 2019 11:24:42 -0700 Subject: [PATCH 035/420] Run tests from dotnet/sdk --- Microsoft.DotNet.Cli.sln | 7 +++ test/SdkTests/SdkTests.csproj | 115 ++++++++++++++++++++++++++++++++++ 2 files changed, 122 insertions(+) create mode 100644 test/SdkTests/SdkTests.csproj diff --git a/Microsoft.DotNet.Cli.sln b/Microsoft.DotNet.Cli.sln index ed4f517c9..a5f56ff79 100644 --- a/Microsoft.DotNet.Cli.sln +++ b/Microsoft.DotNet.Cli.sln @@ -19,6 +19,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SdkResolver", "src\SdkResol EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Dotnet.Sdk.Internal", "src\Microsoft.Dotnet.Sdk.Internal\Microsoft.Dotnet.Sdk.Internal.csproj", "{73F07908-981B-41BB-B9BD-F3420274A6F7}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SdkTests", "test\SdkTests\SdkTests.csproj", "{CB1EE94E-CB83-4071-9DD0-9929AE2B7282}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -49,6 +51,10 @@ Global {73F07908-981B-41BB-B9BD-F3420274A6F7}.Debug|Any CPU.Build.0 = Debug|Any CPU {73F07908-981B-41BB-B9BD-F3420274A6F7}.Release|Any CPU.ActiveCfg = Release|Any CPU {73F07908-981B-41BB-B9BD-F3420274A6F7}.Release|Any CPU.Build.0 = Release|Any CPU + {CB1EE94E-CB83-4071-9DD0-9929AE2B7282}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CB1EE94E-CB83-4071-9DD0-9929AE2B7282}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CB1EE94E-CB83-4071-9DD0-9929AE2B7282}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CB1EE94E-CB83-4071-9DD0-9929AE2B7282}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -59,6 +65,7 @@ Global {53AF2D01-B69F-4CD0-86A7-8FD95967D23C} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} {78E15EC1-7732-41E3-8591-934E9F583254} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7} {7EE15292-2CAD-44FA-8A1F-BAC4688A49E0} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} + {CB1EE94E-CB83-4071-9DD0-9929AE2B7282} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {B526D2CE-EE2D-4AD4-93EF-1867D90FF1F5} diff --git a/test/SdkTests/SdkTests.csproj b/test/SdkTests/SdkTests.csproj new file mode 100644 index 000000000..41f55ef81 --- /dev/null +++ b/test/SdkTests/SdkTests.csproj @@ -0,0 +1,115 @@ + + + + false + false + Library + false + false + false + true + true + true + + + + + + $(MSBuildToolsPath)\Microsoft.CSharp.targets + + false + + false + $(CoreSdkTargetFramework) + + + + $(ArtifactsBinDir)redist\$(Configuration)\dotnet\ + + + + + + + + + + + + + + + + + + + $(ArtifactsTmpDir)$(ToolCommandName)\ + + + + + + + + + + + + + + + $(ArtifactsTestResultsDir)$(TestProjectName).xml + $(ArtifactsTestResultsDir)$(TestProjectName).html + $(ArtifactsLogDir)$(TestProjectName).log + + -noautoreporters -noRepoInference + $(TestArgs) -dotnetPath $(RedistLayoutPath)\dotnet + $(TestArgs) -xml "$(ResultsXmlPath)" + $(TestArgs) -html "$(ResultsHtmlPath)" $(TestRunnerAdditionalArguments) + $(TestArgs) > $(ResultsStdOutPath) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From eaa53417bd95c583812f134d8237be90987ec41f Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Mon, 15 Apr 2019 11:22:36 -0700 Subject: [PATCH 036/420] Isolate SDK tests from repo Directory.Build files --- test/SdkTests/SdkTests.csproj | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/test/SdkTests/SdkTests.csproj b/test/SdkTests/SdkTests.csproj index 41f55ef81..03b087587 100644 --- a/test/SdkTests/SdkTests.csproj +++ b/test/SdkTests/SdkTests.csproj @@ -38,6 +38,14 @@ + + + + Date: Mon, 15 Apr 2019 14:53:56 -0700 Subject: [PATCH 037/420] Unset DOTNET environment variables for tests --- test/SdkTests/SdkTests.csproj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/SdkTests/SdkTests.csproj b/test/SdkTests/SdkTests.csproj index 03b087587..6ed49df30 100644 --- a/test/SdkTests/SdkTests.csproj +++ b/test/SdkTests/SdkTests.csproj @@ -85,7 +85,8 @@ + IgnoreStandardErrorWarningFormat="true" + EnvironmentVariables="DOTNET_HOST_PATH=;DOTNET_INSTALLDIR="/> From ee7bc290b70637461fcc36267631b44a010b243b Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Wed, 17 Apr 2019 14:26:45 -0700 Subject: [PATCH 038/420] Install previous runtimes for SDK tests --- test/SdkTests/SdkTests.csproj | 49 +++++++++++++++++++++++++++++++++-- 1 file changed, 47 insertions(+), 2 deletions(-) diff --git a/test/SdkTests/SdkTests.csproj b/test/SdkTests/SdkTests.csproj index 6ed49df30..9f5bf3479 100644 --- a/test/SdkTests/SdkTests.csproj +++ b/test/SdkTests/SdkTests.csproj @@ -25,6 +25,7 @@ $(ArtifactsBinDir)redist\$(Configuration)\dotnet\ + $(ArtifactsBinDir)redist\$(Configuration)\dotnet-with-previous-runtimes\ @@ -35,9 +36,53 @@ + + + + + - + + + + + $(DotnetToTestPath)%(RecursiveDir)%(Filename)%(Extension) + + + + + + + + + + $(DotnetToTestPath)shared\Microsoft.NETCore.App\$(RuntimeVersionToInstall) + + + powershell -NoLogo -NoProfile -ExecutionPolicy ByPass + $(InstallRuntimeCommand) $(_DotNetRoot)dotnet-install.ps1 + $(InstallRuntimeCommand) -Version $(RuntimeVersionToInstall) + $(InstallRuntimeCommand) -InstallDir $(DotnetToTestPath) + $(InstallRuntimeCommand) -Runtime "dotnet" + + + $(_DotNetRoot)dotnet-install.sh + $(InstallRuntimeCommand) --version $(RuntimeVersionToInstall) + $(InstallRuntimeCommand) --install_dir $(DotnetToTestPath) + $(InstallRuntimeCommand) --runtime "dotnet" + + + + + + @@ -77,7 +122,7 @@ $(ArtifactsLogDir)$(TestProjectName).log -noautoreporters -noRepoInference - $(TestArgs) -dotnetPath $(RedistLayoutPath)\dotnet + $(TestArgs) -dotnetPath $(DotnetToTestPath)\dotnet $(TestArgs) -xml "$(ResultsXmlPath)" $(TestArgs) -html "$(ResultsHtmlPath)" $(TestRunnerAdditionalArguments) $(TestArgs) > $(ResultsStdOutPath) From b1b0b43d4ffd3c1e11dffdb3eee02db0d31f66d9 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Wed, 17 Apr 2019 14:30:42 -0700 Subject: [PATCH 039/420] Simplify global properties passed to run SDK tests --- test/SdkTests/SdkTests.csproj | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/SdkTests/SdkTests.csproj b/test/SdkTests/SdkTests.csproj index 9f5bf3479..cf53b9b7b 100644 --- a/test/SdkTests/SdkTests.csproj +++ b/test/SdkTests/SdkTests.csproj @@ -93,12 +93,14 @@ + testSdk$(ToolTestName) + Microsoft.NET.$(ToolTestName).Tests $(ArtifactsTmpDir)$(ToolCommandName)\ From 1d794fd0807ecae7fe88cce8d3e0981cb678f7c4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 24 Aug 2019 00:10:29 +0000 Subject: [PATCH 040/420] Update dependencies from https://github.com/dotnet/core-setup build 20190823.09 (#4212) - Microsoft.NETCore.App - 3.0.0-preview9-19423-09 - NETStandard.Library.Ref - 2.1.0-preview9-19423-09 - Microsoft.WindowsDesktop.App - 3.0.0-preview9-19423-09 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bcf90fba1..d29d9d562 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 33c773a5c7602e599053fdbb3a12b7ecfda27e2e + 2be172345a420387413bab7ce9053a52624c4461 - + https://github.com/dotnet/core-setup - 33c773a5c7602e599053fdbb3a12b7ecfda27e2e + 2be172345a420387413bab7ce9053a52624c4461 - + https://github.com/dotnet/core-setup - 33c773a5c7602e599053fdbb3a12b7ecfda27e2e + 2be172345a420387413bab7ce9053a52624c4461 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 7fb226685..b2887e8c7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ $(MicrosoftNETSdkPackageVersion) - 3.0.0-preview9-19421-20 + 3.0.0-preview9-19423-09 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -52,11 +52,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview9-19421-20 + 2.1.0-preview9-19423-09 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-preview9-19421-20 + 3.0.0-preview9-19423-09 $(MicrosoftWindowsDesktopAppPackageVersion) From b829ae815bb6c1a48c330bce423baa973eebbd0b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 24 Aug 2019 00:20:51 +0000 Subject: [PATCH 041/420] Update dependencies from https://github.com/dotnet/core-setup build 20190823.11 (#4213) - Microsoft.NETCore.App - 3.0.0-rc1-19423-11 - NETStandard.Library.Ref - 2.1.0-rc1-19423-11 - Microsoft.WindowsDesktop.App - 3.0.0-rc1-19423-11 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ae3aaab2a..a7f2dd5d8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 24da14999a8c6d711972b72812ec0c0df82be0c9 + abecfcd748e6b8850e1111184bf34c93e9277f90 - + https://github.com/dotnet/core-setup - 24da14999a8c6d711972b72812ec0c0df82be0c9 + abecfcd748e6b8850e1111184bf34c93e9277f90 - + https://github.com/dotnet/core-setup - 24da14999a8c6d711972b72812ec0c0df82be0c9 + abecfcd748e6b8850e1111184bf34c93e9277f90 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index c320c7996..15431295c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ $(MicrosoftNETSdkPackageVersion) - 3.0.0-rc1-19422-14 + 3.0.0-rc1-19423-11 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -52,11 +52,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-rc1-19422-14 + 2.1.0-rc1-19423-11 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-rc1-19422-14 + 3.0.0-rc1-19423-11 $(MicrosoftWindowsDesktopAppPackageVersion) From 77dd66246fca06a8b3f38c6b2d0baf350294e9d6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 24 Aug 2019 00:22:51 +0000 Subject: [PATCH 042/420] Update dependencies from https://github.com/dotnet/toolset build 20190823.17 (#4214) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview9.19423.17 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d29d9d562..78ead6fa1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 3c311b3ad5b6d54419cfc172cfe28b135d91e413 + 676669df96e7dc67482da4c56aa2f68c8b2a056e https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index b2887e8c7..cf5791486 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview9.19423.15 + 3.0.100-preview9.19423.17 From ff061d53706d4b5728bf94d3b48df35e63ae449c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 24 Aug 2019 02:06:00 +0000 Subject: [PATCH 043/420] Update dependencies from https://github.com/dotnet/toolset build 20190823.20 (#4217) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview9.19423.20 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview9.19423.9 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 78ead6fa1..0c1d19ee8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 676669df96e7dc67482da4c56aa2f68c8b2a056e + 78120f1f5295f491aabcd09637badb01a20ab95f https://github.com/dotnet/sdk 21ebcc7ff5b9136ecaaf2b1f362f5588c3cc520a - + https://github.com/dotnet/cli - 2ba76ce8bed1f10cdbd48272984b4fb0ae959c67 + 17128f218fd9576dbf8773a582fbc34a88455a30 diff --git a/eng/Versions.props b/eng/Versions.props index cf5791486..51ce26404 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview9.19423.17 + 3.0.100-preview9.19423.20 @@ -33,7 +33,7 @@ - 3.0.100-preview9.19423.4 + 3.0.100-preview9.19423.9 0.2.0 From 0053fa9a0fe1a8238c69153d5e8f0d61a27fb94f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 24 Aug 2019 02:11:28 +0000 Subject: [PATCH 044/420] [release/3.0.1xx] Update dependencies from dotnet/toolset (#4215) * Update dependencies from https://github.com/dotnet/toolset build 20190823.18 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19423.18 * Update dependencies from https://github.com/dotnet/toolset build 20190823.19 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19423.19 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19423.10 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a7f2dd5d8..9c7bd5af3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 5d6a3be6ef2676f62bd4e22255fb58ad45f9266d + bed29fe7d9637817dcabb9d8ab1beccf93af0019 https://github.com/dotnet/sdk 83dffb6faab234c0c878e92c1679fa47c0cab3dd - + https://github.com/dotnet/cli - 728902dd8d6c9ed090ec49cfc06b49ed2d2fda88 + e55224ad0b59d599a9eaecdc6573284b8aa2ff7a diff --git a/eng/Versions.props b/eng/Versions.props index 15431295c..2cb3fb223 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19423.13 + 3.0.100-rc1.19423.19 @@ -33,7 +33,7 @@ - 3.0.100-rc1.19423.1 + 3.0.100-rc1.19423.10 0.2.0 From 28f4820e91d2c8f82068b4f806407e2c799cca6a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 24 Aug 2019 02:36:11 +0000 Subject: [PATCH 045/420] Update dependencies from https://github.com/dotnet/toolset build 20190823.21 (#4219) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview9.19423.21 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview9.19423.7 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0c1d19ee8..8a2057358 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 78120f1f5295f491aabcd09637badb01a20ab95f + f76d5ff361e0308f86f8b5ef912ae5c431b2670c https://github.com/dotnet/sdk 21ebcc7ff5b9136ecaaf2b1f362f5588c3cc520a - + https://github.com/dotnet/cli - 17128f218fd9576dbf8773a582fbc34a88455a30 + 860069fd1405af3d8551dc1264926ad6a11fb499 diff --git a/eng/Versions.props b/eng/Versions.props index 51ce26404..d5f767217 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview9.19423.20 + 3.0.100-preview9.19423.21 @@ -33,7 +33,7 @@ - 3.0.100-preview9.19423.9 + 3.0.100-preview9.19423.7 0.2.0 From 1d68ac7ac9790ed2cc0308d043fe1ede5cd5ca40 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 24 Aug 2019 04:21:07 +0000 Subject: [PATCH 046/420] Update dependencies from https://github.com/dotnet/toolset build 20190823.23 (#4222) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19423.23 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9c7bd5af3..ac4558746 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - bed29fe7d9637817dcabb9d8ab1beccf93af0019 + fd782bb05a4f9011a42fa343f538ac2e2c578a7f https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 2cb3fb223..b83d8163e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19423.19 + 3.0.100-rc1.19423.23 From 9d67cf396b84dc59a15955332832b6240f3e8656 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 24 Aug 2019 13:25:44 +0000 Subject: [PATCH 047/420] Update dependencies from https://github.com/dotnet/toolset build 20190824.2 (#4232) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19424.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ac4558746..d330f5daf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - fd782bb05a4f9011a42fa343f538ac2e2c578a7f + 9ecfb189a366b865eefe11561a573058c45804f1 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index b83d8163e..bc8433d12 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19423.23 + 3.0.100-rc1.19424.2 From aad790275337f31b82e7c3336d7fde2ed008d9d1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 24 Aug 2019 16:31:37 +0000 Subject: [PATCH 048/420] Update dependencies from https://github.com/dotnet/toolset build 20190824.4 (#4236) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview9.19424.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8a2057358..669446849 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - f76d5ff361e0308f86f8b5ef912ae5c431b2670c + ba711e43ae8d7056918f1e36c3ce2b682b540339 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index d5f767217..6896f22c3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview9.19423.21 + 3.0.100-preview9.19424.4 From f1baa047b6b86c0bde10daf0c13b773126a2a781 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 24 Aug 2019 18:34:32 +0000 Subject: [PATCH 049/420] Update dependencies from https://github.com/aspnet/AspNetCore build 20190824.1 (#4239) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview9.19424.1 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview9.19424.1 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview9.19424.1 - dotnet-watch - 3.0.0-preview9.19424.1 - dotnet-user-secrets - 3.0.0-preview9.19424.1 - dotnet-dev-certs - 3.0.0-preview9.19424.1 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 669446849..fe9089075 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup 2be172345a420387413bab7ce9053a52624c4461 - + https://github.com/aspnet/AspNetCore - cfcffd82513ebd563d99c1805e0f629ee84dbd8c + 4425876c89260b70c612c2943d375c72678e51ed - + https://github.com/aspnet/AspNetCore - cfcffd82513ebd563d99c1805e0f629ee84dbd8c + 4425876c89260b70c612c2943d375c72678e51ed - + https://github.com/aspnet/AspNetCore - cfcffd82513ebd563d99c1805e0f629ee84dbd8c + 4425876c89260b70c612c2943d375c72678e51ed - + https://github.com/aspnet/AspNetCore - cfcffd82513ebd563d99c1805e0f629ee84dbd8c + 4425876c89260b70c612c2943d375c72678e51ed - + https://github.com/aspnet/AspNetCore - cfcffd82513ebd563d99c1805e0f629ee84dbd8c + 4425876c89260b70c612c2943d375c72678e51ed - + https://github.com/aspnet/AspNetCore - cfcffd82513ebd563d99c1805e0f629ee84dbd8c + 4425876c89260b70c612c2943d375c72678e51ed https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 6896f22c3..5d5d97ff1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-preview9.19422.5 - 3.0.0-preview9.19422.5 - 3.0.0-preview9.19422.5 - 3.0.0-preview9.19422.5 - 3.0.0-preview9.19422.5 - 3.0.0-preview9.19422.5 + 3.0.0-preview9.19424.1 + 3.0.0-preview9.19424.1 + 3.0.0-preview9.19424.1 + 3.0.0-preview9.19424.1 + 3.0.0-preview9.19424.1 + 3.0.0-preview9.19424.1 From abc1d18cca2c37b124eda1b3d1914646fda1520e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 24 Aug 2019 19:25:43 +0000 Subject: [PATCH 050/420] Update dependencies from https://github.com/dotnet/toolset build 20190824.7 (#4241) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19424.7 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d330f5daf..bd5608b30 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 9ecfb189a366b865eefe11561a573058c45804f1 + 90977772086eb88b41dd7c8eb793f8dacccf6b9b https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index bc8433d12..0d7be8251 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19424.2 + 3.0.100-rc1.19424.7 From f50f2945ee71774b6fc2dc0c8592ada88b67bb62 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 24 Aug 2019 19:41:11 +0000 Subject: [PATCH 051/420] Update dependencies from https://github.com/dotnet/toolset build 20190824.8 (#4242) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview9.19424.8 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fe9089075..19af42805 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - ba711e43ae8d7056918f1e36c3ce2b682b540339 + 1d7c6c2d297b02caf466bcde9af238cd3813b8c2 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 5d5d97ff1..c99ffb595 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview9.19424.4 + 3.0.100-preview9.19424.8 From eb17a0b399ee9b5f8d89f66ac7c82eb8ce42d5d7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 24 Aug 2019 20:15:50 +0000 Subject: [PATCH 052/420] Update dependencies from https://github.com/dotnet/toolset build 20190824.9 (#4243) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview9.19424.9 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview9.19424.3 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 19af42805..9b00328e2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 1d7c6c2d297b02caf466bcde9af238cd3813b8c2 + b59a93f53d558c9c257a0d2d3504f456ff5fd690 https://github.com/dotnet/sdk 21ebcc7ff5b9136ecaaf2b1f362f5588c3cc520a - + https://github.com/dotnet/cli - 860069fd1405af3d8551dc1264926ad6a11fb499 + ddfbe09e21fe3fa5cb895c9b4285782a3ae0a85b diff --git a/eng/Versions.props b/eng/Versions.props index c99ffb595..8551ec26b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview9.19424.8 + 3.0.100-preview9.19424.9 @@ -33,7 +33,7 @@ - 3.0.100-preview9.19423.7 + 3.0.100-preview9.19424.3 0.2.0 From 74076ab541b265f438b30c0e76b312abb3b122a3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 24 Aug 2019 22:01:32 +0000 Subject: [PATCH 053/420] Update dependencies from https://github.com/aspnet/AspNetCore build 20190824.4 (#4245) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview9.19424.4 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview9.19424.4 - Microsoft.AspNetCore.App.Ref - 3.0.0-preview9.19424.4 - dotnet-watch - 3.0.0-preview9.19424.4 - dotnet-user-secrets - 3.0.0-preview9.19424.4 - dotnet-dev-certs - 3.0.0-preview9.19424.4 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9b00328e2..d5de61b71 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup 2be172345a420387413bab7ce9053a52624c4461 - + https://github.com/aspnet/AspNetCore - 4425876c89260b70c612c2943d375c72678e51ed + 66de493473521e173fa15ca557f5f97601cedb23 - + https://github.com/aspnet/AspNetCore - 4425876c89260b70c612c2943d375c72678e51ed + 66de493473521e173fa15ca557f5f97601cedb23 - + https://github.com/aspnet/AspNetCore - 4425876c89260b70c612c2943d375c72678e51ed + 66de493473521e173fa15ca557f5f97601cedb23 - + https://github.com/aspnet/AspNetCore - 4425876c89260b70c612c2943d375c72678e51ed + 66de493473521e173fa15ca557f5f97601cedb23 - + https://github.com/aspnet/AspNetCore - 4425876c89260b70c612c2943d375c72678e51ed + 66de493473521e173fa15ca557f5f97601cedb23 - + https://github.com/aspnet/AspNetCore - 4425876c89260b70c612c2943d375c72678e51ed + 66de493473521e173fa15ca557f5f97601cedb23 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 8551ec26b..29dbc3b9f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-preview9.19424.1 - 3.0.0-preview9.19424.1 - 3.0.0-preview9.19424.1 - 3.0.0-preview9.19424.1 - 3.0.0-preview9.19424.1 - 3.0.0-preview9.19424.1 + 3.0.0-preview9.19424.4 + 3.0.0-preview9.19424.4 + 3.0.0-preview9.19424.4 + 3.0.0-preview9.19424.4 + 3.0.0-preview9.19424.4 + 3.0.0-preview9.19424.4 From d06ccc675eaa460ac0868f56cafee53e3eeb3660 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 24 Aug 2019 22:38:13 +0000 Subject: [PATCH 054/420] Update dependencies from https://github.com/aspnet/AspNetCore build 20190824.5 (#4246) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-rc1.19424.5 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-rc1.19424.5 - Microsoft.AspNetCore.App.Ref - 3.0.0-rc1.19424.5 - dotnet-watch - 3.0.0-rc1.19424.5 - dotnet-user-secrets - 3.0.0-rc1.19424.5 - dotnet-dev-certs - 3.0.0-rc1.19424.5 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bd5608b30..67069a764 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup abecfcd748e6b8850e1111184bf34c93e9277f90 - + https://github.com/aspnet/AspNetCore - 4e142516c6872682a3472acd3860308c05800709 + cb298f16e97432f2de8b5a030853aabc09693c80 - + https://github.com/aspnet/AspNetCore - 4e142516c6872682a3472acd3860308c05800709 + cb298f16e97432f2de8b5a030853aabc09693c80 - + https://github.com/aspnet/AspNetCore - 4e142516c6872682a3472acd3860308c05800709 + cb298f16e97432f2de8b5a030853aabc09693c80 - + https://github.com/aspnet/AspNetCore - 4e142516c6872682a3472acd3860308c05800709 + cb298f16e97432f2de8b5a030853aabc09693c80 - + https://github.com/aspnet/AspNetCore - 4e142516c6872682a3472acd3860308c05800709 + cb298f16e97432f2de8b5a030853aabc09693c80 - + https://github.com/aspnet/AspNetCore - 4e142516c6872682a3472acd3860308c05800709 + cb298f16e97432f2de8b5a030853aabc09693c80 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 0d7be8251..8e8f7840b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-rc1.19422.2 - 3.0.0-rc1.19422.2 - 3.0.0-rc1.19422.2 - 3.0.0-rc1.19422.2 - 3.0.0-rc1.19422.2 - 3.0.0-rc1.19422.2 + 3.0.0-rc1.19424.5 + 3.0.0-rc1.19424.5 + 3.0.0-rc1.19424.5 + 3.0.0-rc1.19424.5 + 3.0.0-rc1.19424.5 + 3.0.0-rc1.19424.5 From aee17abcfbdc2f94704cae8d3d66447e9fbd27be Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 24 Aug 2019 23:20:52 +0000 Subject: [PATCH 055/420] Update dependencies from https://github.com/dotnet/toolset build 20190824.10 (#4247) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview9.19424.10 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d5de61b71..f98216010 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - b59a93f53d558c9c257a0d2d3504f456ff5fd690 + c1d2a6d6443a53298fd5f889d9dc3838f7d6524e https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 29dbc3b9f..d58c38858 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview9.19424.9 + 3.0.100-preview9.19424.10 From 1f371506ff3be091d496b76e7d91569d0c7033d4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 25 Aug 2019 00:35:41 +0000 Subject: [PATCH 056/420] Update dependencies from https://github.com/dotnet/toolset build 20190824.11 (#4248) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19424.11 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19424.6 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 67069a764..a5b0ff912 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 90977772086eb88b41dd7c8eb793f8dacccf6b9b + db87cac0cd3b1605893fadadaf0c4588f08ae869 https://github.com/dotnet/sdk 83dffb6faab234c0c878e92c1679fa47c0cab3dd - + https://github.com/dotnet/cli - e55224ad0b59d599a9eaecdc6573284b8aa2ff7a + 5f1d11ee274127248ebd021f9d00244e72e9b27c diff --git a/eng/Versions.props b/eng/Versions.props index 8e8f7840b..2fcb0a1ac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19424.7 + 3.0.100-rc1.19424.11 @@ -33,7 +33,7 @@ - 3.0.100-rc1.19423.10 + 3.0.100-rc1.19424.6 0.2.0 From c751a275a528d0eaeb3118f3c82328359fb0e786 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 25 Aug 2019 04:06:03 +0000 Subject: [PATCH 057/420] Update dependencies from https://github.com/dotnet/toolset build 20190824.12 (#4249) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview9.19424.12 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview9.19424.5 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f98216010..58b5c51b8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - c1d2a6d6443a53298fd5f889d9dc3838f7d6524e + 56efdfe26fd60cee6be54704e9e726568af8cf97 https://github.com/dotnet/sdk 21ebcc7ff5b9136ecaaf2b1f362f5588c3cc520a - + https://github.com/dotnet/cli - ddfbe09e21fe3fa5cb895c9b4285782a3ae0a85b + d1dcc4f61e55cb9ac5ed2691c8f308e8879bde57 diff --git a/eng/Versions.props b/eng/Versions.props index d58c38858..127ff02d5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview9.19424.10 + 3.0.100-preview9.19424.12 @@ -33,7 +33,7 @@ - 3.0.100-preview9.19424.3 + 3.0.100-preview9.19424.5 0.2.0 From f6d2defcca61949715d073daec8d44f4ce6e35ba Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 25 Aug 2019 04:30:39 +0000 Subject: [PATCH 058/420] Update dependencies from https://github.com/dotnet/toolset build 20190824.13 (#4250) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19424.13 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a5b0ff912..83914641b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - db87cac0cd3b1605893fadadaf0c4588f08ae869 + 973f58ee69286f1c7267deaf8ce624a2975fbe92 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 2fcb0a1ac..8e59a7365 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19424.11 + 3.0.100-rc1.19424.13 From b007871db3206c567069425e535c977376607d57 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 25 Aug 2019 08:22:22 +0000 Subject: [PATCH 059/420] Update dependencies from https://github.com/aspnet/AspNetCore build 20190824.9 (#4251) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-rc1.19424.9 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-rc1.19424.9 - Microsoft.AspNetCore.App.Ref - 3.0.0-rc1.19424.9 - dotnet-watch - 3.0.0-rc1.19424.9 - dotnet-user-secrets - 3.0.0-rc1.19424.9 - dotnet-dev-certs - 3.0.0-rc1.19424.9 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 83914641b..2ee6fd7d9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup abecfcd748e6b8850e1111184bf34c93e9277f90 - + https://github.com/aspnet/AspNetCore - cb298f16e97432f2de8b5a030853aabc09693c80 + ec52b9d4d0a34e08768da3b5b4090a8c42351f99 - + https://github.com/aspnet/AspNetCore - cb298f16e97432f2de8b5a030853aabc09693c80 + ec52b9d4d0a34e08768da3b5b4090a8c42351f99 - + https://github.com/aspnet/AspNetCore - cb298f16e97432f2de8b5a030853aabc09693c80 + ec52b9d4d0a34e08768da3b5b4090a8c42351f99 - + https://github.com/aspnet/AspNetCore - cb298f16e97432f2de8b5a030853aabc09693c80 + ec52b9d4d0a34e08768da3b5b4090a8c42351f99 - + https://github.com/aspnet/AspNetCore - cb298f16e97432f2de8b5a030853aabc09693c80 + ec52b9d4d0a34e08768da3b5b4090a8c42351f99 - + https://github.com/aspnet/AspNetCore - cb298f16e97432f2de8b5a030853aabc09693c80 + ec52b9d4d0a34e08768da3b5b4090a8c42351f99 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 8e59a7365..eab93c93f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-rc1.19424.5 - 3.0.0-rc1.19424.5 - 3.0.0-rc1.19424.5 - 3.0.0-rc1.19424.5 - 3.0.0-rc1.19424.5 - 3.0.0-rc1.19424.5 + 3.0.0-rc1.19424.9 + 3.0.0-rc1.19424.9 + 3.0.0-rc1.19424.9 + 3.0.0-rc1.19424.9 + 3.0.0-rc1.19424.9 + 3.0.0-rc1.19424.9 From 32e274df847598e035e6e67efdd751815d722e1b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 25 Aug 2019 10:40:42 +0000 Subject: [PATCH 060/420] Update dependencies from https://github.com/dotnet/toolset build 20190825.1 (#4252) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19425.1 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19425.1 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2ee6fd7d9..eb27dce31 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 973f58ee69286f1c7267deaf8ce624a2975fbe92 + 74824cce7e07e404542da3cf716a0ef95da9f41e https://github.com/dotnet/sdk 83dffb6faab234c0c878e92c1679fa47c0cab3dd - + https://github.com/dotnet/cli - 5f1d11ee274127248ebd021f9d00244e72e9b27c + 6d77eba0df04486501968506c7c16703618f71fd diff --git a/eng/Versions.props b/eng/Versions.props index eab93c93f..3423c7ed0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19424.13 + 3.0.100-rc1.19425.1 @@ -33,7 +33,7 @@ - 3.0.100-rc1.19424.6 + 3.0.100-rc1.19425.1 0.2.0 From aead1c3045dff23f356b46af201c9c56936084bc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 25 Aug 2019 13:10:42 +0000 Subject: [PATCH 061/420] Update dependencies from https://github.com/dotnet/toolset build 20190825.3 (#4254) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19425.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index eb27dce31..ac53eaabf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 74824cce7e07e404542da3cf716a0ef95da9f41e + 831519183012b69aeb6e4db901661691b3f1caad https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 3423c7ed0..90d681227 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19425.1 + 3.0.100-rc1.19425.3 From 93953ef90a0d08dc045ed95cb621d690808753cf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 25 Aug 2019 14:05:39 +0000 Subject: [PATCH 062/420] Update dependencies from https://github.com/dotnet/toolset build 20190825.5 (#4258) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19425.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ac53eaabf..140e3cf2a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 831519183012b69aeb6e4db901661691b3f1caad + 81026bec8fb79239b0ac8c277842c1df27287eee https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 90d681227..b75be55f7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19425.3 + 3.0.100-rc1.19425.5 From eac6a2052e803d6cab43f490d09ef6dbaec846c4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 25 Aug 2019 15:55:38 +0000 Subject: [PATCH 063/420] Update dependencies from https://github.com/dotnet/toolset build 20190825.8 (#4262) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19425.8 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19425.3 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 140e3cf2a..4aeec3672 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 81026bec8fb79239b0ac8c277842c1df27287eee + 11af4af72b724c396bdaac5226b0522c33e0e4fd https://github.com/dotnet/sdk 83dffb6faab234c0c878e92c1679fa47c0cab3dd - + https://github.com/dotnet/cli - 6d77eba0df04486501968506c7c16703618f71fd + 47782d55fb07166e263a5c7fbb8eb97a7bf5d4cc diff --git a/eng/Versions.props b/eng/Versions.props index b75be55f7..42ad94efd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19425.5 + 3.0.100-rc1.19425.8 @@ -33,7 +33,7 @@ - 3.0.100-rc1.19425.1 + 3.0.100-rc1.19425.3 0.2.0 From 33d6024452e7eb6896200b95d5448552153177da Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 25 Aug 2019 17:10:50 +0000 Subject: [PATCH 064/420] Update dependencies from https://github.com/dotnet/core-setup build 20190825.03 (#4266) - Microsoft.NETCore.App - 3.0.0-rc1-19425-03 - NETStandard.Library.Ref - 2.1.0-rc1-19425-03 - Microsoft.WindowsDesktop.App - 3.0.0-rc1-19425-03 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4aeec3672..28307c7e3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - abecfcd748e6b8850e1111184bf34c93e9277f90 + 6ae8b3864351bf40a6d85b2ec18064c915fd8aca - + https://github.com/dotnet/core-setup - abecfcd748e6b8850e1111184bf34c93e9277f90 + 6ae8b3864351bf40a6d85b2ec18064c915fd8aca - + https://github.com/dotnet/core-setup - abecfcd748e6b8850e1111184bf34c93e9277f90 + 6ae8b3864351bf40a6d85b2ec18064c915fd8aca https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 42ad94efd..8e0eeb9a5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ $(MicrosoftNETSdkPackageVersion) - 3.0.0-rc1-19423-11 + 3.0.0-rc1-19425-03 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -52,11 +52,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-rc1-19423-11 + 2.1.0-rc1-19425-03 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-rc1-19423-11 + 3.0.0-rc1-19425-03 $(MicrosoftWindowsDesktopAppPackageVersion) From fa4b672b15fec2625f2cdce3e24581ddb3a28785 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 25 Aug 2019 17:40:40 +0000 Subject: [PATCH 065/420] Update dependencies from https://github.com/dotnet/toolset build 20190825.11 (#4268) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19425.11 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 28307c7e3..1dd490c24 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 11af4af72b724c396bdaac5226b0522c33e0e4fd + 7802c1cca8ac1e737ab2445eae62f0d56a0a79f9 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 8e0eeb9a5..460177262 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19425.8 + 3.0.100-rc1.19425.11 From 20303950705798c3ed9c578035de75f95eaba752 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 26 Aug 2019 13:20:58 +0000 Subject: [PATCH 066/420] [release/3.0.1xx] Update dependencies from dotnet/toolset (#4272) * Update dependencies from https://github.com/dotnet/toolset build 20190825.13 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19425.13 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19425.7 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190826.4 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19426.4 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19425.7 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1dd490c24..1938def28 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 7802c1cca8ac1e737ab2445eae62f0d56a0a79f9 + a6b1a88ff6fb70d08783a44ea415940801e6dd8e https://github.com/dotnet/sdk 83dffb6faab234c0c878e92c1679fa47c0cab3dd - + https://github.com/dotnet/cli - 47782d55fb07166e263a5c7fbb8eb97a7bf5d4cc + 6d5b0d6e36ff4f807cfc3485e69c81692545c8e6 diff --git a/eng/Versions.props b/eng/Versions.props index 460177262..5101fab82 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19425.11 + 3.0.100-rc1.19426.4 @@ -33,7 +33,7 @@ - 3.0.100-rc1.19425.3 + 3.0.100-rc1.19425.7 0.2.0 From 8069648a40f6f753425adff19e698b1d25b18ea5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 26 Aug 2019 14:20:47 +0000 Subject: [PATCH 067/420] Update dependencies from https://github.com/dotnet/toolset build 20190826.8 (#4280) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19426.8 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1938def28..a051d4de4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - a6b1a88ff6fb70d08783a44ea415940801e6dd8e + ee445e9bd113855ecf092f9d27ce0ad0d0e49ea9 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 5101fab82..f3dcca146 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19426.4 + 3.0.100-rc1.19426.8 From 8dc46236d8ceec59ff1e2db8b5112851d27ea9f9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 26 Aug 2019 18:18:19 +0000 Subject: [PATCH 068/420] Update dependencies from https://github.com/dotnet/toolset build 20190826.9 (#4285) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview9.19426.9 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 58b5c51b8..38124dcf6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 56efdfe26fd60cee6be54704e9e726568af8cf97 + 9f5d58345aaf9bfe03d86ed1160ba30ad3eba6e7 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 127ff02d5..ebe3c5503 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview9.19424.12 + 3.0.100-preview9.19426.9 From 3ff96adbed8d6ffd81a9c7e5e09f3e6a4762dd0d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 26 Aug 2019 18:57:25 +0000 Subject: [PATCH 069/420] Update dependencies from https://github.com/aspnet/AspNetCore build 20190826.1 (#4286) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-rc1.19426.1 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-rc1.19426.1 - Microsoft.AspNetCore.App.Ref - 3.0.0-rc1.19426.1 - dotnet-watch - 3.0.0-rc1.19426.1 - dotnet-user-secrets - 3.0.0-rc1.19426.1 - dotnet-dev-certs - 3.0.0-rc1.19426.1 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a051d4de4..7acdce73b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup 6ae8b3864351bf40a6d85b2ec18064c915fd8aca - + https://github.com/aspnet/AspNetCore - ec52b9d4d0a34e08768da3b5b4090a8c42351f99 + b496781792dc16259d7a25fd29f5c1e4da6ebe78 - + https://github.com/aspnet/AspNetCore - ec52b9d4d0a34e08768da3b5b4090a8c42351f99 + b496781792dc16259d7a25fd29f5c1e4da6ebe78 - + https://github.com/aspnet/AspNetCore - ec52b9d4d0a34e08768da3b5b4090a8c42351f99 + b496781792dc16259d7a25fd29f5c1e4da6ebe78 - + https://github.com/aspnet/AspNetCore - ec52b9d4d0a34e08768da3b5b4090a8c42351f99 + b496781792dc16259d7a25fd29f5c1e4da6ebe78 - + https://github.com/aspnet/AspNetCore - ec52b9d4d0a34e08768da3b5b4090a8c42351f99 + b496781792dc16259d7a25fd29f5c1e4da6ebe78 - + https://github.com/aspnet/AspNetCore - ec52b9d4d0a34e08768da3b5b4090a8c42351f99 + b496781792dc16259d7a25fd29f5c1e4da6ebe78 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index f3dcca146..20bb61bc9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-rc1.19424.9 - 3.0.0-rc1.19424.9 - 3.0.0-rc1.19424.9 - 3.0.0-rc1.19424.9 - 3.0.0-rc1.19424.9 - 3.0.0-rc1.19424.9 + 3.0.0-rc1.19426.1 + 3.0.0-rc1.19426.1 + 3.0.0-rc1.19426.1 + 3.0.0-rc1.19426.1 + 3.0.0-rc1.19426.1 + 3.0.0-rc1.19426.1 From 03df8dd972ea2c95a408a73f334b1c3accaa7dfa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 26 Aug 2019 21:00:47 +0000 Subject: [PATCH 070/420] Update dependencies from https://github.com/dotnet/toolset build 20190826.10 (#4288) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19426.10 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19426.4 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7acdce73b..175f44e64 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - ee445e9bd113855ecf092f9d27ce0ad0d0e49ea9 + c95d53485817fbbf8927817893694e44956b80cf https://github.com/dotnet/sdk 83dffb6faab234c0c878e92c1679fa47c0cab3dd - + https://github.com/dotnet/cli - 6d5b0d6e36ff4f807cfc3485e69c81692545c8e6 + ac4414a5d43666a1d0d1bd4d8a5e99c28f037569 diff --git a/eng/Versions.props b/eng/Versions.props index 20bb61bc9..9222f9c8c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19426.8 + 3.0.100-rc1.19426.10 @@ -33,7 +33,7 @@ - 3.0.100-rc1.19425.7 + 3.0.100-rc1.19426.4 0.2.0 From 0d252d6c1feb03f37c697118f7e9787b1ee549c5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 26 Aug 2019 21:10:52 +0000 Subject: [PATCH 071/420] Update dependencies from https://github.com/dotnet/core-setup build 20190826.07 (#4289) - Microsoft.NETCore.App - 3.0.0-rc1-19426-07 - NETStandard.Library.Ref - 2.1.0-rc1-19426-07 - Microsoft.WindowsDesktop.App - 3.0.0-rc1-19426-07 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 175f44e64..1fdf0f3ab 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 6ae8b3864351bf40a6d85b2ec18064c915fd8aca + 28f20a7a57df6f82b7e17c68485e08ce464b8123 - + https://github.com/dotnet/core-setup - 6ae8b3864351bf40a6d85b2ec18064c915fd8aca + 28f20a7a57df6f82b7e17c68485e08ce464b8123 - + https://github.com/dotnet/core-setup - 6ae8b3864351bf40a6d85b2ec18064c915fd8aca + 28f20a7a57df6f82b7e17c68485e08ce464b8123 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 9222f9c8c..5990f06af 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ $(MicrosoftNETSdkPackageVersion) - 3.0.0-rc1-19425-03 + 3.0.0-rc1-19426-07 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -52,11 +52,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-rc1-19425-03 + 2.1.0-rc1-19426-07 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-rc1-19425-03 + 3.0.0-rc1-19426-07 $(MicrosoftWindowsDesktopAppPackageVersion) From 450f40f6ad9a1fbaaf2b4a04c0316882af0f1279 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 26 Aug 2019 21:50:57 +0000 Subject: [PATCH 072/420] Update dependencies from https://github.com/dotnet/toolset build 20190826.11 (#4291) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19426.11 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1fdf0f3ab..92874effc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - c95d53485817fbbf8927817893694e44956b80cf + 05d4bf34e1ffb92a203f69962e0590e6daee569e https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 5990f06af..7c6ff0669 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19426.10 + 3.0.100-rc1.19426.11 From acd7d01676f93a3f84a725e40ea2388115cf28cf Mon Sep 17 00:00:00 2001 From: jbeisner Date: Mon, 26 Aug 2019 15:39:30 -0700 Subject: [PATCH 073/420] Add height to the 'FailureRestartText' --- src/redist/targets/packaging/windows/clisdk/bundle.thm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/packaging/windows/clisdk/bundle.thm b/src/redist/targets/packaging/windows/clisdk/bundle.thm index 4df41b683..a0271d416 100644 --- a/src/redist/targets/packaging/windows/clisdk/bundle.thm +++ b/src/redist/targets/packaging/windows/clisdk/bundle.thm @@ -92,7 +92,7 @@ #(loc.FailureRepairHeader) #(loc.FailureHyperlinkLogText) - #(loc.FailureRestartText) + #(loc.FailureRestartText) From 539af1aa088f84e07a00e269619a6e1a0eacc6a7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 26 Aug 2019 23:10:49 +0000 Subject: [PATCH 074/420] Update dependencies from https://github.com/dotnet/toolset build 20190826.13 (#4294) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19426.13 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19426.6 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 92874effc..d87bedf3e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 05d4bf34e1ffb92a203f69962e0590e6daee569e + 80d1f359ace1fa5e427bae49ed5425f602ac7f06 https://github.com/dotnet/sdk 83dffb6faab234c0c878e92c1679fa47c0cab3dd - + https://github.com/dotnet/cli - ac4414a5d43666a1d0d1bd4d8a5e99c28f037569 + 5ebad53aa4326518d01bc1c04f86bf87927edf8d diff --git a/eng/Versions.props b/eng/Versions.props index 7c6ff0669..7d1d10c07 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19426.11 + 3.0.100-rc1.19426.13 @@ -33,7 +33,7 @@ - 3.0.100-rc1.19426.4 + 3.0.100-rc1.19426.6 0.2.0 From 03c0af2c400232de21d226946102d1e04eec080e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 27 Aug 2019 03:06:11 +0000 Subject: [PATCH 075/420] Update dependencies from https://github.com/dotnet/toolset build 20190826.17 (#4301) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview9.19426.17 Dependency coherency updates - Microsoft.NET.Sdk - 3.0.100-preview9.19426.11 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 38124dcf6..e57fb4be9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,13 +42,13 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 9f5d58345aaf9bfe03d86ed1160ba30ad3eba6e7 + fdf175bb49c7d4a4dbd2484dbdcd4f9267311157 - + https://github.com/dotnet/sdk - 21ebcc7ff5b9136ecaaf2b1f362f5588c3cc520a + 1c91e0a4d59ba7d254637f3e3a430ad3aab6992f https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index ebe3c5503..1555438de 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview9.19426.9 + 3.0.100-preview9.19426.17 @@ -40,7 +40,7 @@ - 3.0.100-preview9.19413.5 + 3.0.100-preview9.19426.11 $(MicrosoftNETSdkPackageVersion) From 8e7ef240a585805f97abd2c15a39816d00ea2ffd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 26 Aug 2019 20:36:45 -0700 Subject: [PATCH 076/420] Update dependencies from https://github.com/dotnet/toolset build 20190826.19 (#4306) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview9.19426.19 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview9.19426.10 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e57fb4be9..b3aa04426 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - fdf175bb49c7d4a4dbd2484dbdcd4f9267311157 + 09b1fb2a89520ab36ad81eeaeedc3c1104df12fa https://github.com/dotnet/sdk 1c91e0a4d59ba7d254637f3e3a430ad3aab6992f - + https://github.com/dotnet/cli - d1dcc4f61e55cb9ac5ed2691c8f308e8879bde57 + 2859af6e958aa74edfa69ceffa33f1338996e011 diff --git a/eng/Versions.props b/eng/Versions.props index 1555438de..a76c0fedb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-preview9.19426.17 + 3.0.100-preview9.19426.19 @@ -33,7 +33,7 @@ - 3.0.100-preview9.19424.5 + 3.0.100-preview9.19426.10 0.2.0 From 04ca9600994ca92e5547ebe1bccec2b5a5c9e8b8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 27 Aug 2019 04:06:03 +0000 Subject: [PATCH 077/420] Update dependencies from https://github.com/dotnet/core-setup build 20190826.11 (#4304) - Microsoft.NETCore.App - 3.0.0-rc1-19426-11 - NETStandard.Library.Ref - 2.1.0-rc1-19426-11 - Microsoft.WindowsDesktop.App - 3.0.0-rc1-19426-11 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d87bedf3e..6250aa306 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 28f20a7a57df6f82b7e17c68485e08ce464b8123 + b33b6c20d855e7f9fdda6383ad12d849079f9b21 - + https://github.com/dotnet/core-setup - 28f20a7a57df6f82b7e17c68485e08ce464b8123 + b33b6c20d855e7f9fdda6383ad12d849079f9b21 - + https://github.com/dotnet/core-setup - 28f20a7a57df6f82b7e17c68485e08ce464b8123 + b33b6c20d855e7f9fdda6383ad12d849079f9b21 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 7d1d10c07..f8be7f6c7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ $(MicrosoftNETSdkPackageVersion) - 3.0.0-rc1-19426-07 + 3.0.0-rc1-19426-11 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -52,11 +52,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-rc1-19426-07 + 2.1.0-rc1-19426-11 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-rc1-19426-07 + 3.0.0-rc1-19426-11 $(MicrosoftWindowsDesktopAppPackageVersion) From fa04d4e72df9a826ac41141dee9dddc4b30d1c49 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 27 Aug 2019 04:20:31 +0000 Subject: [PATCH 078/420] Update dependencies from https://github.com/dotnet/toolset build 20190826.18 (#4307) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19426.18 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6250aa306..cb483b2c0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 80d1f359ace1fa5e427bae49ed5425f602ac7f06 + a555933a842d997c374cbfebf0b615910d7865af https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index f8be7f6c7..23c8c3202 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19426.13 + 3.0.100-rc1.19426.18 From cda5058c5137d5ce3a79186d8a13f8076aa7ca41 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 27 Aug 2019 04:51:23 +0000 Subject: [PATCH 079/420] Update dependencies from https://github.com/dotnet/toolset build 20190826.20 (#4310) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19426.20 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cb483b2c0..964c55ec0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - a555933a842d997c374cbfebf0b615910d7865af + 5479336bf8bca9192a40c01cffc643d4bce01925 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 23c8c3202..87f0b2dab 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19426.18 + 3.0.100-rc1.19426.20 From 423d34a75547019f0e5dd4bee9c92d502dc527a5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 27 Aug 2019 05:30:46 +0000 Subject: [PATCH 080/420] Update dependencies from https://github.com/dotnet/toolset build 20190826.23 (#4312) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19426.23 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19426.13 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 964c55ec0..800d4a10b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 5479336bf8bca9192a40c01cffc643d4bce01925 + de0fff1f3071d72cd1fef392015ccadfd71e00f8 https://github.com/dotnet/sdk 83dffb6faab234c0c878e92c1679fa47c0cab3dd - + https://github.com/dotnet/cli - 5ebad53aa4326518d01bc1c04f86bf87927edf8d + d6eac03c6b0f411b5e7dba871eac7a7b77176b1a diff --git a/eng/Versions.props b/eng/Versions.props index 87f0b2dab..122485c9e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19426.20 + 3.0.100-rc1.19426.23 @@ -33,7 +33,7 @@ - 3.0.100-rc1.19426.6 + 3.0.100-rc1.19426.13 0.2.0 From 177eabe466ab0a3dc6cae7f702b3c0f807093310 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 27 Aug 2019 13:35:59 +0000 Subject: [PATCH 081/420] Update dependencies from https://github.com/dotnet/toolset build 20190827.5 (#4325) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19427.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 800d4a10b..92b41b11f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - de0fff1f3071d72cd1fef392015ccadfd71e00f8 + 2c92f20c662f949730641ef2765ddcd42f1c08d3 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 122485c9e..c8718a226 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19426.23 + 3.0.100-rc1.19427.5 From 83d111148b424f4ee54d6578b1652858e891ef74 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 27 Aug 2019 16:07:57 +0000 Subject: [PATCH 082/420] [release/3.0.1xx] Update dependencies from aspnet/AspNetCore (#4319) * Update dependencies from https://github.com/aspnet/AspNetCore build 20190826.12 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-rc1.19426.12 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-rc1.19426.12 - Microsoft.AspNetCore.App.Ref - 3.0.0-rc1.19426.12 - dotnet-watch - 3.0.0-rc1.19426.12 - dotnet-user-secrets - 3.0.0-rc1.19426.12 - dotnet-dev-certs - 3.0.0-rc1.19426.12 * Update dependencies from https://github.com/aspnet/AspNetCore build 20190827.1 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-rc1.19427.1 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-rc1.19427.1 - Microsoft.AspNetCore.App.Ref - 3.0.0-rc1.19427.1 - dotnet-watch - 3.0.0-rc1.19427.1 - dotnet-user-secrets - 3.0.0-rc1.19427.1 - dotnet-dev-certs - 3.0.0-rc1.19427.1 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 92b41b11f..8f3825d55 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup b33b6c20d855e7f9fdda6383ad12d849079f9b21 - + https://github.com/aspnet/AspNetCore - b496781792dc16259d7a25fd29f5c1e4da6ebe78 + 8d817f80700863f1f4139dd91c50bb006c2c22c7 - + https://github.com/aspnet/AspNetCore - b496781792dc16259d7a25fd29f5c1e4da6ebe78 + 8d817f80700863f1f4139dd91c50bb006c2c22c7 - + https://github.com/aspnet/AspNetCore - b496781792dc16259d7a25fd29f5c1e4da6ebe78 + 8d817f80700863f1f4139dd91c50bb006c2c22c7 - + https://github.com/aspnet/AspNetCore - b496781792dc16259d7a25fd29f5c1e4da6ebe78 + 8d817f80700863f1f4139dd91c50bb006c2c22c7 - + https://github.com/aspnet/AspNetCore - b496781792dc16259d7a25fd29f5c1e4da6ebe78 + 8d817f80700863f1f4139dd91c50bb006c2c22c7 - + https://github.com/aspnet/AspNetCore - b496781792dc16259d7a25fd29f5c1e4da6ebe78 + 8d817f80700863f1f4139dd91c50bb006c2c22c7 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index c8718a226..0d540dc9a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-rc1.19426.1 - 3.0.0-rc1.19426.1 - 3.0.0-rc1.19426.1 - 3.0.0-rc1.19426.1 - 3.0.0-rc1.19426.1 - 3.0.0-rc1.19426.1 + 3.0.0-rc1.19427.1 + 3.0.0-rc1.19427.1 + 3.0.0-rc1.19427.1 + 3.0.0-rc1.19427.1 + 3.0.0-rc1.19427.1 + 3.0.0-rc1.19427.1 From a4f411d3b730b3e9536ac7f96dfe301ca391e96c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 27 Aug 2019 17:55:46 +0000 Subject: [PATCH 083/420] Update dependencies from https://github.com/dotnet/toolset build 20190827.9 (#4331) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19427.9 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19427.4 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8f3825d55..059579970 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 2c92f20c662f949730641ef2765ddcd42f1c08d3 + d88792a05052022c29f6c702e10559d46dba9cd2 https://github.com/dotnet/sdk 83dffb6faab234c0c878e92c1679fa47c0cab3dd - + https://github.com/dotnet/cli - d6eac03c6b0f411b5e7dba871eac7a7b77176b1a + d23afb6757bb73014e8c23b3f7c772578827049c diff --git a/eng/Versions.props b/eng/Versions.props index 0d540dc9a..dca68f442 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19427.5 + 3.0.100-rc1.19427.9 @@ -33,7 +33,7 @@ - 3.0.100-rc1.19426.13 + 3.0.100-rc1.19427.4 0.2.0 From f54ee249232163e78900ec8e118466a2ac172be2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 27 Aug 2019 18:55:46 +0000 Subject: [PATCH 084/420] [release/3.0.1xx] Update dependencies from dotnet/toolset (#4334) * Update dependencies from https://github.com/dotnet/toolset build 20190827.10 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19427.10 * Update dependencies from https://github.com/dotnet/toolset build 20190827.11 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19427.11 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c369f6877..cd45949fe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - d88792a05052022c29f6c702e10559d46dba9cd2 + 9c967fe130441b9f9725c9bf8317b7067249b855 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index e592c96a5..86f293491 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19427.9 + 3.0.100-rc1.19427.11 From 6ef4a17f0e8bd7c141493aa6718b323a2f88ee1c Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Tue, 27 Aug 2019 13:06:39 -0700 Subject: [PATCH 085/420] Fix branch info in release/3.0.1xx branch Channel was changed incorrectly in https://github.com/dotnet/core-sdk/pull/4182/files --- src/CopyToLatest/targets/BranchInfo.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CopyToLatest/targets/BranchInfo.props b/src/CopyToLatest/targets/BranchInfo.props index f11bec24c..d103b00f0 100644 --- a/src/CopyToLatest/targets/BranchInfo.props +++ b/src/CopyToLatest/targets/BranchInfo.props @@ -1,5 +1,5 @@ - release/3.0.100-preview9 + release/3.0.1xx From 6a15231b17a08a193fddbfcf29cffbb32e646cc3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 27 Aug 2019 22:10:57 +0000 Subject: [PATCH 086/420] Update dependencies from https://github.com/dotnet/core-setup build 20190827.07 (#4344) - Microsoft.NETCore.App - 3.0.0-rc1-19427-07 - NETStandard.Library.Ref - 2.1.0-rc1-19427-07 - Microsoft.WindowsDesktop.App - 3.0.0-rc1-19427-07 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-preview9.19415.10 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-preview9.19416.2 (parent: Microsoft.WindowsDesktop.App) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cd45949fe..1d49e48d4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - b33b6c20d855e7f9fdda6383ad12d849079f9b21 + 02f28cebec1e6d7e92991cee52f8cda668497123 - + https://github.com/dotnet/core-setup - b33b6c20d855e7f9fdda6383ad12d849079f9b21 + 02f28cebec1e6d7e92991cee52f8cda668497123 - + https://github.com/dotnet/core-setup - b33b6c20d855e7f9fdda6383ad12d849079f9b21 + 02f28cebec1e6d7e92991cee52f8cda668497123 https://github.com/aspnet/AspNetCore @@ -55,13 +55,13 @@ d23afb6757bb73014e8c23b3f7c772578827049c - + https://github.com/dotnet/winforms - 7f2c6adc229513b8a3690d0c59079073a783d33f + 8b19141d6b0b221167bd7d1731cbc6aa9898da75 - + https://github.com/dotnet/wpf - 4524e3a8b4d8ebc8643b6e2185a597700261e1fb + 105b673bddd8665580a94878db12ac97af8fa794 diff --git a/eng/Versions.props b/eng/Versions.props index 86f293491..c2bc85130 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,11 +16,11 @@ - 4.8.0-preview9.19420.3 + 4.8.0-preview9.19415.10 - 3.0.0-preview9.19421.3 + 3.0.0-preview9.19416.2 @@ -44,7 +44,7 @@ $(MicrosoftNETSdkPackageVersion) - 3.0.0-rc1-19426-11 + 3.0.0-rc1-19427-07 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -52,11 +52,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-rc1-19426-11 + 2.1.0-rc1-19427-07 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-rc1-19426-11 + 3.0.0-rc1-19427-07 $(MicrosoftWindowsDesktopAppPackageVersion) From d89005cab7a6d0d301cdf4d8b361739174ac8dac Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 27 Aug 2019 22:51:10 +0000 Subject: [PATCH 087/420] Update dependencies from https://github.com/dotnet/toolset build 20190827.15 (#4345) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19427.15 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1d49e48d4..2606f7272 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 9c967fe130441b9f9725c9bf8317b7067249b855 + 2c2b8e76d3355689cde2b694c6a49df2465462f4 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index c2bc85130..e27d3484b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19427.11 + 3.0.100-rc1.19427.15 From b8304f892d5c644d12fa995545d06bf82f55243f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 28 Aug 2019 00:05:10 +0000 Subject: [PATCH 088/420] Update dependencies from https://github.com/dotnet/toolset build 20190827.18 (#4349) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19427.18 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19427.10 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2606f7272..e396c839b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 2c2b8e76d3355689cde2b694c6a49df2465462f4 + 2612285fcf16c34db061ba88c7b7efb68149c67d https://github.com/dotnet/sdk 83dffb6faab234c0c878e92c1679fa47c0cab3dd - + https://github.com/dotnet/cli - d23afb6757bb73014e8c23b3f7c772578827049c + 2c7b309e8641f6b8ff187592c7cb9fdcc606f55f diff --git a/eng/Versions.props b/eng/Versions.props index e27d3484b..c057ee9bd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19427.15 + 3.0.100-rc1.19427.18 @@ -33,7 +33,7 @@ - 3.0.100-rc1.19427.4 + 3.0.100-rc1.19427.10 0.2.0 From c7c52744218c49ae8355a8be2cf8dfa99c7d5764 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 28 Aug 2019 00:10:52 +0000 Subject: [PATCH 089/420] Update dependencies from https://github.com/dotnet/core-setup build 20190827.09 (#4350) - Microsoft.NETCore.App - 3.0.0-rc1-19427-09 - NETStandard.Library.Ref - 2.1.0-rc1-19427-09 - Microsoft.WindowsDesktop.App - 3.0.0-rc1-19427-09 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e396c839b..86ef25cd9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 02f28cebec1e6d7e92991cee52f8cda668497123 + d90543c070331ee577067ee7aedf709d80588a66 - + https://github.com/dotnet/core-setup - 02f28cebec1e6d7e92991cee52f8cda668497123 + d90543c070331ee577067ee7aedf709d80588a66 - + https://github.com/dotnet/core-setup - 02f28cebec1e6d7e92991cee52f8cda668497123 + d90543c070331ee577067ee7aedf709d80588a66 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index c057ee9bd..c43b0297e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ $(MicrosoftNETSdkPackageVersion) - 3.0.0-rc1-19427-07 + 3.0.0-rc1-19427-09 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -52,11 +52,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-rc1-19427-07 + 2.1.0-rc1-19427-09 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-rc1-19427-07 + 3.0.0-rc1-19427-09 $(MicrosoftWindowsDesktopAppPackageVersion) From 12f800064ce89eed239f0bfe7149cd5d0bd13356 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 28 Aug 2019 01:01:11 +0000 Subject: [PATCH 090/420] Update dependencies from https://github.com/dotnet/toolset build 20190827.19 (#4351) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19427.19 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 86ef25cd9..697bdd166 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 2612285fcf16c34db061ba88c7b7efb68149c67d + 4f8a91d109c7506df0422cfe413441b10a95af8f https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index c43b0297e..29652f49b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19427.18 + 3.0.100-rc1.19427.19 From 3f6f0ede400b92d3956870db6066dcca2948532a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 28 Aug 2019 02:05:47 +0000 Subject: [PATCH 091/420] Update dependencies from https://github.com/dotnet/toolset build 20190827.20 (#4354) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19427.20 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19427.11 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 697bdd166..a39f14608 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 4f8a91d109c7506df0422cfe413441b10a95af8f + 98e7fd3a2fa361de25dac12d588e4dc80f7d3460 https://github.com/dotnet/sdk 83dffb6faab234c0c878e92c1679fa47c0cab3dd - + https://github.com/dotnet/cli - 2c7b309e8641f6b8ff187592c7cb9fdcc606f55f + 896e3106795790420812137fbc1f4283a2b27e1c diff --git a/eng/Versions.props b/eng/Versions.props index 29652f49b..ab78fffe5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19427.19 + 3.0.100-rc1.19427.20 @@ -33,7 +33,7 @@ - 3.0.100-rc1.19427.10 + 3.0.100-rc1.19427.11 0.2.0 From 2489e3dd0db611eca573ae9efe9db94619d50cde Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 28 Aug 2019 03:49:55 +0000 Subject: [PATCH 092/420] Update dependencies from https://github.com/aspnet/AspNetCore build 20190827.14 (#4357) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-rc1.19427.14 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-rc1.19427.14 - Microsoft.AspNetCore.App.Ref - 3.0.0-rc1.19427.14 - dotnet-watch - 3.0.0-rc1.19427.14 - dotnet-user-secrets - 3.0.0-rc1.19427.14 - dotnet-dev-certs - 3.0.0-rc1.19427.14 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a39f14608..7e765bae0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup d90543c070331ee577067ee7aedf709d80588a66 - + https://github.com/aspnet/AspNetCore - 8d817f80700863f1f4139dd91c50bb006c2c22c7 + 649bcc8f616a856d8db3627d74f2d1edfb4526d5 - + https://github.com/aspnet/AspNetCore - 8d817f80700863f1f4139dd91c50bb006c2c22c7 + 649bcc8f616a856d8db3627d74f2d1edfb4526d5 - + https://github.com/aspnet/AspNetCore - 8d817f80700863f1f4139dd91c50bb006c2c22c7 + 649bcc8f616a856d8db3627d74f2d1edfb4526d5 - + https://github.com/aspnet/AspNetCore - 8d817f80700863f1f4139dd91c50bb006c2c22c7 + 649bcc8f616a856d8db3627d74f2d1edfb4526d5 - + https://github.com/aspnet/AspNetCore - 8d817f80700863f1f4139dd91c50bb006c2c22c7 + 649bcc8f616a856d8db3627d74f2d1edfb4526d5 - + https://github.com/aspnet/AspNetCore - 8d817f80700863f1f4139dd91c50bb006c2c22c7 + 649bcc8f616a856d8db3627d74f2d1edfb4526d5 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index ab78fffe5..5f246ea9c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-rc1.19427.1 - 3.0.0-rc1.19427.1 - 3.0.0-rc1.19427.1 - 3.0.0-rc1.19427.1 - 3.0.0-rc1.19427.1 - 3.0.0-rc1.19427.1 + 3.0.0-rc1.19427.14 + 3.0.0-rc1.19427.14 + 3.0.0-rc1.19427.14 + 3.0.0-rc1.19427.14 + 3.0.0-rc1.19427.14 + 3.0.0-rc1.19427.14 From c06fb342c4cb43fa0740944f01ba09dd0f1beed1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 28 Aug 2019 05:31:22 +0000 Subject: [PATCH 093/420] [release/3.0.1xx] Update dependencies from dotnet/toolset (#4358) * Update dependencies from https://github.com/dotnet/toolset build 20190827.22 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19427.22 * Update dependencies from https://github.com/dotnet/toolset build 20190827.23 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19427.23 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19427.13 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7e765bae0..14ffa8a18 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 98e7fd3a2fa361de25dac12d588e4dc80f7d3460 + c7489399c03f27b4b0c6e3e8a63f1d5e9de03148 https://github.com/dotnet/sdk 83dffb6faab234c0c878e92c1679fa47c0cab3dd - + https://github.com/dotnet/cli - 896e3106795790420812137fbc1f4283a2b27e1c + 3cbfd75146cd370f64c7a98a6710fa6c5cef4349 diff --git a/eng/Versions.props b/eng/Versions.props index 5f246ea9c..657bc1419 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19427.20 + 3.0.100-rc1.19427.23 @@ -33,7 +33,7 @@ - 3.0.100-rc1.19427.11 + 3.0.100-rc1.19427.13 0.2.0 From 9d825f3cda02b8919379cd6d2e4fd7302c6f68d1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 28 Aug 2019 09:00:51 +0000 Subject: [PATCH 094/420] Update dependencies from https://github.com/dotnet/toolset build 20190828.1 (#4364) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19428.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 14ffa8a18..169e3255e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - c7489399c03f27b4b0c6e3e8a63f1d5e9de03148 + 39a73ce07cf991edab4fd6ad2b213bf53ba8aaa5 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 657bc1419..1de879412 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19427.23 + 3.0.100-rc1.19428.1 From 3222213875f72291a8b01bf3fca920cc5159e691 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 28 Aug 2019 13:12:43 +0000 Subject: [PATCH 095/420] [release/3.0.1xx] Update dependencies from dotnet/toolset (#4366) * Update dependencies from https://github.com/dotnet/toolset build 20190828.2 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19428.2 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19428.1 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190828.5 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19428.5 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19428.1 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 169e3255e..ed3abe525 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 39a73ce07cf991edab4fd6ad2b213bf53ba8aaa5 + 9a59763f24321ed325d2a80a59c4489fd1184c96 https://github.com/dotnet/sdk 83dffb6faab234c0c878e92c1679fa47c0cab3dd - + https://github.com/dotnet/cli - 3cbfd75146cd370f64c7a98a6710fa6c5cef4349 + 5f205ac1256138f818bba051a57be722bc0138cb diff --git a/eng/Versions.props b/eng/Versions.props index 1de879412..0b93bf50a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19428.1 + 3.0.100-rc1.19428.5 @@ -33,7 +33,7 @@ - 3.0.100-rc1.19427.13 + 3.0.100-rc1.19428.1 0.2.0 From df71a778b4f46850a92be4353c8f07b402ff29ac Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 28 Aug 2019 14:35:40 +0000 Subject: [PATCH 096/420] Update dependencies from https://github.com/dotnet/toolset build 20190828.7 (#4371) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19428.7 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ed3abe525..ce48bacc7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 9a59763f24321ed325d2a80a59c4489fd1184c96 + 0a0a1d369f0560bdc207301e75016322f813312d https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 0b93bf50a..a6930bae3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19428.5 + 3.0.100-rc1.19428.7 From c11194143b2c87ddad30c143a1dcf54640e6d3c4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 28 Aug 2019 15:06:28 +0000 Subject: [PATCH 097/420] Update dependencies from https://github.com/dotnet/toolset build 20190828.8 (#4373) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19428.8 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ce48bacc7..329504847 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 0a0a1d369f0560bdc207301e75016322f813312d + e03a1bcdb2302f842acef42fb371c84bc21161e0 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index a6930bae3..4510df111 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19428.7 + 3.0.100-rc1.19428.8 From 82d1b09d13e9c2d92188c45eed48f5943b2edc57 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 28 Aug 2019 18:57:52 +0000 Subject: [PATCH 098/420] [release/3.0.1xx] Update dependencies from dotnet/core-setup (#4363) * Update dependencies from https://github.com/dotnet/core-setup build 20190827.13 - Microsoft.NETCore.App - 3.0.0-rc1-19427-13 - NETStandard.Library.Ref - 2.1.0-rc1-19427-13 - Microsoft.WindowsDesktop.App - 3.0.0-rc1-19427-13 * Update dependencies from https://github.com/dotnet/core-setup build 20190828.05 - Microsoft.NETCore.App - 3.0.0-rc1-19428-05 - NETStandard.Library.Ref - 2.1.0-rc1-19428-05 - Microsoft.WindowsDesktop.App - 3.0.0-rc1-19428-05 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 329504847..f3bc3a781 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - d90543c070331ee577067ee7aedf709d80588a66 + a94f49be4f57855b142b23bc17486811591ac54f - + https://github.com/dotnet/core-setup - d90543c070331ee577067ee7aedf709d80588a66 + a94f49be4f57855b142b23bc17486811591ac54f - + https://github.com/dotnet/core-setup - d90543c070331ee577067ee7aedf709d80588a66 + a94f49be4f57855b142b23bc17486811591ac54f https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 4510df111..0b69424b8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ $(MicrosoftNETSdkPackageVersion) - 3.0.0-rc1-19427-09 + 3.0.0-rc1-19428-05 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -52,11 +52,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-rc1-19427-09 + 2.1.0-rc1-19428-05 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-rc1-19427-09 + 3.0.0-rc1-19428-05 $(MicrosoftWindowsDesktopAppPackageVersion) From 17b2e0d6f52442ddb713bfd5decdb5fc1945421c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 28 Aug 2019 19:15:27 +0000 Subject: [PATCH 099/420] Update dependencies from https://github.com/dotnet/toolset build 20190828.11 (#4376) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19428.11 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f3bc3a781..43f5ac636 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - e03a1bcdb2302f842acef42fb371c84bc21161e0 + 6bef3ab12c1b5992b3f2e694f8049453bdb9ed7c https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 0b69424b8..2eb184175 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19428.8 + 3.0.100-rc1.19428.11 From 54161f1c17262c32453e3c55aecc7c3974890259 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 28 Aug 2019 19:56:26 +0000 Subject: [PATCH 100/420] [release/3.0.1xx] Update dependencies from dotnet/toolset (#4377) * Update dependencies from https://github.com/dotnet/toolset build 20190828.13 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19428.13 * Update dependencies from https://github.com/dotnet/toolset build 20190828.14 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19428.14 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 43f5ac636..9cc46a3c0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 6bef3ab12c1b5992b3f2e694f8049453bdb9ed7c + bcc91c82d6cbf5e7512a08119a4cb3c8d6928022 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 2eb184175..b2a47a495 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19428.11 + 3.0.100-rc1.19428.14 From ddc1d535e2ebb751423b6d69dfc6425a7d26006a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 28 Aug 2019 20:41:15 +0000 Subject: [PATCH 101/420] Update dependencies from https://github.com/dotnet/core-setup build 20190828.07 (#4380) - Microsoft.NETCore.App - 3.0.0-rc1-19428-07 - NETStandard.Library.Ref - 2.1.0-rc1-19428-07 - Microsoft.WindowsDesktop.App - 3.0.0-rc1-19428-07 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9cc46a3c0..c27805ad0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - a94f49be4f57855b142b23bc17486811591ac54f + 843b627147f0948b730eabe6def9ea1e606991da - + https://github.com/dotnet/core-setup - a94f49be4f57855b142b23bc17486811591ac54f + 843b627147f0948b730eabe6def9ea1e606991da - + https://github.com/dotnet/core-setup - a94f49be4f57855b142b23bc17486811591ac54f + 843b627147f0948b730eabe6def9ea1e606991da https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index b2a47a495..d8fe191b3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ $(MicrosoftNETSdkPackageVersion) - 3.0.0-rc1-19428-05 + 3.0.0-rc1-19428-07 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -52,11 +52,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-rc1-19428-05 + 2.1.0-rc1-19428-07 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-rc1-19428-05 + 3.0.0-rc1-19428-07 $(MicrosoftWindowsDesktopAppPackageVersion) From f3d6024dfd8a1cd383efebb86378a87494d7811e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 28 Aug 2019 21:05:48 +0000 Subject: [PATCH 102/420] Update dependencies from https://github.com/dotnet/toolset build 20190828.15 (#4381) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19428.15 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c27805ad0..1e029e945 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - bcc91c82d6cbf5e7512a08119a4cb3c8d6928022 + 0fb3d46bc26e27d9fec28a23ca9d24a2254557fd https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index d8fe191b3..6e65359aa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19428.14 + 3.0.100-rc1.19428.15 From 3968de368b0d8ff31d54e7c1a0e8b4750717e000 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 28 Aug 2019 22:05:43 +0000 Subject: [PATCH 103/420] Update dependencies from https://github.com/dotnet/toolset build 20190828.16 (#4382) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19428.16 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19428.4 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1e029e945..f36108635 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 0fb3d46bc26e27d9fec28a23ca9d24a2254557fd + f43a4982b8eba13bda2a564aa19808d9f85ef8b1 https://github.com/dotnet/sdk 83dffb6faab234c0c878e92c1679fa47c0cab3dd - + https://github.com/dotnet/cli - 5f205ac1256138f818bba051a57be722bc0138cb + 93ba3b2e1d4359814fd7affc4024afb41e9aedd7 diff --git a/eng/Versions.props b/eng/Versions.props index 6e65359aa..18589df48 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19428.15 + 3.0.100-rc1.19428.16 @@ -33,7 +33,7 @@ - 3.0.100-rc1.19428.1 + 3.0.100-rc1.19428.4 0.2.0 From 9d7f9ba77050cffe3d7eb9568d089df00c2949dc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 28 Aug 2019 22:14:33 +0000 Subject: [PATCH 104/420] [release/3.0.1xx] Update dependencies from aspnet/AspNetCore (#4378) * Update dependencies from https://github.com/aspnet/AspNetCore build 20190828.1 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-rc1.19428.1 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-rc1.19428.1 - Microsoft.AspNetCore.App.Ref - 3.0.0-rc1.19428.1 - dotnet-watch - 3.0.0-rc1.19428.1 - dotnet-user-secrets - 3.0.0-rc1.19428.1 - dotnet-dev-certs - 3.0.0-rc1.19428.1 * Update dependencies from https://github.com/aspnet/AspNetCore build 20190828.5 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-rc1.19428.5 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-rc1.19428.5 - Microsoft.AspNetCore.App.Ref - 3.0.0-rc1.19428.5 - dotnet-watch - 3.0.0-rc1.19428.5 - dotnet-user-secrets - 3.0.0-rc1.19428.5 - dotnet-dev-certs - 3.0.0-rc1.19428.5 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f36108635..e68297cfc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup 843b627147f0948b730eabe6def9ea1e606991da - + https://github.com/aspnet/AspNetCore - 649bcc8f616a856d8db3627d74f2d1edfb4526d5 + 0d24bc27eb98d1a7e8431bf3c48f90c1c2cf1550 - + https://github.com/aspnet/AspNetCore - 649bcc8f616a856d8db3627d74f2d1edfb4526d5 + 0d24bc27eb98d1a7e8431bf3c48f90c1c2cf1550 - + https://github.com/aspnet/AspNetCore - 649bcc8f616a856d8db3627d74f2d1edfb4526d5 + 0d24bc27eb98d1a7e8431bf3c48f90c1c2cf1550 - + https://github.com/aspnet/AspNetCore - 649bcc8f616a856d8db3627d74f2d1edfb4526d5 + 0d24bc27eb98d1a7e8431bf3c48f90c1c2cf1550 - + https://github.com/aspnet/AspNetCore - 649bcc8f616a856d8db3627d74f2d1edfb4526d5 + 0d24bc27eb98d1a7e8431bf3c48f90c1c2cf1550 - + https://github.com/aspnet/AspNetCore - 649bcc8f616a856d8db3627d74f2d1edfb4526d5 + 0d24bc27eb98d1a7e8431bf3c48f90c1c2cf1550 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 18589df48..97ded0120 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-rc1.19427.14 - 3.0.0-rc1.19427.14 - 3.0.0-rc1.19427.14 - 3.0.0-rc1.19427.14 - 3.0.0-rc1.19427.14 - 3.0.0-rc1.19427.14 + 3.0.0-rc1.19428.5 + 3.0.0-rc1.19428.5 + 3.0.0-rc1.19428.5 + 3.0.0-rc1.19428.5 + 3.0.0-rc1.19428.5 + 3.0.0-rc1.19428.5 From 833bf9e6065b91c6748825563b2edb5b73f2b5a8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 28 Aug 2019 22:31:25 +0000 Subject: [PATCH 105/420] Update dependencies from https://github.com/dotnet/toolset build 20190828.17 (#4383) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19428.17 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19428.6 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e68297cfc..a1c2eb186 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - f43a4982b8eba13bda2a564aa19808d9f85ef8b1 + f5e2844eba6746b425d4f66526e018aceaafee62 https://github.com/dotnet/sdk 83dffb6faab234c0c878e92c1679fa47c0cab3dd - + https://github.com/dotnet/cli - 93ba3b2e1d4359814fd7affc4024afb41e9aedd7 + 4a3e9ec38401e1af4f894307f9d06edb29f5f859 diff --git a/eng/Versions.props b/eng/Versions.props index 97ded0120..70ee87030 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19428.16 + 3.0.100-rc1.19428.17 @@ -33,7 +33,7 @@ - 3.0.100-rc1.19428.4 + 3.0.100-rc1.19428.6 0.2.0 From 4a62c4c14082f43be03325d818a25ee56aea75bf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 28 Aug 2019 22:31:33 +0000 Subject: [PATCH 106/420] Update dependencies from https://github.com/dotnet/core-setup build 20190828.08 (#4384) - Microsoft.NETCore.App - 3.0.0-rc1-19428-08 - NETStandard.Library.Ref - 2.1.0-rc1-19428-08 - Microsoft.WindowsDesktop.App - 3.0.0-rc1-19428-08 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a1c2eb186..381b90a64 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 843b627147f0948b730eabe6def9ea1e606991da + 5bc760ed917c526ce503de6addbf204ce51934cb - + https://github.com/dotnet/core-setup - 843b627147f0948b730eabe6def9ea1e606991da + 5bc760ed917c526ce503de6addbf204ce51934cb - + https://github.com/dotnet/core-setup - 843b627147f0948b730eabe6def9ea1e606991da + 5bc760ed917c526ce503de6addbf204ce51934cb https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 70ee87030..a9d15b421 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ $(MicrosoftNETSdkPackageVersion) - 3.0.0-rc1-19428-07 + 3.0.0-rc1-19428-08 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -52,11 +52,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-rc1-19428-07 + 2.1.0-rc1-19428-08 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-rc1-19428-07 + 3.0.0-rc1-19428-08 $(MicrosoftWindowsDesktopAppPackageVersion) From 6c48c7fd783b648eb1084786a1efc0c054b1bda0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 28 Aug 2019 23:05:41 +0000 Subject: [PATCH 107/420] Update dependencies from https://github.com/dotnet/toolset build 20190828.18 (#4385) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19428.18 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 381b90a64..26b956db6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - f5e2844eba6746b425d4f66526e018aceaafee62 + b242773cfb863b379cd7fe8baa271cea8428d9a9 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index a9d15b421..3303b7dbd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19428.17 + 3.0.100-rc1.19428.18 From 4226ce43c87f0758e61730c18009683706124a05 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 29 Aug 2019 00:30:46 +0000 Subject: [PATCH 108/420] Update dependencies from https://github.com/dotnet/toolset build 20190828.19 (#4386) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19428.19 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19428.7 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 26b956db6..080d6b4be 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - b242773cfb863b379cd7fe8baa271cea8428d9a9 + 7324303dbecd1e2b8e0c843206cfeb58e0338406 https://github.com/dotnet/sdk 83dffb6faab234c0c878e92c1679fa47c0cab3dd - + https://github.com/dotnet/cli - 4a3e9ec38401e1af4f894307f9d06edb29f5f859 + a1c9b8a81713f76c1aa646dc493b5e9b91a33248 diff --git a/eng/Versions.props b/eng/Versions.props index 3303b7dbd..d08aa238f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19428.18 + 3.0.100-rc1.19428.19 @@ -33,7 +33,7 @@ - 3.0.100-rc1.19428.6 + 3.0.100-rc1.19428.7 0.2.0 From 8d79fd6b5d377019e3f4acd5dc501add6d151693 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 29 Aug 2019 04:05:40 +0000 Subject: [PATCH 109/420] Update dependencies from https://github.com/dotnet/toolset build 20190828.21 (#4390) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19428.21 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 080d6b4be..03e16bea4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 7324303dbecd1e2b8e0c843206cfeb58e0338406 + 143b4ec24799bba46614d945cfb74496d509984b https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index d08aa238f..3cf7db512 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19428.19 + 3.0.100-rc1.19428.21 From 0a753ebd0b89d6395b482e399fde61d3b06a0d04 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 29 Aug 2019 06:20:55 +0000 Subject: [PATCH 110/420] Update dependencies from https://github.com/dotnet/core-setup build 20190828.14 (#4393) - Microsoft.NETCore.App - 3.0.0-rc1-19428-14 - NETStandard.Library.Ref - 2.1.0-rc1-19428-14 - Microsoft.WindowsDesktop.App - 3.0.0-rc1-19428-14 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 03e16bea4..1ba5d6d99 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 5bc760ed917c526ce503de6addbf204ce51934cb + 0175edb2b0d0c5f541560f4056bb7633d1445688 - + https://github.com/dotnet/core-setup - 5bc760ed917c526ce503de6addbf204ce51934cb + 0175edb2b0d0c5f541560f4056bb7633d1445688 - + https://github.com/dotnet/core-setup - 5bc760ed917c526ce503de6addbf204ce51934cb + 0175edb2b0d0c5f541560f4056bb7633d1445688 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 3cf7db512..2a145d5e5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ $(MicrosoftNETSdkPackageVersion) - 3.0.0-rc1-19428-08 + 3.0.0-rc1-19428-14 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -52,11 +52,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-rc1-19428-08 + 2.1.0-rc1-19428-14 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-rc1-19428-08 + 3.0.0-rc1-19428-14 $(MicrosoftWindowsDesktopAppPackageVersion) From e7878a97e4c57fd1ddb9f5e9dda728340bf78b64 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 29 Aug 2019 07:00:45 +0000 Subject: [PATCH 111/420] Update dependencies from https://github.com/dotnet/toolset build 20190828.22 (#4394) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19428.22 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1ba5d6d99..d26820e18 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 143b4ec24799bba46614d945cfb74496d509984b + bd8fe53cc50e82e212c74c68df6601cc1312b55e https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 2a145d5e5..d85d54163 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19428.21 + 3.0.100-rc1.19428.22 From 9236043bd4638e6b58243b6631b01ac352f6efde Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 29 Aug 2019 08:25:47 +0000 Subject: [PATCH 112/420] Update dependencies from https://github.com/dotnet/toolset build 20190829.1 (#4395) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19429.1 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19428.9 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d26820e18..f90c0c633 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - bd8fe53cc50e82e212c74c68df6601cc1312b55e + 7f905825040ad443229edc9b50ca7d631d780c9c https://github.com/dotnet/sdk 83dffb6faab234c0c878e92c1679fa47c0cab3dd - + https://github.com/dotnet/cli - a1c9b8a81713f76c1aa646dc493b5e9b91a33248 + c6f1613af4c62ae9a147c02d2027045cf8b175ac diff --git a/eng/Versions.props b/eng/Versions.props index d85d54163..3f4128d17 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19428.22 + 3.0.100-rc1.19429.1 @@ -33,7 +33,7 @@ - 3.0.100-rc1.19428.7 + 3.0.100-rc1.19428.9 0.2.0 From 5ca5271664c18deb4ecd2d89b2a9c1b15ddd9ecc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 29 Aug 2019 10:56:12 +0000 Subject: [PATCH 113/420] Update dependencies from https://github.com/aspnet/AspNetCore build 20190829.1 (#4396) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-rc1.19429.1 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-rc1.19429.1 - Microsoft.AspNetCore.App.Ref - 3.0.0-rc1.19429.1 - dotnet-watch - 3.0.0-rc1.19429.1 - dotnet-user-secrets - 3.0.0-rc1.19429.1 - dotnet-dev-certs - 3.0.0-rc1.19429.1 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f90c0c633..c1b30749a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup 0175edb2b0d0c5f541560f4056bb7633d1445688 - + https://github.com/aspnet/AspNetCore - 0d24bc27eb98d1a7e8431bf3c48f90c1c2cf1550 + 14136e7acd8120cc6d301d852270495dda24fc1d - + https://github.com/aspnet/AspNetCore - 0d24bc27eb98d1a7e8431bf3c48f90c1c2cf1550 + 14136e7acd8120cc6d301d852270495dda24fc1d - + https://github.com/aspnet/AspNetCore - 0d24bc27eb98d1a7e8431bf3c48f90c1c2cf1550 + 14136e7acd8120cc6d301d852270495dda24fc1d - + https://github.com/aspnet/AspNetCore - 0d24bc27eb98d1a7e8431bf3c48f90c1c2cf1550 + 14136e7acd8120cc6d301d852270495dda24fc1d - + https://github.com/aspnet/AspNetCore - 0d24bc27eb98d1a7e8431bf3c48f90c1c2cf1550 + 14136e7acd8120cc6d301d852270495dda24fc1d - + https://github.com/aspnet/AspNetCore - 0d24bc27eb98d1a7e8431bf3c48f90c1c2cf1550 + 14136e7acd8120cc6d301d852270495dda24fc1d https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 3f4128d17..9cba765f4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-rc1.19428.5 - 3.0.0-rc1.19428.5 - 3.0.0-rc1.19428.5 - 3.0.0-rc1.19428.5 - 3.0.0-rc1.19428.5 - 3.0.0-rc1.19428.5 + 3.0.0-rc1.19429.1 + 3.0.0-rc1.19429.1 + 3.0.0-rc1.19429.1 + 3.0.0-rc1.19429.1 + 3.0.0-rc1.19429.1 + 3.0.0-rc1.19429.1 From 492a490b0156bf7d0686724f83e2fa7ccd005e92 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 29 Aug 2019 13:00:52 +0000 Subject: [PATCH 114/420] Update dependencies from https://github.com/dotnet/toolset build 20190829.2 (#4399) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19429.2 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19429.1 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c1b30749a..8a37783d1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 7f905825040ad443229edc9b50ca7d631d780c9c + 3258d503890a32b7762f754bb3a31db9856934ce https://github.com/dotnet/sdk 83dffb6faab234c0c878e92c1679fa47c0cab3dd - + https://github.com/dotnet/cli - c6f1613af4c62ae9a147c02d2027045cf8b175ac + 200a8244daefe97186dbdcc70fb05133547dbf3f diff --git a/eng/Versions.props b/eng/Versions.props index 9cba765f4..d10fdd503 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19429.1 + 3.0.100-rc1.19429.2 @@ -33,7 +33,7 @@ - 3.0.100-rc1.19428.9 + 3.0.100-rc1.19429.1 0.2.0 From c7e9126c41c8cda3fe80c53757391561145ba263 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 29 Aug 2019 14:15:55 +0000 Subject: [PATCH 115/420] Update dependencies from https://github.com/dotnet/toolset build 20190829.6 (#4402) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19429.6 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8a37783d1..9b660e2e3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 3258d503890a32b7762f754bb3a31db9856934ce + 314acafb607fa6720bb8d567bb3ccaadec774cae https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index d10fdd503..41736389b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19429.2 + 3.0.100-rc1.19429.6 From 802541a486fa2d2bf38facb9ea2e084fd645cb88 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 29 Aug 2019 17:02:36 +0000 Subject: [PATCH 116/420] Update dependencies from https://github.com/aspnet/AspNetCore build 20190829.2 (#4406) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-rc1.19429.2 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-rc1.19429.2 - Microsoft.AspNetCore.App.Ref - 3.0.0-rc1.19429.2 - dotnet-watch - 3.0.0-rc1.19429.2 - dotnet-user-secrets - 3.0.0-rc1.19429.2 - dotnet-dev-certs - 3.0.0-rc1.19429.2 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9b660e2e3..f692b9e5d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup 0175edb2b0d0c5f541560f4056bb7633d1445688 - + https://github.com/aspnet/AspNetCore - 14136e7acd8120cc6d301d852270495dda24fc1d + f82ec647a400dd7f68810354a19272fa6b090759 - + https://github.com/aspnet/AspNetCore - 14136e7acd8120cc6d301d852270495dda24fc1d + f82ec647a400dd7f68810354a19272fa6b090759 - + https://github.com/aspnet/AspNetCore - 14136e7acd8120cc6d301d852270495dda24fc1d + f82ec647a400dd7f68810354a19272fa6b090759 - + https://github.com/aspnet/AspNetCore - 14136e7acd8120cc6d301d852270495dda24fc1d + f82ec647a400dd7f68810354a19272fa6b090759 - + https://github.com/aspnet/AspNetCore - 14136e7acd8120cc6d301d852270495dda24fc1d + f82ec647a400dd7f68810354a19272fa6b090759 - + https://github.com/aspnet/AspNetCore - 14136e7acd8120cc6d301d852270495dda24fc1d + f82ec647a400dd7f68810354a19272fa6b090759 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 41736389b..3c7426baf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-rc1.19429.1 - 3.0.0-rc1.19429.1 - 3.0.0-rc1.19429.1 - 3.0.0-rc1.19429.1 - 3.0.0-rc1.19429.1 - 3.0.0-rc1.19429.1 + 3.0.0-rc1.19429.2 + 3.0.0-rc1.19429.2 + 3.0.0-rc1.19429.2 + 3.0.0-rc1.19429.2 + 3.0.0-rc1.19429.2 + 3.0.0-rc1.19429.2 From 29338f8afcb5c0933220893fc03641f6ae77816c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 29 Aug 2019 19:02:15 +0000 Subject: [PATCH 117/420] Update dependencies from https://github.com/aspnet/AspNetCore build 20190829.5 (#4413) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-rc1.19429.5 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-rc1.19429.5 - Microsoft.AspNetCore.App.Ref - 3.0.0-rc1.19429.5 - dotnet-watch - 3.0.0-rc1.19429.5 - dotnet-user-secrets - 3.0.0-rc1.19429.5 - dotnet-dev-certs - 3.0.0-rc1.19429.5 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f692b9e5d..d32dd4b54 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup 0175edb2b0d0c5f541560f4056bb7633d1445688 - + https://github.com/aspnet/AspNetCore - f82ec647a400dd7f68810354a19272fa6b090759 + c3af33a023663fe515f8b8942eab67d9e0442ff9 - + https://github.com/aspnet/AspNetCore - f82ec647a400dd7f68810354a19272fa6b090759 + c3af33a023663fe515f8b8942eab67d9e0442ff9 - + https://github.com/aspnet/AspNetCore - f82ec647a400dd7f68810354a19272fa6b090759 + c3af33a023663fe515f8b8942eab67d9e0442ff9 - + https://github.com/aspnet/AspNetCore - f82ec647a400dd7f68810354a19272fa6b090759 + c3af33a023663fe515f8b8942eab67d9e0442ff9 - + https://github.com/aspnet/AspNetCore - f82ec647a400dd7f68810354a19272fa6b090759 + c3af33a023663fe515f8b8942eab67d9e0442ff9 - + https://github.com/aspnet/AspNetCore - f82ec647a400dd7f68810354a19272fa6b090759 + c3af33a023663fe515f8b8942eab67d9e0442ff9 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 3c7426baf..01edf0328 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-rc1.19429.2 - 3.0.0-rc1.19429.2 - 3.0.0-rc1.19429.2 - 3.0.0-rc1.19429.2 - 3.0.0-rc1.19429.2 - 3.0.0-rc1.19429.2 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.5 From 631a6b01b4bdceefcb488798c00039c6d164f1c8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 29 Aug 2019 20:15:55 +0000 Subject: [PATCH 118/420] Update dependencies from https://github.com/dotnet/core-setup build 20190829.05 (#4417) - Microsoft.NETCore.App - 3.0.0-rc1-19429-05 - NETStandard.Library.Ref - 2.1.0-rc1-19429-05 - Microsoft.WindowsDesktop.App - 3.0.0-rc1-19429-05 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d32dd4b54..a8084c56c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 0175edb2b0d0c5f541560f4056bb7633d1445688 + 8880d723b63cbca2dcee68870c6b23ffc36d1811 - + https://github.com/dotnet/core-setup - 0175edb2b0d0c5f541560f4056bb7633d1445688 + 8880d723b63cbca2dcee68870c6b23ffc36d1811 - + https://github.com/dotnet/core-setup - 0175edb2b0d0c5f541560f4056bb7633d1445688 + 8880d723b63cbca2dcee68870c6b23ffc36d1811 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 01edf0328..243f02501 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ $(MicrosoftNETSdkPackageVersion) - 3.0.0-rc1-19428-14 + 3.0.0-rc1-19429-05 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -52,11 +52,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-rc1-19428-14 + 2.1.0-rc1-19429-05 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-rc1-19428-14 + 3.0.0-rc1-19429-05 $(MicrosoftWindowsDesktopAppPackageVersion) From 3f4db837c113ff3268805850fcd1b9d8e4ca74fa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 29 Aug 2019 20:55:10 +0000 Subject: [PATCH 119/420] Update dependencies from https://github.com/dotnet/toolset build 20190829.12 (#4420) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19429.12 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a8084c56c..49fd7db5e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 314acafb607fa6720bb8d567bb3ccaadec774cae + a1788008beb321fe0633374a6dbc5b35bf485a7e https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 243f02501..3cb8798df 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19429.6 + 3.0.100-rc1.19429.12 From c7cb2d0827532076e8d0c97f3250b59d6edb28b7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 29 Aug 2019 21:25:51 +0000 Subject: [PATCH 120/420] Update dependencies from https://github.com/dotnet/toolset build 20190829.13 (#4421) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19429.13 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19429.7 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 49fd7db5e..950488a1b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - a1788008beb321fe0633374a6dbc5b35bf485a7e + 054e760e63aae5a585d71e189307434ea699374c https://github.com/dotnet/sdk 83dffb6faab234c0c878e92c1679fa47c0cab3dd - + https://github.com/dotnet/cli - 200a8244daefe97186dbdcc70fb05133547dbf3f + c87c61f5e47b6411916a960e219cf81441e0fd9e diff --git a/eng/Versions.props b/eng/Versions.props index 3cb8798df..dda894f94 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19429.12 + 3.0.100-rc1.19429.13 @@ -33,7 +33,7 @@ - 3.0.100-rc1.19429.1 + 3.0.100-rc1.19429.7 0.2.0 From 3db0a6667f84734789e83830dcd54f5b3b5de79e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 29 Aug 2019 22:25:47 +0000 Subject: [PATCH 121/420] Update dependencies from https://github.com/dotnet/toolset build 20190829.14 (#4422) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19429.14 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19429.8 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 950488a1b..948ea9ba7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 054e760e63aae5a585d71e189307434ea699374c + 12b8960e3ce607f91bfcbdd9436fd36ac70e323d https://github.com/dotnet/sdk 83dffb6faab234c0c878e92c1679fa47c0cab3dd - + https://github.com/dotnet/cli - c87c61f5e47b6411916a960e219cf81441e0fd9e + e44e93fba85fedeef0fb72582a895915767c8af0 diff --git a/eng/Versions.props b/eng/Versions.props index dda894f94..2d913218b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19429.13 + 3.0.100-rc1.19429.14 @@ -33,7 +33,7 @@ - 3.0.100-rc1.19429.7 + 3.0.100-rc1.19429.8 0.2.0 From 00bb6fcbd90a93579f23aa9b451be1b12bf6b062 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 29 Aug 2019 22:50:53 +0000 Subject: [PATCH 122/420] Update dependencies from https://github.com/dotnet/core-setup build 20190829.07 (#4423) - Microsoft.NETCore.App - 3.0.0-rc1-19429-07 - NETStandard.Library.Ref - 2.1.0-rc1-19429-07 - Microsoft.WindowsDesktop.App - 3.0.0-rc1-19429-07 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 948ea9ba7..834dd7f6b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 8880d723b63cbca2dcee68870c6b23ffc36d1811 + 36fa439f918f8f0e979e78834b979deb33b9b97a - + https://github.com/dotnet/core-setup - 8880d723b63cbca2dcee68870c6b23ffc36d1811 + 36fa439f918f8f0e979e78834b979deb33b9b97a - + https://github.com/dotnet/core-setup - 8880d723b63cbca2dcee68870c6b23ffc36d1811 + 36fa439f918f8f0e979e78834b979deb33b9b97a https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 2d913218b..14caf4cf9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ $(MicrosoftNETSdkPackageVersion) - 3.0.0-rc1-19429-05 + 3.0.0-rc1-19429-07 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -52,11 +52,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-rc1-19429-05 + 2.1.0-rc1-19429-07 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-rc1-19429-05 + 3.0.0-rc1-19429-07 $(MicrosoftWindowsDesktopAppPackageVersion) From 4cd277a07cf83c3cf70bd43f246e22a1c6500fcb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 29 Aug 2019 23:20:51 +0000 Subject: [PATCH 123/420] Update dependencies from https://github.com/dotnet/toolset build 20190829.15 (#4424) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19429.15 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 834dd7f6b..57ed7c522 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 12b8960e3ce607f91bfcbdd9436fd36ac70e323d + 29a2dcbe25c8839d5091060e873acc2d8af189e8 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 14caf4cf9..d95fac687 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19429.14 + 3.0.100-rc1.19429.15 From 34cbfb22568301eb7724091886959e5505efe12e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 30 Aug 2019 01:20:45 +0000 Subject: [PATCH 124/420] [release/3.0.1xx] Update dependencies from dotnet/toolset (#4425) * Update dependencies from https://github.com/dotnet/toolset build 20190829.16 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19429.16 Dependency coherency updates - Microsoft.NET.Sdk - 3.0.100-rc1.19429.1 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190829.17 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19429.17 Dependency coherency updates - Microsoft.NET.Sdk - 3.0.100-rc1.19429.1 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 57ed7c522..28b2fc65e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,13 +42,13 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 29a2dcbe25c8839d5091060e873acc2d8af189e8 + feb1391245148f79136412075b2545a1ea8f1ef2 - + https://github.com/dotnet/sdk - 83dffb6faab234c0c878e92c1679fa47c0cab3dd + a8607d9fcd38e2ad85e978f7a14065b7a85f3bc9 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index d95fac687..8cd70e362 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19429.15 + 3.0.100-rc1.19429.17 @@ -40,7 +40,7 @@ - 3.0.100-rc1.19422.1 + 3.0.100-rc1.19429.1 $(MicrosoftNETSdkPackageVersion) From e83d2e85bb56d370caebb4894acdf1a2438bc55d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 30 Aug 2019 02:25:44 +0000 Subject: [PATCH 125/420] Update dependencies from https://github.com/dotnet/toolset build 20190829.18 (#4427) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19429.18 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19429.9 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 28b2fc65e..fe21a8512 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - feb1391245148f79136412075b2545a1ea8f1ef2 + 9c40c6dbac42d78d875a6341d38658f13413602e https://github.com/dotnet/sdk a8607d9fcd38e2ad85e978f7a14065b7a85f3bc9 - + https://github.com/dotnet/cli - e44e93fba85fedeef0fb72582a895915767c8af0 + 37c59bb1e2523dc347a75b00541a0c1365eb1d0c diff --git a/eng/Versions.props b/eng/Versions.props index 8cd70e362..0ff6e28d3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19429.17 + 3.0.100-rc1.19429.18 @@ -33,7 +33,7 @@ - 3.0.100-rc1.19429.8 + 3.0.100-rc1.19429.9 0.2.0 From c7e648c862a68bde1cf4d3bce6133202f0d24b8f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 30 Aug 2019 03:30:10 +0000 Subject: [PATCH 126/420] Update dependencies from https://github.com/dotnet/toolset build 20190829.19 (#4429) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19429.19 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fe21a8512..bc647deae 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 9c40c6dbac42d78d875a6341d38658f13413602e + daeb98c98c674a6fa84df0c18dd598b59192d546 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 0ff6e28d3..a64b51ea7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19429.18 + 3.0.100-rc1.19429.19 From 13572e3b7ab13b06ff2b1479537b2e731e2958d0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 30 Aug 2019 04:00:48 +0000 Subject: [PATCH 127/420] Update dependencies from https://github.com/dotnet/toolset build 20190829.21 (#4432) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19429.21 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bc647deae..b57ef8098 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - daeb98c98c674a6fa84df0c18dd598b59192d546 + df105ae42778f27053ef55b7b67114ac910ef60c https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index a64b51ea7..384f83581 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19429.19 + 3.0.100-rc1.19429.21 From 860a24ea184e1b0e62d39362b5b8475fdaa58e4f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 30 Aug 2019 05:15:40 +0000 Subject: [PATCH 128/420] Update dependencies from https://github.com/dotnet/toolset build 20190829.23 (#4433) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19429.23 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b57ef8098..baf41455d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - df105ae42778f27053ef55b7b67114ac910ef60c + e6b6defd5011fbd2f12cbed34c66d71404874b81 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 384f83581..1a6d585a7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19429.21 + 3.0.100-rc1.19429.23 From 5846c835f1af511cd572eac44e625e222ed402d3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 30 Aug 2019 06:14:09 +0000 Subject: [PATCH 129/420] [release/3.0.1xx] Update dependencies from aspnet/AspNetCore (#4430) * Update dependencies from https://github.com/aspnet/AspNetCore build 20190829.13 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-rc1.19429.13 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-rc1.19429.13 - Microsoft.AspNetCore.App.Ref - 3.0.0-rc1.19429.13 - dotnet-watch - 3.0.0-rc1.19429.13 - dotnet-user-secrets - 3.0.0-rc1.19429.13 - dotnet-dev-certs - 3.0.0-rc1.19429.13 * Update dependencies from https://github.com/aspnet/AspNetCore build 20190829.14 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-rc1.19429.14 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-rc1.19429.14 - Microsoft.AspNetCore.App.Ref - 3.0.0-rc1.19429.14 - dotnet-watch - 3.0.0-rc1.19429.14 - dotnet-user-secrets - 3.0.0-rc1.19429.14 - dotnet-dev-certs - 3.0.0-rc1.19429.14 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index baf41455d..781b204dd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup 36fa439f918f8f0e979e78834b979deb33b9b97a - + https://github.com/aspnet/AspNetCore - c3af33a023663fe515f8b8942eab67d9e0442ff9 + 3e07811d7b123f6eebfe09edaebe4c038025fc6c - + https://github.com/aspnet/AspNetCore - c3af33a023663fe515f8b8942eab67d9e0442ff9 + 3e07811d7b123f6eebfe09edaebe4c038025fc6c - + https://github.com/aspnet/AspNetCore - c3af33a023663fe515f8b8942eab67d9e0442ff9 + 3e07811d7b123f6eebfe09edaebe4c038025fc6c - + https://github.com/aspnet/AspNetCore - c3af33a023663fe515f8b8942eab67d9e0442ff9 + 3e07811d7b123f6eebfe09edaebe4c038025fc6c - + https://github.com/aspnet/AspNetCore - c3af33a023663fe515f8b8942eab67d9e0442ff9 + 3e07811d7b123f6eebfe09edaebe4c038025fc6c - + https://github.com/aspnet/AspNetCore - c3af33a023663fe515f8b8942eab67d9e0442ff9 + 3e07811d7b123f6eebfe09edaebe4c038025fc6c https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 1a6d585a7..2ad33cb58 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-rc1.19429.5 - 3.0.0-rc1.19429.5 - 3.0.0-rc1.19429.5 - 3.0.0-rc1.19429.5 - 3.0.0-rc1.19429.5 - 3.0.0-rc1.19429.5 + 3.0.0-rc1.19429.14 + 3.0.0-rc1.19429.14 + 3.0.0-rc1.19429.14 + 3.0.0-rc1.19429.14 + 3.0.0-rc1.19429.14 + 3.0.0-rc1.19429.14 From 3b584c5b6bba8e8e3266c6291ca50b0302605271 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 30 Aug 2019 08:21:14 +0000 Subject: [PATCH 130/420] Update dependencies from https://github.com/dotnet/toolset build 20190830.2 (#4439) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19430.2 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19429.12 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 781b204dd..261b19d42 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - e6b6defd5011fbd2f12cbed34c66d71404874b81 + 42f2456212c6e0c6c3260679bb44c96bb856f54a https://github.com/dotnet/sdk a8607d9fcd38e2ad85e978f7a14065b7a85f3bc9 - + https://github.com/dotnet/cli - 37c59bb1e2523dc347a75b00541a0c1365eb1d0c + 209a7eb593d055bd46362924728606345d9fcee4 diff --git a/eng/Versions.props b/eng/Versions.props index 2ad33cb58..e1f94c80b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19429.23 + 3.0.100-rc1.19430.2 @@ -33,7 +33,7 @@ - 3.0.100-rc1.19429.9 + 3.0.100-rc1.19429.12 0.2.0 From 60904c9cf1c30b17d55c2058d940ef01782f3ea2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 30 Aug 2019 13:30:47 +0000 Subject: [PATCH 131/420] Update dependencies from https://github.com/dotnet/toolset build 20190830.6 (#4443) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19430.6 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 261b19d42..f9bd6ea4f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 42f2456212c6e0c6c3260679bb44c96bb856f54a + 6c39b60668c029019c177f02e61440c37de1a67b https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index e1f94c80b..109e2d6da 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19430.2 + 3.0.100-rc1.19430.6 From 4a427754031000755ed80fa5e088e0c59be832d7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 30 Aug 2019 14:11:24 +0000 Subject: [PATCH 132/420] Update dependencies from https://github.com/dotnet/toolset build 20190830.8 (#4446) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19430.8 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f9bd6ea4f..3e47ee78e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 6c39b60668c029019c177f02e61440c37de1a67b + d49090256681cf48234fb66fdc106e6663ceacc8 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 109e2d6da..901fca2b0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19430.6 + 3.0.100-rc1.19430.8 From 6a8219d0ff229b5173c5fba6a226bdcb8bbba128 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 30 Aug 2019 15:00:47 +0000 Subject: [PATCH 133/420] Update dependencies from https://github.com/aspnet/AspNetCore build 20190830.1 (#4449) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-rc1.19430.1 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-rc1.19430.1 - Microsoft.AspNetCore.App.Ref - 3.0.0-rc1.19430.1 - dotnet-watch - 3.0.0-rc1.19430.1 - dotnet-user-secrets - 3.0.0-rc1.19430.1 - dotnet-dev-certs - 3.0.0-rc1.19430.1 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3e47ee78e..783eacd8c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup 36fa439f918f8f0e979e78834b979deb33b9b97a - + https://github.com/aspnet/AspNetCore - 3e07811d7b123f6eebfe09edaebe4c038025fc6c + e773036ec64210474d6a0669df1085294c15087a - + https://github.com/aspnet/AspNetCore - 3e07811d7b123f6eebfe09edaebe4c038025fc6c + e773036ec64210474d6a0669df1085294c15087a - + https://github.com/aspnet/AspNetCore - 3e07811d7b123f6eebfe09edaebe4c038025fc6c + e773036ec64210474d6a0669df1085294c15087a - + https://github.com/aspnet/AspNetCore - 3e07811d7b123f6eebfe09edaebe4c038025fc6c + e773036ec64210474d6a0669df1085294c15087a - + https://github.com/aspnet/AspNetCore - 3e07811d7b123f6eebfe09edaebe4c038025fc6c + e773036ec64210474d6a0669df1085294c15087a - + https://github.com/aspnet/AspNetCore - 3e07811d7b123f6eebfe09edaebe4c038025fc6c + e773036ec64210474d6a0669df1085294c15087a https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 901fca2b0..74036a123 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-rc1.19429.14 - 3.0.0-rc1.19429.14 - 3.0.0-rc1.19429.14 - 3.0.0-rc1.19429.14 - 3.0.0-rc1.19429.14 - 3.0.0-rc1.19429.14 + 3.0.0-rc1.19430.1 + 3.0.0-rc1.19430.1 + 3.0.0-rc1.19430.1 + 3.0.0-rc1.19430.1 + 3.0.0-rc1.19430.1 + 3.0.0-rc1.19430.1 From 4f03b3ac927d9e2de48efac95aeb12fe985700b9 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Thu, 18 Apr 2019 15:34:33 -0700 Subject: [PATCH 134/420] Various fixes when calling dotnet-install --- test/SdkTests/SdkTests.csproj | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/SdkTests/SdkTests.csproj b/test/SdkTests/SdkTests.csproj index cf53b9b7b..eb74ff0ea 100644 --- a/test/SdkTests/SdkTests.csproj +++ b/test/SdkTests/SdkTests.csproj @@ -66,15 +66,16 @@ powershell -NoLogo -NoProfile -ExecutionPolicy ByPass - $(InstallRuntimeCommand) $(_DotNetRoot)dotnet-install.ps1 + $(InstallRuntimeCommand) "$(_DotNetRoot)dotnet-install.ps1" $(InstallRuntimeCommand) -Version $(RuntimeVersionToInstall) $(InstallRuntimeCommand) -InstallDir $(DotnetToTestPath) $(InstallRuntimeCommand) -Runtime "dotnet" - $(_DotNetRoot)dotnet-install.sh + /bin/bash + $(InstallRuntimeCommand) "$(_DotNetRoot)dotnet-install.sh" $(InstallRuntimeCommand) --version $(RuntimeVersionToInstall) - $(InstallRuntimeCommand) --install_dir $(DotnetToTestPath) + $(InstallRuntimeCommand) --install-dir "$(DotnetToTestPath)" $(InstallRuntimeCommand) --runtime "dotnet" From dd1d245df842b27369edbc9668e7fd0ce530c5c2 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Thu, 18 Apr 2019 17:31:11 -0700 Subject: [PATCH 135/420] Don't parse dotnet-install output for errors --- test/SdkTests/SdkTests.csproj | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/SdkTests/SdkTests.csproj b/test/SdkTests/SdkTests.csproj index eb74ff0ea..8244e2468 100644 --- a/test/SdkTests/SdkTests.csproj +++ b/test/SdkTests/SdkTests.csproj @@ -80,7 +80,9 @@ + Condition="!Exists($(RuntimeTargetDirectory))" + IgnoreStandardErrorWarningFormat="true" + /> From 891f8c8e0857a2b18cf6d359ee70fa967fb7e861 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Tue, 23 Apr 2019 08:54:02 -0700 Subject: [PATCH 136/420] Unset environment variables for running SDK tests --- test/SdkTests/SdkTests.csproj | 36 +++++++++++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/test/SdkTests/SdkTests.csproj b/test/SdkTests/SdkTests.csproj index 8244e2468..aea540626 100644 --- a/test/SdkTests/SdkTests.csproj +++ b/test/SdkTests/SdkTests.csproj @@ -93,6 +93,12 @@ DestinationFolder="$(TEMP)\dotnetSdkTests" SkipUnchangedFiles="true" /> + + + + + + - + $(MicrosoftNETSdkPackageVersion) + https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json + + dotnet tool install --local $(ToolCommandName) + + $(InstallToolCommand) --version $(SdkTestPackageVersion) + $(InstallToolCommand) --add-source $(SdkTestPackageFeed) + + + + + $(TestArgs) > $(ResultsStdOutPath) - + $(ToolRunPrefix)set MSBuildSDKsPath= && + $(ToolRunPrefix)set DOTNET_HOST_PATH= && + $(ToolRunPrefix)set DOTNET_INSTALLDIR= && + + + $(ToolRunPrefix)unset MSBuildSDKsPath && + $(ToolRunPrefix)unset DOTNET_HOST_PATH && + $(ToolRunPrefix)unset DOTNET_INSTALLDIR && + + + + IgnoreStandardErrorWarningFormat="true" /> From 5729e5151f912c9aa37fad47d4c035195c1e7f96 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Tue, 23 Apr 2019 13:23:30 -0700 Subject: [PATCH 137/420] Continue build if there are test errors --- test/SdkTests/SdkTests.csproj | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/SdkTests/SdkTests.csproj b/test/SdkTests/SdkTests.csproj index aea540626..70eed8865 100644 --- a/test/SdkTests/SdkTests.csproj +++ b/test/SdkTests/SdkTests.csproj @@ -103,7 +103,9 @@ + BuildInParallel="true" + ContinueOnError="true" + /> From 9793bdd474224b914aaca901ea44436c494ada56 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Tue, 23 Apr 2019 15:47:03 -0700 Subject: [PATCH 138/420] Set test execution directory for SDK tests --- test/SdkTests/SdkTests.csproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/SdkTests/SdkTests.csproj b/test/SdkTests/SdkTests.csproj index 70eed8865..619ced422 100644 --- a/test/SdkTests/SdkTests.csproj +++ b/test/SdkTests/SdkTests.csproj @@ -87,10 +87,9 @@ - + @@ -148,6 +147,7 @@ -noautoreporters -noRepoInference $(TestArgs) -dotnetPath $(DotnetToTestPath)\dotnet + $(TestArgs) -testExecutionDirectory $(ArtifactsTmpDir)/dotnetSdkTests $(TestArgs) -xml "$(ResultsXmlPath)" $(TestArgs) -html "$(ResultsHtmlPath)" $(TestRunnerAdditionalArguments) $(TestArgs) > $(ResultsStdOutPath) From 0151ab4d38a50eeb3313e55e84a9306e67c339f5 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Tue, 23 Apr 2019 15:48:11 -0700 Subject: [PATCH 139/420] Support setting "partition" for arcade to avoid conflicts of .dotnet and artifacts folders --- .gitignore | 2 ++ eng/common/tools.ps1 | 9 +++++++++ eng/common/tools.sh | 9 ++++++++- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 23fe40877..2ce687bb1 100644 --- a/.gitignore +++ b/.gitignore @@ -95,8 +95,10 @@ dlldata.c # Build artifacts artifacts/ +artifacts-*/ bin/ .dotnet/ +.dotnet-*/ *_i.c *_p.c diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 8fe2b11ad..4d73a6b36 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -128,7 +128,12 @@ function InitializeDotNetCli([bool]$install) { if ((-not $globalJsonHasRuntimes) -and ($env:DOTNET_INSTALL_DIR -ne $null) -and (Test-Path(Join-Path $env:DOTNET_INSTALL_DIR "sdk\$dotnetSdkVersion"))) { $dotnetRoot = $env:DOTNET_INSTALL_DIR } else { + $dotnetRoot = Join-Path $RepoRoot ".dotnet" + if ($env:ARCADE_PARTITION -ne $null) + { + $dotnetRoot = Join-Path $RepoRoot ".dotnet-$env:ARCADE_PARTITION" + } if (-not (Test-Path(Join-Path $dotnetRoot "sdk\$dotnetSdkVersion"))) { if ($install) { @@ -561,6 +566,10 @@ function GetMSBuildBinaryLogCommandLineArgument($arguments) { $RepoRoot = Resolve-Path (Join-Path $PSScriptRoot "..\..") $EngRoot = Resolve-Path (Join-Path $PSScriptRoot "..") $ArtifactsDir = Join-Path $RepoRoot "artifacts" +if ($env:ARCADE_PARTITION -ne $null) +{ + $ArtifactsDir = Join-Path $RepoRoot "artifacts-$env:ARCADE_PARTITION" +} $ToolsetDir = Join-Path $ArtifactsDir "toolset" $ToolsDir = Join-Path $RepoRoot ".tools" $LogDir = Join-Path (Join-Path $ArtifactsDir "log") $configuration diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 738bb5669..dc0ed708e 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -131,7 +131,9 @@ function InitializeDotNetCli { dotnet_root="$DOTNET_INSTALL_DIR" else dotnet_root="$repo_root/.dotnet" - + if [[ -n "${ARCADE_PARTITION:-}" ]]; then + dotnet_root="$repo_root/.dotnet-$ARCADE_PARTITION" + fi export DOTNET_INSTALL_DIR="$dotnet_root" if [[ ! -d "$DOTNET_INSTALL_DIR/sdk/$dotnet_sdk_version" ]]; then @@ -360,6 +362,11 @@ _script_dir=`dirname "$_ResolvePath"` eng_root=`cd -P "$_script_dir/.." && pwd` repo_root=`cd -P "$_script_dir/../.." && pwd` artifacts_dir="$repo_root/artifacts" +if [[ -n "${ARCADE_PARTITION:-}" ]]; then + artifacts_dir="$repo_root/artifacts-$ARCADE_PARTITION" + export ArtifactsDir="$artifacts_dir/" +fi + toolset_dir="$artifacts_dir/toolset" tools_dir="$repo_root/.tools" log_dir="$artifacts_dir/log/$configuration" From dff1371ea10ae6a2f5357278fbf5e10884d4fc19 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Tue, 23 Apr 2019 16:53:04 -0700 Subject: [PATCH 140/420] Avoid trying to install 1.x runtimes when not supported --- test/SdkTests/SdkTests.csproj | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/test/SdkTests/SdkTests.csproj b/test/SdkTests/SdkTests.csproj index 619ced422..0eebdcfd0 100644 --- a/test/SdkTests/SdkTests.csproj +++ b/test/SdkTests/SdkTests.csproj @@ -36,14 +36,34 @@ - - - - - - + + + true + + + + + + + + false + + + + + + + + + + + + + + From 867ce5812edab2a6e2c095513f2189e6cb163817 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Wed, 15 May 2019 18:09:01 -0700 Subject: [PATCH 141/420] Add TestConfig with SDK tests to skip, and other fixes for SDK tests --- test/SdkTests/SdkTests.csproj | 29 ++++++++++++- test/SdkTests/TestConfig.xml | 78 +++++++++++++++++++++++++++++++++++ 2 files changed, 105 insertions(+), 2 deletions(-) create mode 100644 test/SdkTests/TestConfig.xml diff --git a/test/SdkTests/SdkTests.csproj b/test/SdkTests/SdkTests.csproj index 0eebdcfd0..da887f58d 100644 --- a/test/SdkTests/SdkTests.csproj +++ b/test/SdkTests/SdkTests.csproj @@ -26,6 +26,7 @@ $(ArtifactsBinDir)redist\$(Configuration)\dotnet\ $(ArtifactsBinDir)redist\$(Configuration)\dotnet-with-previous-runtimes\ + $([MSBuild]::NormalizePath($(ArtifactsTmpDir), 'dotnetSdkTests')) @@ -109,10 +110,33 @@ + + + $(TestExecutionDirectory)\NuGet.config + + + + + + + + + + + + ]]> + + + + + @@ -167,7 +191,8 @@ -noautoreporters -noRepoInference $(TestArgs) -dotnetPath $(DotnetToTestPath)\dotnet - $(TestArgs) -testExecutionDirectory $(ArtifactsTmpDir)/dotnetSdkTests + $(TestArgs) -testExecutionDirectory $(TestExecutionDirectory) + $(TestArgs) -testConfigFile "$(MSBuildThisFileDirectory)TestConfig.xml" $(TestArgs) -xml "$(ResultsXmlPath)" $(TestArgs) -html "$(ResultsHtmlPath)" $(TestRunnerAdditionalArguments) $(TestArgs) > $(ResultsStdOutPath) diff --git a/test/SdkTests/TestConfig.xml b/test/SdkTests/TestConfig.xml new file mode 100644 index 000000000..6eaf76fab --- /dev/null +++ b/test/SdkTests/TestConfig.xml @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From e5149d5c44b59876e6c07461997a037cd78af6e2 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Thu, 16 May 2019 16:22:51 -0700 Subject: [PATCH 142/420] Add build environment script (with partition support) --- eng/core-sdk-build-env.sh | 41 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 eng/core-sdk-build-env.sh diff --git a/eng/core-sdk-build-env.sh b/eng/core-sdk-build-env.sh new file mode 100644 index 000000000..6b3974e46 --- /dev/null +++ b/eng/core-sdk-build-env.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env bash +# +# 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. +# + +SOURCE="${BASH_SOURCE[0]}" +while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink + DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" + SOURCE="$(readlink "$SOURCE")" + [[ "$SOURCE" != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located +done + +REPO_ROOT="$( cd -P "$( dirname "$SOURCE" )/../" && pwd )" + +arcade_partition= + +while [[ $# > 0 ]]; do + opt="$(echo "${1/#--/-}" | awk '{print tolower($0)}')" + case "$opt" in + -partition) + arcade_partition=$2 + shift + ;; + esac + + shift +done + +export ARCADE_PARTITION=$arcade_partition + +if [[ ! -z "$arcade_partition" ]]; then + arcade_partition_suffix="-$arcade_partition" +fi + +export PATH=$REPO_ROOT/.dotnet$arcade_partition_suffix:$PATH +export DOTNET_INSTALL_DIR=$REPO_ROOT/.dotnet$arcade_partition_suffix +export ArtifactsDir=$REPO_ROOT/artifacts$arcade_partition_suffix/ + +export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 +export DOTNET_MULTILEVEL_LOOKUP=0 \ No newline at end of file From e8092032803161da31cf577b98739309cce6d1de Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Thu, 16 May 2019 18:24:45 -0700 Subject: [PATCH 143/420] Install updated patch for sdk tests, skip additional test --- test/SdkTests/SdkTests.csproj | 2 +- test/SdkTests/TestConfig.xml | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/test/SdkTests/SdkTests.csproj b/test/SdkTests/SdkTests.csproj index da887f58d..774dc6c48 100644 --- a/test/SdkTests/SdkTests.csproj +++ b/test/SdkTests/SdkTests.csproj @@ -59,7 +59,7 @@ - + diff --git a/test/SdkTests/TestConfig.xml b/test/SdkTests/TestConfig.xml index 6eaf76fab..e0066bada 100644 --- a/test/SdkTests/TestConfig.xml +++ b/test/SdkTests/TestConfig.xml @@ -29,6 +29,11 @@ Issue="https://github.com/dotnet/sdk/pull/3214" Reason="Code flow needed"/> + + - \ No newline at end of file + From 4410ad9ae13751eedf0a035c435e5bcf52715e92 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Thu, 16 May 2019 22:41:37 -0700 Subject: [PATCH 144/420] Disable installing 1x runtimes on OS's where it's not available --- test/SdkTests/SdkTests.csproj | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/test/SdkTests/SdkTests.csproj b/test/SdkTests/SdkTests.csproj index 774dc6c48..311b243dd 100644 --- a/test/SdkTests/SdkTests.csproj +++ b/test/SdkTests/SdkTests.csproj @@ -53,6 +53,23 @@ false + + false + + + + false + + + + false + + + + + false + + From b860ea69a9e6b735a08e33de7f067462c192b6fa Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Fri, 17 May 2019 15:20:51 -0700 Subject: [PATCH 145/420] Skip additional SDK tests --- test/SdkTests/TestConfig.xml | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/test/SdkTests/TestConfig.xml b/test/SdkTests/TestConfig.xml index e0066bada..6b3aec8bc 100644 --- a/test/SdkTests/TestConfig.xml +++ b/test/SdkTests/TestConfig.xml @@ -55,7 +55,7 @@ Issue="" Reason="Test doesn't work with newer RIDs"/> - @@ -70,14 +70,24 @@ Issue="" Reason="Needs .NET Core 1.1"/> - + - + + + + + From 98b2ce94306730f75fbe964c9714d04bcfecb257 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Fri, 17 May 2019 15:30:54 -0700 Subject: [PATCH 146/420] Update dockerrun.ps1 to use ARCADE_PARTITION --- eng/dockerrun.ps1 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/eng/dockerrun.ps1 b/eng/dockerrun.ps1 index 48a79ffd9..17eae39b4 100644 --- a/eng/dockerrun.ps1 +++ b/eng/dockerrun.ps1 @@ -55,7 +55,6 @@ docker run $interactiveFlag -t --rm --sig-proxy=true ` -e PB_PACKAGEVERSIONPROPSURL ` -e PB_PUBLISHBLOBFEEDURL ` -e EXTERNALRESTORESOURCES ` - -e ARCADE_DOTNET_DIR="/opt/code/artifacts/docker/${dockerImageName}/.dotnet" ` - -e ARCADE_ARTIFACTS_DIR="/opt/code/artifacts/docker/${dockerImageName}/" ` + -e ARCADE_PARTITION="${dockerImageName}" ` $dockerContainerTag ` /opt/code/run-build.sh @additionalArgs \ No newline at end of file From 4740b1c146d150a866af45b8fbe635eec3a2664e Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Sat, 18 May 2019 21:59:29 -0700 Subject: [PATCH 147/420] Always gather logs --- eng/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/build.yml b/eng/build.yml index c47ccad98..b1b7bc9fa 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -128,7 +128,7 @@ phases: TestResults/$(_BuildConfig)/**/* TargetFolder: '$(Build.ArtifactStagingDirectory)' continueOnError: true - condition: not(succeeded()) + condition: always() - task: PublishBuildArtifacts@1 displayName: Publish Logs to VSTS @@ -137,4 +137,4 @@ phases: ArtifactName: '$(_AgentOSName)_$(Agent.JobName)_$(Build.BuildNumber)' publishLocation: Container continueOnError: true - condition: not(succeeded()) + condition: always() From 65a90b6a39af5a29268ded49c205767a2a0c33dd Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Mon, 20 May 2019 12:04:08 -0700 Subject: [PATCH 148/420] Capture STDERR in SDK test logs --- test/SdkTests/SdkTests.csproj | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/test/SdkTests/SdkTests.csproj b/test/SdkTests/SdkTests.csproj index 311b243dd..1df0697e7 100644 --- a/test/SdkTests/SdkTests.csproj +++ b/test/SdkTests/SdkTests.csproj @@ -212,7 +212,7 @@ $(TestArgs) -testConfigFile "$(MSBuildThisFileDirectory)TestConfig.xml" $(TestArgs) -xml "$(ResultsXmlPath)" $(TestArgs) -html "$(ResultsHtmlPath)" $(TestRunnerAdditionalArguments) - $(TestArgs) > $(ResultsStdOutPath) + $(TestArgs) > $(ResultsStdOutPath) 2>&1 @@ -227,8 +227,7 @@ + WorkingDirectory="$(TestLocalToolFolder)" /> From 9795567194aee2f751f5d7ff1d2b89b3259c36c5 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Mon, 20 May 2019 14:58:42 -0700 Subject: [PATCH 149/420] Clean workspace --- eng/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/eng/build.yml b/eng/build.yml index b1b7bc9fa..60d0ef2a7 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -26,6 +26,8 @@ phases: pool: ${{ parameters.pool }} ${{ if ne(parameters.strategy, '') }}: strategy: ${{ parameters.strategy }} + workspace: + clean: all variables: - _AgentOSName: ${{ parameters.agentOs }} From 50f3eff5710509e8df28c34c5a35a826c2364f72 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Mon, 20 May 2019 16:21:14 -0700 Subject: [PATCH 150/420] Don't batch SDK test projects or continue on error --- test/SdkTests/SdkTests.csproj | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/test/SdkTests/SdkTests.csproj b/test/SdkTests/SdkTests.csproj index 1df0697e7..6d3a6fcea 100644 --- a/test/SdkTests/SdkTests.csproj +++ b/test/SdkTests/SdkTests.csproj @@ -159,12 +159,16 @@ + + + + ToolTestName=%(SdkTest.Identity) + + - From 6cfe0a7eaee74714977ee8d7f78b38f5d9b8cecb Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Thu, 30 May 2019 09:56:24 -0700 Subject: [PATCH 151/420] Install 1x runtimes on Windows --- test/SdkTests/SdkTests.csproj | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test/SdkTests/SdkTests.csproj b/test/SdkTests/SdkTests.csproj index 6d3a6fcea..57c3a32f1 100644 --- a/test/SdkTests/SdkTests.csproj +++ b/test/SdkTests/SdkTests.csproj @@ -49,6 +49,11 @@ + + + Windows + + false From d09cbe921de4e12dcf3bcd4c4f259e22e6d0e2b3 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Thu, 30 May 2019 15:38:42 -0700 Subject: [PATCH 152/420] Install runtime for SDK tests with correct architecture --- test/SdkTests/SdkTests.csproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/SdkTests/SdkTests.csproj b/test/SdkTests/SdkTests.csproj index 57c3a32f1..dd7a02253 100644 --- a/test/SdkTests/SdkTests.csproj +++ b/test/SdkTests/SdkTests.csproj @@ -113,6 +113,7 @@ $(InstallRuntimeCommand) -Version $(RuntimeVersionToInstall) $(InstallRuntimeCommand) -InstallDir $(DotnetToTestPath) $(InstallRuntimeCommand) -Runtime "dotnet" + $(InstallRuntimeCommand) -Architecture "$(Architecture)" /bin/bash @@ -120,6 +121,7 @@ $(InstallRuntimeCommand) --version $(RuntimeVersionToInstall) $(InstallRuntimeCommand) --install-dir "$(DotnetToTestPath)" $(InstallRuntimeCommand) --runtime "dotnet" + $(InstallRuntimeCommand) --architecture "$(Architecture)" Date: Thu, 22 Aug 2019 11:17:41 -0700 Subject: [PATCH 153/420] Run a specific list of SDK tests as integration tests Instead of trying to get all of the SDK tests to run, create a list of tests to use as integration tests --- test/SdkTests/SdkTests.csproj | 1 + test/SdkTests/TestConfig.xml | 81 +++++++++++++++++++++++++++-------- 2 files changed, 65 insertions(+), 17 deletions(-) diff --git a/test/SdkTests/SdkTests.csproj b/test/SdkTests/SdkTests.csproj index dd7a02253..e00bd4a47 100644 --- a/test/SdkTests/SdkTests.csproj +++ b/test/SdkTests/SdkTests.csproj @@ -224,6 +224,7 @@ $(TestArgs) -xml "$(ResultsXmlPath)" $(TestArgs) -html "$(ResultsHtmlPath)" $(TestRunnerAdditionalArguments) $(TestArgs) > $(ResultsStdOutPath) 2>&1 + $(TestArgs) -testList SdkIntegrationTests diff --git a/test/SdkTests/TestConfig.xml b/test/SdkTests/TestConfig.xml index 6b3aec8bc..3a7a4998c 100644 --- a/test/SdkTests/TestConfig.xml +++ b/test/SdkTests/TestConfig.xml @@ -1,4 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - + + + + From af712d468e0a4b367319b90afa207a31d7fb9882 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Fri, 23 Aug 2019 15:49:21 -0700 Subject: [PATCH 154/420] Skip tests that currently have issues running on specific OS's --- test/SdkTests/SdkTests.csproj | 6 ++++++ test/SdkTests/TestConfig.xml | 5 +++++ test/SdkTests/TestsToSkipx86.xml | 20 ++++++++++++++++++++ 3 files changed, 31 insertions(+) create mode 100644 test/SdkTests/TestsToSkipx86.xml diff --git a/test/SdkTests/SdkTests.csproj b/test/SdkTests/SdkTests.csproj index e00bd4a47..2a1696f8c 100644 --- a/test/SdkTests/SdkTests.csproj +++ b/test/SdkTests/SdkTests.csproj @@ -227,6 +227,12 @@ $(TestArgs) -testList SdkIntegrationTests + + + + $(TestArgs) -testConfigFile "$(MSBuildThisFileDirectory)TestsToSkipx86.xml" + + $(ToolRunPrefix)set MSBuildSDKsPath= && $(ToolRunPrefix)set DOTNET_HOST_PATH= && diff --git a/test/SdkTests/TestConfig.xml b/test/SdkTests/TestConfig.xml index 3a7a4998c..a7e2063cd 100644 --- a/test/SdkTests/TestConfig.xml +++ b/test/SdkTests/TestConfig.xml @@ -45,6 +45,11 @@ + + + + + + + + + + + + + From 568ce3ae52bb486ed8aeb38e5fb01cab62cb8fd8 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Fri, 30 Aug 2019 08:43:56 -0700 Subject: [PATCH 155/420] Upload test results even if there aren't failures --- eng/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/build.yml b/eng/build.yml index 60d0ef2a7..5ceca2945 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -119,7 +119,7 @@ phases: testRunTitle: '$(_AgentOSName)_$(Agent.JobName)' platform: '$(BuildPlatform)' configuration: '$(_BuildConfig)' - condition: not(succeeded()) + condition: ne(variables['TestParameter'], '') - task: CopyFiles@2 displayName: Gather Logs From d40f8630ace946bf634ededae542086ba6f3a977 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 30 Aug 2019 16:56:26 +0000 Subject: [PATCH 156/420] Update dependencies from https://github.com/aspnet/AspNetCore build 20190830.2 (#4452) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-rc1.19430.2 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-rc1.19430.2 - Microsoft.AspNetCore.App.Ref - 3.0.0-rc1.19430.2 - dotnet-watch - 3.0.0-rc1.19430.2 - dotnet-user-secrets - 3.0.0-rc1.19430.2 - dotnet-dev-certs - 3.0.0-rc1.19430.2 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 783eacd8c..afe4c2027 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup 36fa439f918f8f0e979e78834b979deb33b9b97a - + https://github.com/aspnet/AspNetCore - e773036ec64210474d6a0669df1085294c15087a + 5358a6f33e512c63daf4e5eb6a04060796503785 - + https://github.com/aspnet/AspNetCore - e773036ec64210474d6a0669df1085294c15087a + 5358a6f33e512c63daf4e5eb6a04060796503785 - + https://github.com/aspnet/AspNetCore - e773036ec64210474d6a0669df1085294c15087a + 5358a6f33e512c63daf4e5eb6a04060796503785 - + https://github.com/aspnet/AspNetCore - e773036ec64210474d6a0669df1085294c15087a + 5358a6f33e512c63daf4e5eb6a04060796503785 - + https://github.com/aspnet/AspNetCore - e773036ec64210474d6a0669df1085294c15087a + 5358a6f33e512c63daf4e5eb6a04060796503785 - + https://github.com/aspnet/AspNetCore - e773036ec64210474d6a0669df1085294c15087a + 5358a6f33e512c63daf4e5eb6a04060796503785 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 74036a123..92d23cbcc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-rc1.19430.1 - 3.0.0-rc1.19430.1 - 3.0.0-rc1.19430.1 - 3.0.0-rc1.19430.1 - 3.0.0-rc1.19430.1 - 3.0.0-rc1.19430.1 + 3.0.0-rc1.19430.2 + 3.0.0-rc1.19430.2 + 3.0.0-rc1.19430.2 + 3.0.0-rc1.19430.2 + 3.0.0-rc1.19430.2 + 3.0.0-rc1.19430.2 From aa883b07f81b7a3148e17e03076102db636fd3cd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 30 Aug 2019 17:15:45 +0000 Subject: [PATCH 157/420] Update dependencies from https://github.com/dotnet/toolset build 20190830.11 (#4453) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19430.11 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19430.3 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index afe4c2027..121067bd9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - d49090256681cf48234fb66fdc106e6663ceacc8 + 949fde0f89edd8ba29582502ac635a864a042974 https://github.com/dotnet/sdk a8607d9fcd38e2ad85e978f7a14065b7a85f3bc9 - + https://github.com/dotnet/cli - 209a7eb593d055bd46362924728606345d9fcee4 + b24be5f8298fd00f5bb7e48ecaaf2d472f8a1e3a diff --git a/eng/Versions.props b/eng/Versions.props index 92d23cbcc..986ca1e29 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19430.8 + 3.0.100-rc1.19430.11 @@ -33,7 +33,7 @@ - 3.0.100-rc1.19429.12 + 3.0.100-rc1.19430.3 0.2.0 From abe9e6214a95f0cf10611d8f76411a0392768af4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 30 Aug 2019 20:50:44 +0000 Subject: [PATCH 158/420] Update dependencies from https://github.com/aspnet/AspNetCore build 20190830.5 (#4460) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-rc1.19430.5 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-rc1.19430.5 - Microsoft.AspNetCore.App.Ref - 3.0.0-rc1.19430.5 - dotnet-watch - 3.0.0-rc1.19430.5 - dotnet-user-secrets - 3.0.0-rc1.19430.5 - dotnet-dev-certs - 3.0.0-rc1.19430.5 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 121067bd9..f68f1d9b5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup 36fa439f918f8f0e979e78834b979deb33b9b97a - + https://github.com/aspnet/AspNetCore - 5358a6f33e512c63daf4e5eb6a04060796503785 + 5d0b314e7d0e9e487db7cdcce01e1df24e145021 - + https://github.com/aspnet/AspNetCore - 5358a6f33e512c63daf4e5eb6a04060796503785 + 5d0b314e7d0e9e487db7cdcce01e1df24e145021 - + https://github.com/aspnet/AspNetCore - 5358a6f33e512c63daf4e5eb6a04060796503785 + 5d0b314e7d0e9e487db7cdcce01e1df24e145021 - + https://github.com/aspnet/AspNetCore - 5358a6f33e512c63daf4e5eb6a04060796503785 + 5d0b314e7d0e9e487db7cdcce01e1df24e145021 - + https://github.com/aspnet/AspNetCore - 5358a6f33e512c63daf4e5eb6a04060796503785 + 5d0b314e7d0e9e487db7cdcce01e1df24e145021 - + https://github.com/aspnet/AspNetCore - 5358a6f33e512c63daf4e5eb6a04060796503785 + 5d0b314e7d0e9e487db7cdcce01e1df24e145021 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 986ca1e29..3c6da62f2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-rc1.19430.2 - 3.0.0-rc1.19430.2 - 3.0.0-rc1.19430.2 - 3.0.0-rc1.19430.2 - 3.0.0-rc1.19430.2 - 3.0.0-rc1.19430.2 + 3.0.0-rc1.19430.5 + 3.0.0-rc1.19430.5 + 3.0.0-rc1.19430.5 + 3.0.0-rc1.19430.5 + 3.0.0-rc1.19430.5 + 3.0.0-rc1.19430.5 From 6eb89d69e24b1934aa81c7bc686ffa5624af4ba0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 30 Aug 2019 21:42:26 +0000 Subject: [PATCH 159/420] [release/3.0.1xx] Update dependencies from dotnet/toolset (#4457) * Update dependencies from https://github.com/dotnet/toolset build 20190830.13 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19430.13 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19430.5 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190830.15 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19430.15 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19430.5 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f68f1d9b5..63b6b9a6c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 949fde0f89edd8ba29582502ac635a864a042974 + ccd14b7e70d2258187a1a8abb4b47b292d2a4034 https://github.com/dotnet/sdk a8607d9fcd38e2ad85e978f7a14065b7a85f3bc9 - + https://github.com/dotnet/cli - b24be5f8298fd00f5bb7e48ecaaf2d472f8a1e3a + a6013fca624ad3b3953cc68987f44d3b8facf428 diff --git a/eng/Versions.props b/eng/Versions.props index 3c6da62f2..f9ce55213 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19430.11 + 3.0.100-rc1.19430.15 @@ -33,7 +33,7 @@ - 3.0.100-rc1.19430.3 + 3.0.100-rc1.19430.5 0.2.0 From 77428e4c56e69bfb3308b43b845ecafa45c2b034 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 30 Aug 2019 23:05:23 +0000 Subject: [PATCH 160/420] Update dependencies from https://github.com/dotnet/toolset build 20190830.16 (#4464) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19430.16 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19430.8 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 63b6b9a6c..91e99a2ea 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - ccd14b7e70d2258187a1a8abb4b47b292d2a4034 + f238d7ddcc4560eca2d9aa661953c8b33ccc9d4f https://github.com/dotnet/sdk a8607d9fcd38e2ad85e978f7a14065b7a85f3bc9 - + https://github.com/dotnet/cli - a6013fca624ad3b3953cc68987f44d3b8facf428 + 8a7d4ed8ab61c2fbbd87fb9b49d94684fbe8f5ed diff --git a/eng/Versions.props b/eng/Versions.props index f9ce55213..422c102da 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19430.15 + 3.0.100-rc1.19430.16 @@ -33,7 +33,7 @@ - 3.0.100-rc1.19430.5 + 3.0.100-rc1.19430.8 0.2.0 From 2017cff87877c3ea8c57d184329187e5a6465c66 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 30 Aug 2019 23:36:08 +0000 Subject: [PATCH 161/420] Update dependencies from https://github.com/dotnet/toolset build 20190830.18 (#4466) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19430.18 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19430.7 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 91e99a2ea..6a9398cb8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - f238d7ddcc4560eca2d9aa661953c8b33ccc9d4f + af2deadcb16cb3976eb61e98ba5a64e0bb8b68de https://github.com/dotnet/sdk a8607d9fcd38e2ad85e978f7a14065b7a85f3bc9 - + https://github.com/dotnet/cli - 8a7d4ed8ab61c2fbbd87fb9b49d94684fbe8f5ed + 90e0e143e8609c806680f25e3a094e725d73487b diff --git a/eng/Versions.props b/eng/Versions.props index 422c102da..d5852472a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19430.16 + 3.0.100-rc1.19430.18 @@ -33,7 +33,7 @@ - 3.0.100-rc1.19430.8 + 3.0.100-rc1.19430.7 0.2.0 From 973263e6b98b89d3ee0491627b58f2e3176c5162 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 31 Aug 2019 01:08:07 +0000 Subject: [PATCH 162/420] [release/3.0.1xx] Update dependencies from dotnet/core-setup (#4461) * Update dependencies from https://github.com/dotnet/core-setup build 20190830.05 - Microsoft.NETCore.App - 3.0.0-rc1-19430-05 - NETStandard.Library.Ref - 2.1.0-rc1-19430-05 - Microsoft.WindowsDesktop.App - 3.0.0-rc1-19430-05 * Update dependencies from https://github.com/dotnet/core-setup build 20190830.09 - Microsoft.NETCore.App - 3.0.0-rc1-19430-09 - NETStandard.Library.Ref - 2.1.0-rc1-19430-09 - Microsoft.WindowsDesktop.App - 3.0.0-rc1-19430-09 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6a9398cb8..9b8bca634 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 36fa439f918f8f0e979e78834b979deb33b9b97a + 44e933b12f176895fae723d1f03c8424070880fc - + https://github.com/dotnet/core-setup - 36fa439f918f8f0e979e78834b979deb33b9b97a + 44e933b12f176895fae723d1f03c8424070880fc - + https://github.com/dotnet/core-setup - 36fa439f918f8f0e979e78834b979deb33b9b97a + 44e933b12f176895fae723d1f03c8424070880fc https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index d5852472a..8c09b8ff1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ $(MicrosoftNETSdkPackageVersion) - 3.0.0-rc1-19429-07 + 3.0.0-rc1-19430-09 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -52,11 +52,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-rc1-19429-07 + 2.1.0-rc1-19430-09 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-rc1-19429-07 + 3.0.0-rc1-19430-09 $(MicrosoftWindowsDesktopAppPackageVersion) From dffe9403c9ce46afc4ef3144ef8cbf05ca07f698 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 31 Aug 2019 01:30:50 +0000 Subject: [PATCH 163/420] Update dependencies from https://github.com/dotnet/toolset build 20190830.19 (#4467) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19430.19 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9b8bca634..a8d6ee7ac 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - af2deadcb16cb3976eb61e98ba5a64e0bb8b68de + 0b58c7133537ac4342b4e522751419d68520b09e https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 8c09b8ff1..3c7818e55 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19430.18 + 3.0.100-rc1.19430.19 From 1b1828a55234cde5010b2cac6984e2e3028aa9da Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 31 Aug 2019 04:41:37 +0000 Subject: [PATCH 164/420] [release/3.0.1xx] Update dependencies from dotnet/toolset (#4468) * Update dependencies from https://github.com/dotnet/toolset build 20190830.20 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19430.20 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19430.10 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190830.22 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19430.22 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19430.10 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a8d6ee7ac..1cb525496 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 0b58c7133537ac4342b4e522751419d68520b09e + e96114c8a5ebd93e80b709a63da2499b863854e3 https://github.com/dotnet/sdk a8607d9fcd38e2ad85e978f7a14065b7a85f3bc9 - + https://github.com/dotnet/cli - 90e0e143e8609c806680f25e3a094e725d73487b + a2ef8a87299dab99a1418f4134c649b242ee74fc diff --git a/eng/Versions.props b/eng/Versions.props index 3c7818e55..958bc3e9d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19430.19 + 3.0.100-rc1.19430.22 @@ -33,7 +33,7 @@ - 3.0.100-rc1.19430.7 + 3.0.100-rc1.19430.10 0.2.0 From ff9c81978cd073228b9d9060c5171027bc9107df Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 31 Aug 2019 14:29:40 +0000 Subject: [PATCH 165/420] [release/3.0.1xx] Update dependencies from dotnet/toolset (#4476) * Update dependencies from https://github.com/dotnet/toolset build 20190830.24 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19430.24 * Update dependencies from https://github.com/dotnet/toolset build 20190831.5 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19431.5 * Update dependencies from https://github.com/dotnet/toolset build 20190831.7 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19431.7 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1cb525496..ea86dc6c9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - e96114c8a5ebd93e80b709a63da2499b863854e3 + 9f3ee835c8450ce0483c4c0f0d07f6cbea2478df https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 958bc3e9d..c36da1122 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19430.22 + 3.0.100-rc1.19431.7 From c8d4ea094dd1259e8a79aebe823640ca43705827 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 1 Sep 2019 04:00:43 +0000 Subject: [PATCH 166/420] Update dependencies from https://github.com/dotnet/toolset build 20190831.10 (#4494) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19431.10 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ea86dc6c9..a6c88d683 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 9f3ee835c8450ce0483c4c0f0d07f6cbea2478df + c1b5f207ca02d6ee3e055ffdb6294c6507f07826 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index c36da1122..5387d8772 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19431.7 + 3.0.100-rc1.19431.10 From 869e90e22bdc098ea933eeaf6f32a4031085c5c6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 1 Sep 2019 16:54:56 +0000 Subject: [PATCH 167/420] Update dependencies from https://github.com/aspnet/AspNetCore build 20190901.1 (#4504) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-rc1.19451.1 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-rc1.19451.1 - Microsoft.AspNetCore.App.Ref - 3.0.0-rc1.19451.1 - dotnet-watch - 3.0.0-rc1.19451.1 - dotnet-user-secrets - 3.0.0-rc1.19451.1 - dotnet-dev-certs - 3.0.0-rc1.19451.1 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a6c88d683..1fb58ff3d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup 44e933b12f176895fae723d1f03c8424070880fc - + https://github.com/aspnet/AspNetCore - 5d0b314e7d0e9e487db7cdcce01e1df24e145021 + fe1c4c6fc43807e30351c6a3a2e2cea9bafc2f43 - + https://github.com/aspnet/AspNetCore - 5d0b314e7d0e9e487db7cdcce01e1df24e145021 + fe1c4c6fc43807e30351c6a3a2e2cea9bafc2f43 - + https://github.com/aspnet/AspNetCore - 5d0b314e7d0e9e487db7cdcce01e1df24e145021 + fe1c4c6fc43807e30351c6a3a2e2cea9bafc2f43 - + https://github.com/aspnet/AspNetCore - 5d0b314e7d0e9e487db7cdcce01e1df24e145021 + fe1c4c6fc43807e30351c6a3a2e2cea9bafc2f43 - + https://github.com/aspnet/AspNetCore - 5d0b314e7d0e9e487db7cdcce01e1df24e145021 + fe1c4c6fc43807e30351c6a3a2e2cea9bafc2f43 - + https://github.com/aspnet/AspNetCore - 5d0b314e7d0e9e487db7cdcce01e1df24e145021 + fe1c4c6fc43807e30351c6a3a2e2cea9bafc2f43 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 5387d8772..29866063e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-rc1.19430.5 - 3.0.0-rc1.19430.5 - 3.0.0-rc1.19430.5 - 3.0.0-rc1.19430.5 - 3.0.0-rc1.19430.5 - 3.0.0-rc1.19430.5 + 3.0.0-rc1.19451.1 + 3.0.0-rc1.19451.1 + 3.0.0-rc1.19451.1 + 3.0.0-rc1.19451.1 + 3.0.0-rc1.19451.1 + 3.0.0-rc1.19451.1 From 87a6e7a376f0fb5ac8e24e871908de3524fbf695 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 1 Sep 2019 18:45:46 +0000 Subject: [PATCH 168/420] Update dependencies from https://github.com/dotnet/toolset build 20190901.5 (#4507) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19451.5 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19451.3 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1fb58ff3d..6d06b0a98 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - c1b5f207ca02d6ee3e055ffdb6294c6507f07826 + b8a44dfdebe6e15acd3a57aad07ee597c29028f6 https://github.com/dotnet/sdk a8607d9fcd38e2ad85e978f7a14065b7a85f3bc9 - + https://github.com/dotnet/cli - a2ef8a87299dab99a1418f4134c649b242ee74fc + 83b1d9b953a4655f9c3a4dcaeee15526fd40d8ca diff --git a/eng/Versions.props b/eng/Versions.props index 29866063e..840922605 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19431.10 + 3.0.100-rc1.19451.5 @@ -33,7 +33,7 @@ - 3.0.100-rc1.19430.10 + 3.0.100-rc1.19451.3 0.2.0 From 5e72aa3fbec74c2e99721eb62f55f6983916b278 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2019 14:00:44 +0000 Subject: [PATCH 169/420] Update dependencies from https://github.com/dotnet/toolset build 20190902.4 (#4525) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19452.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6d06b0a98..3a671b161 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - b8a44dfdebe6e15acd3a57aad07ee597c29028f6 + 81a380fa3f697dc0fae9f5c19b7e8c710533e21f https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 840922605..7dd40dd45 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19451.5 + 3.0.100-rc1.19452.4 From 4b9a09e914ab2a71fa9f135cfb8f901e5b6b81de Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 3 Sep 2019 04:43:33 +0000 Subject: [PATCH 170/420] [release/3.0.1xx] Update dependencies from dotnet/toolset (#4526) * Update dependencies from https://github.com/dotnet/toolset build 20190902.5 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19452.5 * Update dependencies from https://github.com/dotnet/toolset build 20190902.9 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19452.9 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3a671b161..3b2902fcb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 81a380fa3f697dc0fae9f5c19b7e8c710533e21f + 17578dc53ba33c9ac1db05feb4930b823c0c6d36 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 7dd40dd45..ccdfa8df7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19452.4 + 3.0.100-rc1.19452.9 From 646d7c733b1d46c3f245acdf965d6f2fa5a66503 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 3 Sep 2019 06:57:33 +0000 Subject: [PATCH 171/420] Update dependencies from https://github.com/aspnet/AspNetCore build 20190902.3 (#4536) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-rc1.19452.3 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-rc1.19452.3 - Microsoft.AspNetCore.App.Ref - 3.0.0-rc1.19452.3 - dotnet-watch - 3.0.0-rc1.19452.3 - dotnet-user-secrets - 3.0.0-rc1.19452.3 - dotnet-dev-certs - 3.0.0-rc1.19452.3 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3b2902fcb..2be9e9cec 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup 44e933b12f176895fae723d1f03c8424070880fc - + https://github.com/aspnet/AspNetCore - fe1c4c6fc43807e30351c6a3a2e2cea9bafc2f43 + 0bed2250962a5a3d096fc93b5128be6fd798b8e3 - + https://github.com/aspnet/AspNetCore - fe1c4c6fc43807e30351c6a3a2e2cea9bafc2f43 + 0bed2250962a5a3d096fc93b5128be6fd798b8e3 - + https://github.com/aspnet/AspNetCore - fe1c4c6fc43807e30351c6a3a2e2cea9bafc2f43 + 0bed2250962a5a3d096fc93b5128be6fd798b8e3 - + https://github.com/aspnet/AspNetCore - fe1c4c6fc43807e30351c6a3a2e2cea9bafc2f43 + 0bed2250962a5a3d096fc93b5128be6fd798b8e3 - + https://github.com/aspnet/AspNetCore - fe1c4c6fc43807e30351c6a3a2e2cea9bafc2f43 + 0bed2250962a5a3d096fc93b5128be6fd798b8e3 - + https://github.com/aspnet/AspNetCore - fe1c4c6fc43807e30351c6a3a2e2cea9bafc2f43 + 0bed2250962a5a3d096fc93b5128be6fd798b8e3 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index ccdfa8df7..4b1dcdfde 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-rc1.19451.1 - 3.0.0-rc1.19451.1 - 3.0.0-rc1.19451.1 - 3.0.0-rc1.19451.1 - 3.0.0-rc1.19451.1 - 3.0.0-rc1.19451.1 + 3.0.0-rc1.19452.3 + 3.0.0-rc1.19452.3 + 3.0.0-rc1.19452.3 + 3.0.0-rc1.19452.3 + 3.0.0-rc1.19452.3 + 3.0.0-rc1.19452.3 From acd95ccb384f693738770ca21e334dad22247e9a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 3 Sep 2019 08:45:49 +0000 Subject: [PATCH 172/420] Update dependencies from https://github.com/dotnet/toolset build 20190903.1 (#4538) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19453.1 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19452.5 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2be9e9cec..535a8739e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 17578dc53ba33c9ac1db05feb4930b823c0c6d36 + f8b7cb5cfb2bad6535ea9fcc3c1ae41fe077f529 https://github.com/dotnet/sdk a8607d9fcd38e2ad85e978f7a14065b7a85f3bc9 - + https://github.com/dotnet/cli - 83b1d9b953a4655f9c3a4dcaeee15526fd40d8ca + 6194bda6d19a66a902459f656a916c9dad01baf3 diff --git a/eng/Versions.props b/eng/Versions.props index 4b1dcdfde..021c687d2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19452.9 + 3.0.100-rc1.19453.1 @@ -33,7 +33,7 @@ - 3.0.100-rc1.19451.3 + 3.0.100-rc1.19452.5 0.2.0 From 12fe7caba915ec12bdac21b84e46f0aa3d690a41 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 3 Sep 2019 14:15:45 +0000 Subject: [PATCH 173/420] Update dependencies from https://github.com/dotnet/toolset build 20190903.3 (#4542) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19453.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 535a8739e..dea1ae7ac 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - f8b7cb5cfb2bad6535ea9fcc3c1ae41fe077f529 + 9005b60330d946349fe5342707b5eafdf79ff4e7 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 021c687d2..4229a42e3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19453.1 + 3.0.100-rc1.19453.3 From 536952fa9f2ba86affb9f357180526dd17243a29 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 3 Sep 2019 16:59:06 +0000 Subject: [PATCH 174/420] Update dependencies from https://github.com/aspnet/AspNetCore build 20190903.1 (#4543) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-rc1.19453.1 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-rc1.19453.1 - Microsoft.AspNetCore.App.Ref - 3.0.0-rc1.19453.1 - dotnet-watch - 3.0.0-rc1.19453.1 - dotnet-user-secrets - 3.0.0-rc1.19453.1 - dotnet-dev-certs - 3.0.0-rc1.19453.1 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dea1ae7ac..3c8485dcb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup 44e933b12f176895fae723d1f03c8424070880fc - + https://github.com/aspnet/AspNetCore - 0bed2250962a5a3d096fc93b5128be6fd798b8e3 + 0abe61f391b30219ce5983b9a2964c1d85665449 - + https://github.com/aspnet/AspNetCore - 0bed2250962a5a3d096fc93b5128be6fd798b8e3 + 0abe61f391b30219ce5983b9a2964c1d85665449 - + https://github.com/aspnet/AspNetCore - 0bed2250962a5a3d096fc93b5128be6fd798b8e3 + 0abe61f391b30219ce5983b9a2964c1d85665449 - + https://github.com/aspnet/AspNetCore - 0bed2250962a5a3d096fc93b5128be6fd798b8e3 + 0abe61f391b30219ce5983b9a2964c1d85665449 - + https://github.com/aspnet/AspNetCore - 0bed2250962a5a3d096fc93b5128be6fd798b8e3 + 0abe61f391b30219ce5983b9a2964c1d85665449 - + https://github.com/aspnet/AspNetCore - 0bed2250962a5a3d096fc93b5128be6fd798b8e3 + 0abe61f391b30219ce5983b9a2964c1d85665449 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 4229a42e3..104731eae 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-rc1.19452.3 - 3.0.0-rc1.19452.3 - 3.0.0-rc1.19452.3 - 3.0.0-rc1.19452.3 - 3.0.0-rc1.19452.3 - 3.0.0-rc1.19452.3 + 3.0.0-rc1.19453.1 + 3.0.0-rc1.19453.1 + 3.0.0-rc1.19453.1 + 3.0.0-rc1.19453.1 + 3.0.0-rc1.19453.1 + 3.0.0-rc1.19453.1 From cc2ce556ffbfb3388814c2326b604b0bcbe78ca1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 3 Sep 2019 21:00:50 +0000 Subject: [PATCH 175/420] Update dependencies from https://github.com/dotnet/toolset build 20190903.4 (#4546) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19453.4 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19453.2 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3c8485dcb..717e45dc4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 9005b60330d946349fe5342707b5eafdf79ff4e7 + 13656780ab7c575c45b49b9a0a3de283a65821f3 https://github.com/dotnet/sdk a8607d9fcd38e2ad85e978f7a14065b7a85f3bc9 - + https://github.com/dotnet/cli - 6194bda6d19a66a902459f656a916c9dad01baf3 + bf8c86cef3d51aaabb87292023bfcb836022fbaf diff --git a/eng/Versions.props b/eng/Versions.props index 104731eae..b6b217526 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19453.3 + 3.0.100-rc1.19453.4 @@ -33,7 +33,7 @@ - 3.0.100-rc1.19452.5 + 3.0.100-rc1.19453.2 0.2.0 From 9fce96adbea97482b14e2d173a83b33bd96a9ada Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 3 Sep 2019 21:56:09 +0000 Subject: [PATCH 176/420] Update dependencies from https://github.com/dotnet/toolset build 20190903.5 (#4548) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19453.5 Dependency coherency updates - Microsoft.NET.Sdk - 3.0.100-rc1.19453.1 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 717e45dc4..2840c7f1a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,13 +42,13 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 13656780ab7c575c45b49b9a0a3de283a65821f3 + 60505ac8ca05d81f344540672d7656d707bbf0fb - + https://github.com/dotnet/sdk - a8607d9fcd38e2ad85e978f7a14065b7a85f3bc9 + 59e63b28d24a769652b754f341d38c9de7c3d0d1 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index b6b217526..f4dc2c079 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19453.4 + 3.0.100-rc1.19453.5 @@ -40,7 +40,7 @@ - 3.0.100-rc1.19429.1 + 3.0.100-rc1.19453.1 $(MicrosoftNETSdkPackageVersion) From 751ff19e057cda756ff7d5fb0bac545e3771c73b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 3 Sep 2019 23:25:51 +0000 Subject: [PATCH 177/420] Update dependencies from https://github.com/dotnet/toolset build 20190903.6 (#4550) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19453.6 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19453.3 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2840c7f1a..18b804e25 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 60505ac8ca05d81f344540672d7656d707bbf0fb + e0b27cbcb03927e833ddfd463662dc180c2f26b4 https://github.com/dotnet/sdk 59e63b28d24a769652b754f341d38c9de7c3d0d1 - + https://github.com/dotnet/cli - bf8c86cef3d51aaabb87292023bfcb836022fbaf + d63b48495715825a526b22affd403324c325e8e3 diff --git a/eng/Versions.props b/eng/Versions.props index f4dc2c079..90de1dd3b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19453.5 + 3.0.100-rc1.19453.6 @@ -33,7 +33,7 @@ - 3.0.100-rc1.19453.2 + 3.0.100-rc1.19453.3 0.2.0 From c60abdeb36b60dc7352639e0961a0cffb926fb9e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 3 Sep 2019 23:30:55 +0000 Subject: [PATCH 178/420] Update dependencies from https://github.com/dotnet/core-setup build 20190903.06 (#4551) - Microsoft.NETCore.App - 3.0.0-rc1-19453-06 - NETStandard.Library.Ref - 2.1.0-rc1-19453-06 - Microsoft.WindowsDesktop.App - 3.0.0-rc1-19453-06 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 18b804e25..83d9afe13 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 44e933b12f176895fae723d1f03c8424070880fc + b9dd6c969c15a2734aecbd3e2aa83afed02040e4 - + https://github.com/dotnet/core-setup - 44e933b12f176895fae723d1f03c8424070880fc + b9dd6c969c15a2734aecbd3e2aa83afed02040e4 - + https://github.com/dotnet/core-setup - 44e933b12f176895fae723d1f03c8424070880fc + b9dd6c969c15a2734aecbd3e2aa83afed02040e4 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 90de1dd3b..216ae3787 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ $(MicrosoftNETSdkPackageVersion) - 3.0.0-rc1-19430-09 + 3.0.0-rc1-19453-06 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -52,11 +52,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-rc1-19430-09 + 2.1.0-rc1-19453-06 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-rc1-19430-09 + 3.0.0-rc1-19453-06 $(MicrosoftWindowsDesktopAppPackageVersion) From f642973bb6525dfddbcd1725f3a125d48e605344 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 3 Sep 2019 23:56:35 +0000 Subject: [PATCH 179/420] Update dependencies from https://github.com/dotnet/toolset build 20190903.7 (#4552) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19453.7 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 83d9afe13..da137632c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - e0b27cbcb03927e833ddfd463662dc180c2f26b4 + d4324c1dbc622a5a243da162fbcd4fad36b8c3cc https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 216ae3787..8441d1ec7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19453.6 + 3.0.100-rc1.19453.7 From 12d607a0a4d64089ad5beb1bae12cacb0d5e707e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 4 Sep 2019 01:15:50 +0000 Subject: [PATCH 180/420] Update dependencies from https://github.com/dotnet/toolset build 20190903.8 (#4554) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19453.8 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19453.4 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index da137632c..637d4e7b9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - d4324c1dbc622a5a243da162fbcd4fad36b8c3cc + 3356e6474670f153844949cdf7a3c1fc3ff2f137 https://github.com/dotnet/sdk 59e63b28d24a769652b754f341d38c9de7c3d0d1 - + https://github.com/dotnet/cli - d63b48495715825a526b22affd403324c325e8e3 + 5ab959c38e454e86d109c1fbc743e97eec85cbe6 diff --git a/eng/Versions.props b/eng/Versions.props index 8441d1ec7..ee1086893 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19453.7 + 3.0.100-rc1.19453.8 @@ -33,7 +33,7 @@ - 3.0.100-rc1.19453.3 + 3.0.100-rc1.19453.4 0.2.0 From 89470976100995dd1663c30d9223cfcedfc0f866 Mon Sep 17 00:00:00 2001 From: Daniel Ye Date: Wed, 4 Sep 2019 14:15:56 -0700 Subject: [PATCH 181/420] Localization update for PTB term changes. --- .../windows/clisdk/LCID/1046/bundle.wxl | 160 +++++++++--------- 1 file changed, 80 insertions(+), 80 deletions(-) diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl index 5960557c9..d5778532a 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl @@ -1,80 +1,80 @@ - - - Instalador do [WixBundleName] - [BUNDLEMONIKER] - Tem certeza de que deseja cancelar? - Versão anterior - Ajuda de Instalação - /install | /repair | /uninstall | /layout [\[]"directory"[\]] – instala, repara, desinstala - ou cria uma cópia local completa do pacote no diretório. '/install' é o padrão - -/passive | /quiet – exibe a interface do usuário mínima sem nenhum prompt ou não exibe nenhuma interface do usuário e - nenhum prompt. Por padrão, a interface do usuário e todos os prompts são exibidos. - -/norestart – suprime qualquer tentativa de reiniciar. Por padrão, a interface do usuário perguntará antes de reiniciar. -/log [\[]"log.txt"[\]] – registra em um arquivo específico. Por padrão, um arquivo de log é criado em %TEMP%. - &Fechar - &Concordo com os termos e condições da licença - &Opções - &Instalar - &Fechar - Progresso da Instalação - Processando: - Inicializando... - &Cancelar - Modificar Instalação - &Reparar - &Desinstalar - &Fechar - Reparação Concluída com Êxito - Desinstalação Concluída com Êxito - Instalação com Êxito - &Iniciar - É necessário reiniciar o computador para concluir a instalação do software. - &Reiniciar - &Fechar - Falha na Instalação - Falha na Instalação - Falha na Desinstalação - Falha na Reparação - Um ou mais problemas causaram falha na instalação. Corrija-os e tente instalar novamente. Para obter mais informações, consulte o <a href="#">arquivo de log</a>. - Você deve reiniciar seu computador para concluir a reversão do software. - &Reiniciar - &Fechar - Arquivos em Uso - Os aplicativos a seguir estão usando arquivos que precisam ser atualizados: - Feche os &aplicativos e tente reiniciá-los. - &Não feche os aplicativos. Será necessária uma reinicialização. - &OK - &Cancelar - A instalação foi bem-sucedida. - -O seguinte foi instalado em: '[DOTNETHOME]' - • SDK do .NET Core [DOTNETSDKVERSION] - • Tempo de Execução do .NET Core [DOTNETRUNTIMEVERSION] - • Tempo de Execução do ASP.NET Core [ASPNETCOREVERSION] - • Tempo de Execução da Área de Trabalho do Windows do .NET Core [WINFORMSANDWPFVERSION] - -Este produto coleta dados de uso - • Para obter mais informações e recusar, acesse https://aka.ms/dotnet-cli-telemetry - -Recursos - • Documentação do .NET Core: https://aka.ms/dotnet-docs - • Documentação do SDK: https://aka.ms/dotnet-sdk-docs - • Notas sobre a Versão: https://aka.ms/netcore3releasenotes - • Tutoriais: https://aka.ms/dotnet-tutorials - SDK do .NET Core - - O .NET Core é um software livre, multiplataforma e com suporte da Microsoft. Você pode usá-lo para criar seu próximo aplicativo, com C#, F# ou VB. Esperamos que você goste! - Saiba mais sobre o .NET Core - Recursos - <A HREF="https://aka.ms/dotnet-docs">Documentação Principal</A> - <A HREF="https://aka.ms/dotnet-cli-docs">Documentação do SDK</A> - <A HREF="https://aka.ms/dev-privacy">Política de Privacidade</A> - <A HREF="https://go.microsoft.com/fwlink/?LinkId=329770">Termos de licença da Biblioteca do .NET</A> - Nota de instalação - 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. - - Se você planeja usar o .NET Core 3.0 com o Visual Studio, o Visual Studio 2019 ou mais recente será necessário. <A HREF="https://go.microsoft.com/fwlink/?linkid=866799">Saiba mais</A>. - - + + + Instalador do [WixBundleName] + [BUNDLEMONIKER] + Tem certeza de que deseja cancelar? + Versão anterior + Ajuda de Instalação + /install | /repair | /uninstall | /layout [\[]"directory"[\]] – instala, repara, desinstala + ou cria uma cópia local completa do pacote no diretório. '/install' é o padrão + +/passive | /quiet – exibe a interface do usuário mínima sem nenhum prompt ou não exibe nenhuma interface do usuário e + nenhum prompt. Por padrão, a interface do usuário e todos os prompts são exibidos. + +/norestart – suprime qualquer tentativa de reiniciar. Por padrão, a interface do usuário perguntará antes de reiniciar. +/log [\[]"log.txt"[\]] – registra em um arquivo específico. Por padrão, um arquivo de log é criado em %TEMP%. + &Fechar + &Concordo com os termos e condições da licença + &Opções + &Instalar + &Fechar + Progresso da Instalação + Processando: + Inicializando... + &Cancelar + Modificar Instalação + &Reparar + &Desinstalar + &Fechar + Reparação Concluída com Êxito + Desinstalação Concluída com Êxito + Instalação com Êxito + &Iniciar + É necessário reiniciar o computador para concluir a instalação do software. + &Reiniciar + &Fechar + Falha na Instalação + Falha na Instalação + Falha na Desinstalação + Falha na Reparação + Um ou mais problemas causaram falha na instalação. Corrija-os e tente instalar novamente. Para obter mais informações, consulte o <a href="#">arquivo de log</a>. + Você deve reiniciar seu computador para concluir a reversão do software. + &Reiniciar + &Fechar + Arquivos em Uso + Os aplicativos a seguir estão usando arquivos que precisam ser atualizados: + Feche os &aplicativos e tente reiniciá-los. + &Não feche os aplicativos. Será necessária uma reinicialização. + &OK + &Cancelar + A instalação foi bem-sucedida. + +O seguinte foi instalado em: '[DOTNETHOME]' + • SDK do .NET Core [DOTNETSDKVERSION] + • Runtime do .NET Core [DOTNETRUNTIMEVERSION] + • Runtime do ASP.NET Core [ASPNETCOREVERSION] + • Runtime da Área de Trabalho do Windows do .NET Core [WINFORMSANDWPFVERSION] + +Este produto coleta dados de uso + • Para obter mais informações e recusar, acesse https://aka.ms/dotnet-cli-telemetry + +Recursos + • Documentação do .NET Core: https://aka.ms/dotnet-docs + • Documentação do SDK: https://aka.ms/dotnet-sdk-docs + • Notas sobre a Versão: https://aka.ms/netcore3releasenotes + • Tutoriais: https://aka.ms/dotnet-tutorials + SDK do .NET Core + + O .NET Core é um software livre, multiplataforma e com suporte da Microsoft. Você pode usá-lo para criar seu próximo aplicativo, com C#, F# ou VB. Esperamos que você goste! + Saiba mais sobre o .NET Core + Recursos + <A HREF="https://aka.ms/dotnet-docs">Documentação Principal</A> + <A HREF="https://aka.ms/dotnet-cli-docs">Documentação do SDK</A> + <A HREF="https://aka.ms/dev-privacy">Política de Privacidade</A> + <A HREF="https://go.microsoft.com/fwlink/?LinkId=329770">Termos de licença da Biblioteca do .NET</A> + Nota de instalação + 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. + + Se você planeja usar o .NET Core 3.0 com o Visual Studio, o Visual Studio 2019 ou mais recente será necessário. <A HREF="https://go.microsoft.com/fwlink/?linkid=866799">Saiba mais</A>. + + From 86d52a21934eebeee229e58e6034cac47f91863f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 5 Sep 2019 03:34:06 +0000 Subject: [PATCH 182/420] [release/3.0.1xx] Update dependencies from dotnet/toolset (#4559) * Update dependencies from https://github.com/dotnet/toolset build 20190904.4 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19454.4 * Update dependencies from https://github.com/dotnet/toolset build 20190904.5 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19454.5 * Update dependencies from https://github.com/dotnet/toolset build 20190904.7 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19454.7 * Update dependencies from https://github.com/dotnet/toolset build 20190904.8 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19454.8 * Update dependencies from https://github.com/dotnet/toolset build 20190904.10 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19454.10 * Update dependencies from https://github.com/dotnet/toolset build 20190904.11 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19454.11 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19454.4 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 637d4e7b9..5f4874a9b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 3356e6474670f153844949cdf7a3c1fc3ff2f137 + 447967f37b26284c22c3c99b088a234aae7516b3 https://github.com/dotnet/sdk 59e63b28d24a769652b754f341d38c9de7c3d0d1 - + https://github.com/dotnet/cli - 5ab959c38e454e86d109c1fbc743e97eec85cbe6 + a28f483e128e61a50f13ba13774366d50a076d74 diff --git a/eng/Versions.props b/eng/Versions.props index ee1086893..64dcf925f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19453.8 + 3.0.100-rc1.19454.11 @@ -33,7 +33,7 @@ - 3.0.100-rc1.19453.4 + 3.0.100-rc1.19454.4 0.2.0 From 298e4dcf34ef80f0ccd1818d8094a3cd3d6cb631 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 5 Sep 2019 03:36:49 +0000 Subject: [PATCH 183/420] [release/3.0.1xx] Update dependencies from dotnet/core-setup (#4566) * Update dependencies from https://github.com/dotnet/core-setup build 20190904.06 - Microsoft.NETCore.App - 3.0.0-rc1-19454-06 - NETStandard.Library.Ref - 2.1.0-rc1-19454-06 - Microsoft.WindowsDesktop.App - 3.0.0-rc1-19454-06 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-preview9.19417.1 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-preview9.19417.4 (parent: Microsoft.WindowsDesktop.App) * Update dependencies from https://github.com/dotnet/core-setup build 20190904.08 - Microsoft.NETCore.App - 3.0.0-rc1-19454-08 - NETStandard.Library.Ref - 2.1.0-rc1-19454-08 - Microsoft.WindowsDesktop.App - 3.0.0-rc1-19454-08 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-preview9.19417.1 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-preview9.19417.4 (parent: Microsoft.WindowsDesktop.App) * Update dependencies from https://github.com/dotnet/core-setup build 20190904.12 - Microsoft.NETCore.App - 3.0.0-rc1-19454-12 - NETStandard.Library.Ref - 2.1.0-rc1-19454-12 - Microsoft.WindowsDesktop.App - 3.0.0-rc1-19454-12 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-preview9.19417.1 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-preview9.19417.4 (parent: Microsoft.WindowsDesktop.App) * Update dependencies from https://github.com/dotnet/core-setup build 20190904.15 - Microsoft.NETCore.App - 3.0.0-rc1-19454-15 - NETStandard.Library.Ref - 2.1.0-rc1-19454-15 - Microsoft.WindowsDesktop.App - 3.0.0-rc1-19454-15 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-preview9.19417.1 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-preview9.19417.4 (parent: Microsoft.WindowsDesktop.App) * Update dependencies from https://github.com/dotnet/core-setup build 20190904.17 - Microsoft.NETCore.App - 3.0.0-rc1-19454-17 - NETStandard.Library.Ref - 2.1.0-rc1-19454-17 - Microsoft.WindowsDesktop.App - 3.0.0-rc1-19454-17 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-preview9.19417.1 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-preview9.19417.4 (parent: Microsoft.WindowsDesktop.App) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5f4874a9b..dba7e9b38 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - b9dd6c969c15a2734aecbd3e2aa83afed02040e4 + b2d71fc324f5b67fdde93d0bb3cc374bd6e2c7b8 - + https://github.com/dotnet/core-setup - b9dd6c969c15a2734aecbd3e2aa83afed02040e4 + b2d71fc324f5b67fdde93d0bb3cc374bd6e2c7b8 - + https://github.com/dotnet/core-setup - b9dd6c969c15a2734aecbd3e2aa83afed02040e4 + b2d71fc324f5b67fdde93d0bb3cc374bd6e2c7b8 https://github.com/aspnet/AspNetCore @@ -55,13 +55,13 @@ a28f483e128e61a50f13ba13774366d50a076d74 - + https://github.com/dotnet/winforms - 8b19141d6b0b221167bd7d1731cbc6aa9898da75 + dd6650900f5af7283c6af6ec85de4d8d51f28961 - + https://github.com/dotnet/wpf - 105b673bddd8665580a94878db12ac97af8fa794 + ffc3fbd836fb6ff3c28e50fec67be5b55c8b6542 diff --git a/eng/Versions.props b/eng/Versions.props index 64dcf925f..0efcca28f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,11 +16,11 @@ - 4.8.0-preview9.19415.10 + 4.8.0-preview9.19417.1 - 3.0.0-preview9.19416.2 + 3.0.0-preview9.19417.4 @@ -44,7 +44,7 @@ $(MicrosoftNETSdkPackageVersion) - 3.0.0-rc1-19453-06 + 3.0.0-rc1-19454-17 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -52,11 +52,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-rc1-19453-06 + 2.1.0-rc1-19454-17 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-rc1-19453-06 + 3.0.0-rc1-19454-17 $(MicrosoftWindowsDesktopAppPackageVersion) From 4083d5b31df7ea2f572bf183eb7739f4d16fc1e7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 5 Sep 2019 11:05:56 +0000 Subject: [PATCH 184/420] Update dependencies from https://github.com/dotnet/core-setup build 20190905.02 (#4576) - Microsoft.NETCore.App - 3.0.0-rc1-19455-02 - NETStandard.Library.Ref - 2.1.0-rc1-19455-02 - Microsoft.WindowsDesktop.App - 3.0.0-rc1-19455-02 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dba7e9b38..625056ac6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - b2d71fc324f5b67fdde93d0bb3cc374bd6e2c7b8 + caa8d3b1edd7eec947f6283f8342a9249b5d7171 - + https://github.com/dotnet/core-setup - b2d71fc324f5b67fdde93d0bb3cc374bd6e2c7b8 + caa8d3b1edd7eec947f6283f8342a9249b5d7171 - + https://github.com/dotnet/core-setup - b2d71fc324f5b67fdde93d0bb3cc374bd6e2c7b8 + caa8d3b1edd7eec947f6283f8342a9249b5d7171 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 0efcca28f..5d0ddb995 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ $(MicrosoftNETSdkPackageVersion) - 3.0.0-rc1-19454-17 + 3.0.0-rc1-19455-02 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -52,11 +52,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-rc1-19454-17 + 2.1.0-rc1-19455-02 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-rc1-19454-17 + 3.0.0-rc1-19455-02 $(MicrosoftWindowsDesktopAppPackageVersion) From 23643eeb2cf709430fbbe79564083bc51188e986 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 5 Sep 2019 11:10:31 +0000 Subject: [PATCH 185/420] [release/3.0.1xx] Update dependencies from dotnet/toolset (#4573) * Update dependencies from https://github.com/dotnet/toolset build 20190904.12 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19454.12 * Update dependencies from https://github.com/dotnet/toolset build 20190904.13 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19454.13 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19454.5 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190905.1 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19455.1 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19454.5 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190905.2 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19455.2 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19454.5 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 625056ac6..4e67919b0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 447967f37b26284c22c3c99b088a234aae7516b3 + 0006e3e685090a98024a0060c05164e71fbbd148 https://github.com/dotnet/sdk 59e63b28d24a769652b754f341d38c9de7c3d0d1 - + https://github.com/dotnet/cli - a28f483e128e61a50f13ba13774366d50a076d74 + a408b580b491bb17f444034bdda51e0986873bd1 diff --git a/eng/Versions.props b/eng/Versions.props index 5d0ddb995..33594934f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19454.11 + 3.0.100-rc1.19455.2 @@ -33,7 +33,7 @@ - 3.0.100-rc1.19454.4 + 3.0.100-rc1.19454.5 0.2.0 From f0d988effa18baa2f85bbde9ce6948d56e4391f3 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Thu, 5 Sep 2019 12:35:44 -0700 Subject: [PATCH 186/420] Fix the branch info information to use release/3.0.100-preview9. --- src/CopyToLatest/targets/BranchInfo.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CopyToLatest/targets/BranchInfo.props b/src/CopyToLatest/targets/BranchInfo.props index d103b00f0..f11bec24c 100644 --- a/src/CopyToLatest/targets/BranchInfo.props +++ b/src/CopyToLatest/targets/BranchInfo.props @@ -1,5 +1,5 @@ - release/3.0.1xx + release/3.0.100-preview9 From 8eedfce74981e8f2b591c45a70a55cdb19d41d2a Mon Sep 17 00:00:00 2001 From: Livar Date: Thu, 5 Sep 2019 12:41:56 -0700 Subject: [PATCH 187/420] Updating branding to rc2 --- src/redist/targets/Versions.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/Versions.targets b/src/redist/targets/Versions.targets index 862b56369..ee1a41dc0 100644 --- a/src/redist/targets/Versions.targets +++ b/src/redist/targets/Versions.targets @@ -4,7 +4,7 @@ 0 1 00 - rc1 + rc2 From a553bba77601c53a0bfd9b5e0b70c6a0c9f6587b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 6 Sep 2019 00:25:37 +0000 Subject: [PATCH 188/420] [release/3.0.1xx] Update dependencies from dotnet/toolset (#4577) * Update dependencies from https://github.com/dotnet/toolset build 20190905.3 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19455.3 * Update dependencies from https://github.com/dotnet/toolset build 20190905.4 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19455.4 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19455.1 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190905.9 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19455.9 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19455.1 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190905.11 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19455.11 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19455.1 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190905.16 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19455.16 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19455.1 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190905.18 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19455.18 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19455.1 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190905.22 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19455.22 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19455.1 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190905.21 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19455.21 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19455.1 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190905.24 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19455.24 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19455.1 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190905.25 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19455.25 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19455.1 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190905.28 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19455.28 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19455.7 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190905.33 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19455.33 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19455.7 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4e67919b0..d94134c05 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 0006e3e685090a98024a0060c05164e71fbbd148 + ecd800d134dc33cc8340b6de3608055adf1ffe27 https://github.com/dotnet/sdk 59e63b28d24a769652b754f341d38c9de7c3d0d1 - + https://github.com/dotnet/cli - a408b580b491bb17f444034bdda51e0986873bd1 + 92f836fe05e521bbd46e8550367830608809408c diff --git a/eng/Versions.props b/eng/Versions.props index 33594934f..7ec03c2fa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19455.2 + 3.0.100-rc2.19455.33 @@ -33,7 +33,7 @@ - 3.0.100-rc1.19454.5 + 3.0.100-rc1.19455.7 0.2.0 From 4495022c8239c764dea417944d48e9d98751d4b1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 6 Sep 2019 01:27:09 +0000 Subject: [PATCH 189/420] [release/3.0.1xx] Update dependencies from dotnet/toolset (#4601) * Update dependencies from https://github.com/dotnet/toolset build 20190905.34 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19455.34 * Update dependencies from https://github.com/dotnet/toolset build 20190905.35 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19455.35 * Update dependencies from https://github.com/dotnet/toolset build 20190905.36 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19455.36 * Dependency coherency updates - Microsoft.NET.Sdk - 3.0.100-rc1.19455.5 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19455.9 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d94134c05..59558a236 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - ecd800d134dc33cc8340b6de3608055adf1ffe27 + 81483b489623fc6d5f1df9f6b2ad3f4c04dc9e20 - + https://github.com/dotnet/sdk - 59e63b28d24a769652b754f341d38c9de7c3d0d1 + 021e6140f09b28f15a048db6709c7be8f74eda3d - + https://github.com/dotnet/cli - 92f836fe05e521bbd46e8550367830608809408c + 82166e07745511d0daefe4f4dc58a72cf1e085ab diff --git a/eng/Versions.props b/eng/Versions.props index 7ec03c2fa..3679d4a8a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc2.19455.33 + 3.0.100-rc2.19455.36 @@ -33,14 +33,14 @@ - 3.0.100-rc1.19455.7 + 3.0.100-rc1.19455.9 0.2.0 - 3.0.100-rc1.19453.1 + 3.0.100-rc1.19455.5 $(MicrosoftNETSdkPackageVersion) From 3c2fbf400815f93a0713b7d8e054413f3165857d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 6 Sep 2019 03:35:44 +0000 Subject: [PATCH 190/420] [release/3.0.1xx] Update dependencies from dotnet/toolset (#4602) * Update dependencies from https://github.com/dotnet/toolset build 20190905.39 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19455.39 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc2.19455.12 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190905.40 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19455.40 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc2.19455.13 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 59558a236..f4af81111 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 81483b489623fc6d5f1df9f6b2ad3f4c04dc9e20 + 0e216f0ef6a2f39a3bc0000ff9f47fb0e98b999e https://github.com/dotnet/sdk 021e6140f09b28f15a048db6709c7be8f74eda3d - + https://github.com/dotnet/cli - 82166e07745511d0daefe4f4dc58a72cf1e085ab + df8c91f740d493e36ec44d684afdf26553cd5c7d diff --git a/eng/Versions.props b/eng/Versions.props index 3679d4a8a..3a0911e97 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc2.19455.36 + 3.0.100-rc2.19455.40 @@ -33,7 +33,7 @@ - 3.0.100-rc1.19455.9 + 3.0.100-rc2.19455.13 0.2.0 From c328b497d6ad94a496b969c5d2ffdfd492e60e0b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 6 Sep 2019 05:52:46 +0000 Subject: [PATCH 191/420] [release/3.0.1xx] Update dependencies from dotnet/toolset (#4605) * Update dependencies from https://github.com/dotnet/toolset build 20190905.42 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19455.42 * Update dependencies from https://github.com/dotnet/toolset build 20190905.44 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19455.44 * Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc2.19455.15 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190905.45 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19455.45 Dependency coherency updates - Microsoft.NET.Sdk - 3.0.100-rc2.19455.7 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc2.19455.15 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f4af81111..f397bb4f8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 0e216f0ef6a2f39a3bc0000ff9f47fb0e98b999e + 6008e1aef336822bf89ed451a817121af7f1be2c - + https://github.com/dotnet/sdk - 021e6140f09b28f15a048db6709c7be8f74eda3d + b88161ed99ded0dd598779ad1afe044818422a6f - + https://github.com/dotnet/cli - df8c91f740d493e36ec44d684afdf26553cd5c7d + bce04d14f1161fac321e6d1f9f4b8ad736dae800 diff --git a/eng/Versions.props b/eng/Versions.props index 3a0911e97..7756d5f41 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc2.19455.40 + 3.0.100-rc2.19455.45 @@ -33,14 +33,14 @@ - 3.0.100-rc2.19455.13 + 3.0.100-rc2.19455.15 0.2.0 - 3.0.100-rc1.19455.5 + 3.0.100-rc2.19455.7 $(MicrosoftNETSdkPackageVersion) From c1bb07ecf3f82d5eff913630ec9cd0f7f48dabe8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 6 Sep 2019 08:41:42 +0000 Subject: [PATCH 192/420] [release/3.0.1xx] Update dependencies from dotnet/toolset (#4606) * Update dependencies from https://github.com/dotnet/toolset build 20190905.47 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19455.47 * Update dependencies from https://github.com/dotnet/toolset build 20190905.48 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19455.48 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc2.19455.17 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f397bb4f8..056c39797 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 6008e1aef336822bf89ed451a817121af7f1be2c + 049961d8c0d35e6d55572d6a575c60f49d3330da https://github.com/dotnet/sdk b88161ed99ded0dd598779ad1afe044818422a6f - + https://github.com/dotnet/cli - bce04d14f1161fac321e6d1f9f4b8ad736dae800 + 80a7b6bfd9f2eac6e04ab372acfe7fb7ec5c6f9b diff --git a/eng/Versions.props b/eng/Versions.props index 7756d5f41..b811421e0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc2.19455.45 + 3.0.100-rc2.19455.48 @@ -33,7 +33,7 @@ - 3.0.100-rc2.19455.15 + 3.0.100-rc2.19455.17 0.2.0 From 410fa2fab865c2071c355c2ed2de5fd457cbd644 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 6 Sep 2019 10:21:06 +0000 Subject: [PATCH 193/420] Update dependencies from https://github.com/dotnet/toolset build 20190906.1 (#4608) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19456.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 056c39797..8e06c3124 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 049961d8c0d35e6d55572d6a575c60f49d3330da + bffa2460bd34dd2f508590eb128afc386c8a3185 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index b811421e0..fdcd5ae25 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc2.19455.48 + 3.0.100-rc2.19456.1 From 1d8b598d00d1ffc0cf528feb24bb035a95ec2e1e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 6 Sep 2019 12:01:01 +0000 Subject: [PATCH 194/420] Update dependencies from https://github.com/dotnet/toolset build 20190906.3 (#4610) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19456.3 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc2.19456.1 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8e06c3124..f021b1fab 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - bffa2460bd34dd2f508590eb128afc386c8a3185 + 46fe6b0c6137900bc8263b68a3e80ec390a4b88d https://github.com/dotnet/sdk b88161ed99ded0dd598779ad1afe044818422a6f - + https://github.com/dotnet/cli - 80a7b6bfd9f2eac6e04ab372acfe7fb7ec5c6f9b + 65773a34e6b5f5052c337ae4481329f36c8da8c2 diff --git a/eng/Versions.props b/eng/Versions.props index fdcd5ae25..fa3a8ceeb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc2.19456.1 + 3.0.100-rc2.19456.3 @@ -33,7 +33,7 @@ - 3.0.100-rc2.19455.17 + 3.0.100-rc2.19456.1 0.2.0 From 5546a1cc8b70c7fc43bcb712435036fcb4df33c8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 6 Sep 2019 17:52:49 +0000 Subject: [PATCH 195/420] [release/3.0.1xx] Update dependencies from dotnet/toolset (#4614) * Update dependencies from https://github.com/dotnet/toolset build 20190906.9 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19456.9 * Update dependencies from https://github.com/dotnet/toolset build 20190906.13 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19456.13 * Update dependencies from https://github.com/dotnet/toolset build 20190906.15 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19456.15 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f021b1fab..0f1285dc7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 46fe6b0c6137900bc8263b68a3e80ec390a4b88d + 731ee68fbb765b287efc20858d117a09147f3947 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index fa3a8ceeb..d329d837a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc2.19456.3 + 3.0.100-rc2.19456.15 From ae996084b3627643476c5bcb6666c0d9b24df8fb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 6 Sep 2019 19:02:36 +0000 Subject: [PATCH 196/420] [release/3.0.1xx] Update dependencies from aspnet/AspNetCore (#4563) * Update dependencies from https://github.com/aspnet/AspNetCore build 20190904.1 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-rc1.19454.1 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-rc1.19454.1 - Microsoft.AspNetCore.App.Ref - 3.0.0-rc1.19454.1 - dotnet-watch - 3.0.0-rc1.19454.1 - dotnet-user-secrets - 3.0.0-rc1.19454.1 - dotnet-dev-certs - 3.0.0-rc1.19454.1 * Update dependencies from https://github.com/aspnet/AspNetCore build 20190906.2 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-rc2.19456.2 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-rc2.19456.2 - Microsoft.AspNetCore.App.Ref - 3.0.0-rc2.19456.2 - dotnet-watch - 3.0.0-rc2.19456.2 - dotnet-user-secrets - 3.0.0-rc2.19456.2 - dotnet-dev-certs - 3.0.0-rc2.19456.2 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0f1285dc7..3a95a155e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup caa8d3b1edd7eec947f6283f8342a9249b5d7171 - + https://github.com/aspnet/AspNetCore - 0abe61f391b30219ce5983b9a2964c1d85665449 + 91a6fcc93d96530f3d9ad15c2942ff167d2e8e46 - + https://github.com/aspnet/AspNetCore - 0abe61f391b30219ce5983b9a2964c1d85665449 + 91a6fcc93d96530f3d9ad15c2942ff167d2e8e46 - + https://github.com/aspnet/AspNetCore - 0abe61f391b30219ce5983b9a2964c1d85665449 + 91a6fcc93d96530f3d9ad15c2942ff167d2e8e46 - + https://github.com/aspnet/AspNetCore - 0abe61f391b30219ce5983b9a2964c1d85665449 + 91a6fcc93d96530f3d9ad15c2942ff167d2e8e46 - + https://github.com/aspnet/AspNetCore - 0abe61f391b30219ce5983b9a2964c1d85665449 + 91a6fcc93d96530f3d9ad15c2942ff167d2e8e46 - + https://github.com/aspnet/AspNetCore - 0abe61f391b30219ce5983b9a2964c1d85665449 + 91a6fcc93d96530f3d9ad15c2942ff167d2e8e46 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index d329d837a..23fbe5f60 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-rc1.19453.1 - 3.0.0-rc1.19453.1 - 3.0.0-rc1.19453.1 - 3.0.0-rc1.19453.1 - 3.0.0-rc1.19453.1 - 3.0.0-rc1.19453.1 + 3.0.0-rc2.19456.2 + 3.0.0-rc2.19456.2 + 3.0.0-rc2.19456.2 + 3.0.0-rc2.19456.2 + 3.0.0-rc2.19456.2 + 3.0.0-rc2.19456.2 From ea6effb4471963c7c21628952448b032f9c9b1b3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 6 Sep 2019 20:51:41 +0000 Subject: [PATCH 197/420] [release/3.0.1xx] Update dependencies from dotnet/toolset (#4621) * Update dependencies from https://github.com/dotnet/toolset build 20190906.18 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19456.18 * Update dependencies from https://github.com/dotnet/toolset build 20190906.19 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19456.19 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc2.19456.7 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3a95a155e..1b3c1f986 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 731ee68fbb765b287efc20858d117a09147f3947 + 57fa869a8c91d5afb85fd8b9bba477a233a6587b https://github.com/dotnet/sdk b88161ed99ded0dd598779ad1afe044818422a6f - + https://github.com/dotnet/cli - 65773a34e6b5f5052c337ae4481329f36c8da8c2 + 2347708b6ecddffe537be2ffb8174c0b62e35047 diff --git a/eng/Versions.props b/eng/Versions.props index 23fbe5f60..e1821b1e2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc2.19456.15 + 3.0.100-rc2.19456.19 @@ -33,7 +33,7 @@ - 3.0.100-rc2.19456.1 + 3.0.100-rc2.19456.7 0.2.0 From 020c8074d2a378cc408f27aeda801bb63778e4c3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 6 Sep 2019 15:37:33 -0700 Subject: [PATCH 198/420] [release/3.0.100-preview9] Update dependencies from dotnet/core-setup (#4619) * Update dependencies from https://github.com/dotnet/core-setup build 20190906.12 - Microsoft.NETCore.App - 3.0.0-rc1-19456-12 - NETStandard.Library.Ref - 2.1.0-rc1-19456-12 - Microsoft.WindowsDesktop.App - 3.0.0-rc1-19456-12 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-rc1.19453.3 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-rc1.19454.2 (parent: Microsoft.WindowsDesktop.App) * Update dependencies from https://github.com/dotnet/core-setup build 20190906.20 - Microsoft.NETCore.App - 3.0.0-rc1-19456-20 - NETStandard.Library.Ref - 2.1.0-rc1-19456-20 - Microsoft.WindowsDesktop.App - 3.0.0-rc1-19456-20 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-rc1.19455.20 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-rc1.19455.14 (parent: Microsoft.WindowsDesktop.App) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4e67919b0..f9a5981e7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - caa8d3b1edd7eec947f6283f8342a9249b5d7171 + 8f5d7b1ba4f744199ba006cac38dfcb9a2408880 - + https://github.com/dotnet/core-setup - caa8d3b1edd7eec947f6283f8342a9249b5d7171 + 8f5d7b1ba4f744199ba006cac38dfcb9a2408880 - + https://github.com/dotnet/core-setup - caa8d3b1edd7eec947f6283f8342a9249b5d7171 + 8f5d7b1ba4f744199ba006cac38dfcb9a2408880 https://github.com/aspnet/AspNetCore @@ -55,13 +55,13 @@ a408b580b491bb17f444034bdda51e0986873bd1 - + https://github.com/dotnet/winforms - dd6650900f5af7283c6af6ec85de4d8d51f28961 + 9104c48ca015b5a4c8e029c330af6d68bc11b0b8 - + https://github.com/dotnet/wpf - ffc3fbd836fb6ff3c28e50fec67be5b55c8b6542 + 1c3dd24d7188899a5f12d1caa31630f66bd4c2fd diff --git a/eng/Versions.props b/eng/Versions.props index 33594934f..ee22c4603 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,11 +16,11 @@ - 4.8.0-preview9.19417.1 + 4.8.0-rc1.19455.20 - 3.0.0-preview9.19417.4 + 3.0.0-rc1.19455.14 @@ -44,7 +44,7 @@ $(MicrosoftNETSdkPackageVersion) - 3.0.0-rc1-19455-02 + 3.0.0-rc1-19456-20 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -52,11 +52,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-rc1-19455-02 + 2.1.0-rc1-19456-20 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-rc1-19455-02 + 3.0.0-rc1-19456-20 $(MicrosoftWindowsDesktopAppPackageVersion) From e61fa80b2f40821d2d60a755ae297d69fe7529f5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 7 Sep 2019 08:02:22 +0000 Subject: [PATCH 199/420] [release/3.0.1xx] Update dependencies from dotnet/toolset (#4630) * Update dependencies from https://github.com/dotnet/toolset build 20190906.30 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19456.30 * Update dependencies from https://github.com/dotnet/toolset build 20190906.33 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19456.33 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc2.19456.15 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190906.34 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19456.34 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc2.19456.16 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1b3c1f986..a71c61e46 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 57fa869a8c91d5afb85fd8b9bba477a233a6587b + 89a1ea6974e9bc13f8f540f356f261dc2ed254b8 https://github.com/dotnet/sdk b88161ed99ded0dd598779ad1afe044818422a6f - + https://github.com/dotnet/cli - 2347708b6ecddffe537be2ffb8174c0b62e35047 + 2b27a360a24d7e2e70a1b33cf108d602b356fdf5 diff --git a/eng/Versions.props b/eng/Versions.props index e1821b1e2..aa0e150ef 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc2.19456.19 + 3.0.100-rc2.19456.34 @@ -33,7 +33,7 @@ - 3.0.100-rc2.19456.7 + 3.0.100-rc2.19456.16 0.2.0 From df3e5a9908e2fa0fc9ca4c6c1004d59007212959 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=AD=E4=B9=9D=E9=BC=8E?= <109224573@qq.com> Date: Sat, 7 Sep 2019 18:14:38 +0800 Subject: [PATCH 200/420] Update statement, add spaces, fix typo --- .../targets/packaging/windows/clisdk/LCID/2052/bundle.wxl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl index 421ed4114..37256afbf 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl @@ -2,7 +2,7 @@ [WixBundleName] 安装程序 [BUNDLEMONIKER] - 是否确实要取消? + 您确定要取消吗? 上一版本 安装程序帮助 /install | /repair | /uninstall | /layout [\[]"directory"[\]] - 安装、修复、卸载 @@ -56,16 +56,16 @@ • .NET Core Windows Desktop Runtime [WINFORMSANDWPFVERSION] 此产品会收集用法数据 - •详细信息和选择退出选项: https://aka.ms/dotnet-cli-telemetry + • 详细信息和选择退出选项: https://aka.ms/dotnet-cli-telemetry 资源 • .NET Core 文档: https://aka.ms/dotnet-docs • SDK 文档: https://aka.ms/dotnet-sdk-docs - •发行说明: https://aka.ms/netcore3releasenotes + • 发行说明: https://aka.ms/netcore3releasenotes • 教程: https://aka.ms/dotnet-tutorials .NET Core SDK - .NET Core 是开源、跨平台的，且由 Microsoft 提供支持。通过它，可使用 C#、F# 或 VB 构建你的下一个应用。喜欢你喜欢它! + .NET Core 是开源、跨平台的，且由 Microsoft 提供支持。通过它，可使用 C#、F# 或 VB 构建你的下一个应用。希望你喜欢它! 了解有关 .NET Core 的详细信息 资源 <A HREF="https://aka.ms/dotnet-docs">Core 文档</A> From 5358c34cb7fe6f1bd72254a4adf1daf79a9f3807 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=AD=E4=B9=9D=E9=BC=8E?= <109224573@qq.com> Date: Sat, 7 Sep 2019 18:16:44 +0800 Subject: [PATCH 201/420] Revert "Runtime" translation --- .../targets/packaging/windows/clisdk/LCID/1028/bundle.wxl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1028/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1028/bundle.wxl index 94e4d025b..b0a8a414f 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1028/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1028/bundle.wxl @@ -51,9 +51,9 @@ 下列項目已安裝在: '[DOTNETHOME]' • .NET Core SDK [DOTNETSDKVERSION] - • .NET Core 執行階段 [DOTNETRUNTIMEVERSION] - • ASP.NET Core 執行階段 [ASPNETCOREVERSION] - • .NET Core Windows Desktop 執行階段 [WINFORMSANDWPFVERSION] + • .NET Core Runtime [DOTNETRUNTIMEVERSION] + • ASP.NET Core Runtime [ASPNETCOREVERSION] + • .NET Core Windows Desktop Runtime [WINFORMSANDWPFVERSION] 此產品會收集使用方式資料 • 如需詳細資訊或退出，請前往 https://aka.ms/dotnet-cli-telemetry From 58eb01ad9b7b411050c7f40812106f280dd25e12 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 7 Sep 2019 13:57:23 +0000 Subject: [PATCH 202/420] [release/3.0.1xx] Update dependencies from dotnet/toolset (#4639) * Update dependencies from https://github.com/dotnet/toolset build 20190907.3 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19457.3 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc2.19457.2 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190907.5 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19457.5 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc2.19457.2 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190907.8 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19457.8 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc2.19457.2 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a71c61e46..f4b9544b9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 89a1ea6974e9bc13f8f540f356f261dc2ed254b8 + 4c32df6316d663fcc0d92c7565b39e2ad066386c https://github.com/dotnet/sdk b88161ed99ded0dd598779ad1afe044818422a6f - + https://github.com/dotnet/cli - 2b27a360a24d7e2e70a1b33cf108d602b356fdf5 + 1e0997d065e566e735085625dd081a089d1d8635 diff --git a/eng/Versions.props b/eng/Versions.props index aa0e150ef..731fd4a3c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc2.19456.34 + 3.0.100-rc2.19457.8 @@ -33,7 +33,7 @@ - 3.0.100-rc2.19456.16 + 3.0.100-rc2.19457.2 0.2.0 From b1ae190f03fbd62dd0ddaedc7c0a36feb1428caf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 7 Sep 2019 20:29:08 +0000 Subject: [PATCH 203/420] [release/3.0.1xx] Update dependencies from dotnet/toolset (#4648) * Update dependencies from https://github.com/dotnet/toolset build 20190907.11 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19457.11 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc2.19457.3 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190907.12 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19457.12 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc2.19457.3 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190907.14 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19457.14 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc2.19457.3 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190907.17 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19457.17 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc2.19457.3 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190907.18 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19457.18 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc2.19457.8 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190907.19 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19457.19 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc2.19457.8 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190907.22 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19457.22 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc2.19457.8 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f4b9544b9..0cdb65d7e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 4c32df6316d663fcc0d92c7565b39e2ad066386c + 8ede69de899bd1dd5a9dc6ccd3e00967a7ad2100 https://github.com/dotnet/sdk b88161ed99ded0dd598779ad1afe044818422a6f - + https://github.com/dotnet/cli - 1e0997d065e566e735085625dd081a089d1d8635 + dcd6fdad842d9cdd05589a12567d090b925ddd15 diff --git a/eng/Versions.props b/eng/Versions.props index 731fd4a3c..4e0f70ce0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc2.19457.8 + 3.0.100-rc2.19457.22 @@ -33,7 +33,7 @@ - 3.0.100-rc2.19457.2 + 3.0.100-rc2.19457.8 0.2.0 From d279f60560f561544d6b2a3f3dbd76d64605585a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 8 Sep 2019 18:44:06 -0700 Subject: [PATCH 204/420] [release/3.0.100-preview9] Update dependencies from aspnet/AspNetCore (#4654) * Update dependencies from https://github.com/aspnet/AspNetCore build 20190907.1 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-rc1.19457.1 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-rc1.19457.1 - Microsoft.AspNetCore.App.Ref - 3.0.0-rc1.19457.1 - dotnet-watch - 3.0.0-rc1.19457.1 - dotnet-user-secrets - 3.0.0-rc1.19457.1 - dotnet-dev-certs - 3.0.0-rc1.19457.1 * Update dependencies from https://github.com/aspnet/AspNetCore build 20190907.2 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-rc1.19457.2 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-rc1.19457.2 - Microsoft.AspNetCore.App.Ref - 3.0.0-rc1.19457.2 - dotnet-watch - 3.0.0-rc1.19457.2 - dotnet-user-secrets - 3.0.0-rc1.19457.2 - dotnet-dev-certs - 3.0.0-rc1.19457.2 * Update dependencies from https://github.com/aspnet/AspNetCore build 20190907.4 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-rc1.19457.4 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-rc1.19457.4 - Microsoft.AspNetCore.App.Ref - 3.0.0-rc1.19457.4 - dotnet-watch - 3.0.0-rc1.19457.4 - dotnet-user-secrets - 3.0.0-rc1.19457.4 - dotnet-dev-certs - 3.0.0-rc1.19457.4 * Skip VB template tests --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ test/SdkTests/TestConfig.xml | 5 +++++ 3 files changed, 23 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f9a5981e7..7e914ea06 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup 8f5d7b1ba4f744199ba006cac38dfcb9a2408880 - + https://github.com/aspnet/AspNetCore - 0abe61f391b30219ce5983b9a2964c1d85665449 + 49e84ee5ff04b17f35cacb9c1d6ccf52d8328dad - + https://github.com/aspnet/AspNetCore - 0abe61f391b30219ce5983b9a2964c1d85665449 + 49e84ee5ff04b17f35cacb9c1d6ccf52d8328dad - + https://github.com/aspnet/AspNetCore - 0abe61f391b30219ce5983b9a2964c1d85665449 + 49e84ee5ff04b17f35cacb9c1d6ccf52d8328dad - + https://github.com/aspnet/AspNetCore - 0abe61f391b30219ce5983b9a2964c1d85665449 + 49e84ee5ff04b17f35cacb9c1d6ccf52d8328dad - + https://github.com/aspnet/AspNetCore - 0abe61f391b30219ce5983b9a2964c1d85665449 + 49e84ee5ff04b17f35cacb9c1d6ccf52d8328dad - + https://github.com/aspnet/AspNetCore - 0abe61f391b30219ce5983b9a2964c1d85665449 + 49e84ee5ff04b17f35cacb9c1d6ccf52d8328dad https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index ee22c4603..9632411fc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-rc1.19453.1 - 3.0.0-rc1.19453.1 - 3.0.0-rc1.19453.1 - 3.0.0-rc1.19453.1 - 3.0.0-rc1.19453.1 - 3.0.0-rc1.19453.1 + 3.0.0-rc1.19457.4 + 3.0.0-rc1.19457.4 + 3.0.0-rc1.19457.4 + 3.0.0-rc1.19457.4 + 3.0.0-rc1.19457.4 + 3.0.0-rc1.19457.4 diff --git a/test/SdkTests/TestConfig.xml b/test/SdkTests/TestConfig.xml index a7e2063cd..13c5859e5 100644 --- a/test/SdkTests/TestConfig.xml +++ b/test/SdkTests/TestConfig.xml @@ -45,6 +45,11 @@ + + Date: Sun, 8 Sep 2019 18:44:22 -0700 Subject: [PATCH 205/420] [release/3.0.100-preview9] Update dependencies from dotnet/toolset (#4598) * Update dependencies from https://github.com/dotnet/toolset build 20190905.26 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview9.19455.26 Dependency coherency updates - Microsoft.NET.Sdk - 3.0.100-preview9.19426.11 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview9.19426.10 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190905.32 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19455.32 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19455.1 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190905.41 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19455.41 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19455.1 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190906.20 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19456.20 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19455.1 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190906.23 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19456.23 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19456.11 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190906.24 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19456.24 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19456.11 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190906.25 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19456.25 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19456.11 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190906.26 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19456.26 Dependency coherency updates - Microsoft.NET.Sdk - 3.0.100-rc1.19456.2 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19456.11 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190906.27 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19456.27 Dependency coherency updates - Microsoft.NET.Sdk - 3.0.100-rc1.19456.2 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19456.12 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190906.31 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19456.31 Dependency coherency updates - Microsoft.NET.Sdk - 3.0.100-rc1.19456.2 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19456.12 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190907.21 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19457.21 Dependency coherency updates - Microsoft.NET.Sdk - 3.0.100-rc1.19456.2 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19456.12 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190907.23 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19457.23 Dependency coherency updates - Microsoft.NET.Sdk - 3.0.100-rc1.19456.2 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19456.12 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190907.24 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19457.24 Dependency coherency updates - Microsoft.NET.Sdk - 3.0.100-rc1.19456.2 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19457.9 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190907.26 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19457.26 Dependency coherency updates - Microsoft.NET.Sdk - 3.0.100-rc1.19456.2 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19457.9 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190907.27 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19457.27 Dependency coherency updates - Microsoft.NET.Sdk - 3.0.100-rc1.19456.2 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19457.11 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190907.30 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19457.30 Dependency coherency updates - Microsoft.NET.Sdk - 3.0.100-rc1.19456.2 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19457.12 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190908.1 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19458.1 Dependency coherency updates - Microsoft.NET.Sdk - 3.0.100-rc1.19456.2 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19457.12 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190908.3 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19458.3 Dependency coherency updates - Microsoft.NET.Sdk - 3.0.100-rc1.19456.2 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19458.2 (parent: Microsoft.Dotnet.Toolset.Internal) * Update where we pull the toolset from * Update dependencies from https://github.com/dotnet/toolset build 20190908.12 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19458.12 Dependency coherency updates - Microsoft.NET.Sdk - 3.0.100-rc1.19458.1 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19458.2 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190908.14 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19458.14 Dependency coherency updates - Microsoft.NET.Sdk - 3.0.100-rc1.19458.1 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19458.6 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- src/redist/targets/GenerateLayout.targets | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7e914ea06..a6985fc48 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 0006e3e685090a98024a0060c05164e71fbbd148 + 8d4c190fe5f865f9f900ac3a94a9e5b5029cdc03 - + https://github.com/dotnet/sdk - 59e63b28d24a769652b754f341d38c9de7c3d0d1 + b09faf073550a3bf31f3be23ad0b2b7b4d80f4d5 - + https://github.com/dotnet/cli - a408b580b491bb17f444034bdda51e0986873bd1 + 70cf7521b833e92afe13864c775399a2e6922176 diff --git a/eng/Versions.props b/eng/Versions.props index 9632411fc..962967ea1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc1.19455.2 + 3.0.100-rc1.19458.14 @@ -33,14 +33,14 @@ - 3.0.100-rc1.19454.5 + 3.0.100-rc1.19458.6 0.2.0 - 3.0.100-rc1.19453.1 + 3.0.100-rc1.19458.1 $(MicrosoftNETSdkPackageVersion) diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index d2a0b6fd1..31067c29e 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -13,7 +13,7 @@ $(RedistLayoutPath)sdk\$(SdkVersion)\ https://dotnetcli.azureedge.net/dotnet/ https://dotnetcli.blob.core.windows.net/dotnet/ - https://dotnetfeed.blob.core.windows.net/dotnet-toolset/ + https://dotnetfeed.blob.core.windows.net/dotnet-core/ $(HostRid) $(HostMonikerRid) From 394129e334c73a66ede5a4c8aaf6b5d0ebf876bc Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Mon, 9 Sep 2019 15:10:06 -0700 Subject: [PATCH 206/420] Apply tool prefix to installation and restore in addition to run --- test/SdkTests/SdkTests.csproj | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/test/SdkTests/SdkTests.csproj b/test/SdkTests/SdkTests.csproj index 2a1696f8c..b479be71b 100644 --- a/test/SdkTests/SdkTests.csproj +++ b/test/SdkTests/SdkTests.csproj @@ -191,7 +191,18 @@ - + $(ToolRunPrefix)set MSBuildSDKsPath= && + $(ToolRunPrefix)set DOTNET_HOST_PATH= && + $(ToolRunPrefix)set DOTNET_INSTALLDIR= && + + + $(ToolRunPrefix)unset MSBuildSDKsPath && + $(ToolRunPrefix)unset DOTNET_HOST_PATH && + $(ToolRunPrefix)unset DOTNET_INSTALLDIR && + + + @@ -202,14 +213,12 @@ $(InstallToolCommand) --version $(SdkTestPackageVersion) $(InstallToolCommand) --add-source $(SdkTestPackageFeed) - - - - @@ -233,17 +242,6 @@ $(TestArgs) -testConfigFile "$(MSBuildThisFileDirectory)TestsToSkipx86.xml" - - $(ToolRunPrefix)set MSBuildSDKsPath= && - $(ToolRunPrefix)set DOTNET_HOST_PATH= && - $(ToolRunPrefix)set DOTNET_INSTALLDIR= && - - - $(ToolRunPrefix)unset MSBuildSDKsPath && - $(ToolRunPrefix)unset DOTNET_HOST_PATH && - $(ToolRunPrefix)unset DOTNET_INSTALLDIR && - - From 701077032ec5c4dc3b54c83d98948dde9138e9fa Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Mon, 9 Sep 2019 17:53:06 -0700 Subject: [PATCH 207/420] Fix syntax for unsetting environment variables --- test/SdkTests/SdkTests.csproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/SdkTests/SdkTests.csproj b/test/SdkTests/SdkTests.csproj index b479be71b..24c63b0dd 100644 --- a/test/SdkTests/SdkTests.csproj +++ b/test/SdkTests/SdkTests.csproj @@ -192,9 +192,9 @@ - $(ToolRunPrefix)set MSBuildSDKsPath= && - $(ToolRunPrefix)set DOTNET_HOST_PATH= && - $(ToolRunPrefix)set DOTNET_INSTALLDIR= && + $(ToolRunPrefix)set MSBuildSDKsPath=&& + $(ToolRunPrefix)set DOTNET_HOST_PATH=&& + $(ToolRunPrefix)set DOTNET_INSTALLDIR=&& $(ToolRunPrefix)unset MSBuildSDKsPath && From 5d9735b8c10421204b2918332d39e8edc2b5cbc5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 10 Sep 2019 19:38:53 +0000 Subject: [PATCH 208/420] Update dependencies from https://github.com/dotnet/arcade build 20190910.3 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19460.3 --- eng/Version.Details.xml | 4 +- eng/common/build.ps1 | 4 + eng/common/darc-init.ps1 | 4 +- eng/common/darc-init.sh | 6 +- eng/common/native/CommonLibrary.psm1 | 2 + eng/common/performance/perfhelixpublish.proj | 29 +++- eng/common/performance/performance-setup.ps1 | 19 ++- eng/common/performance/performance-setup.sh | 39 +++++- .../post-build/sourcelink-validation.ps1 | 2 +- eng/common/post-build/symbols-validation.ps1 | 20 +-- eng/common/sdl/execute-all-sdl-tools.ps1 | 17 +-- eng/common/sdl/init-sdl.ps1 | 3 + eng/common/sdl/packages.config | 4 +- eng/common/sdl/run-sdl.ps1 | 10 +- eng/common/templates/job/execute-sdl.yml | 15 ++- eng/common/templates/job/job.yml | 5 +- eng/common/templates/job/performance.yml | 6 +- .../templates/job/publish-build-assets.yml | 7 + ...lic-dev-release.yml => netcore-dev-30.yml} | 90 ++++--------- .../post-build/channels/netcore-dev-31.yml | 125 ++++++++++++++++++ .../post-build/channels/netcore-dev-5.yml | 96 +++++--------- ...-servicing.yml => netcore-internal-30.yml} | 92 ++++--------- ...lic-release.yml => netcore-release-30.yml} | 89 ++++--------- .../channels/netcore-release-31.yml | 124 +++++++++++++++++ .../channels/netcore-tools-latest.yml | 98 +++++--------- .../channels/public-validation-release.yml | 72 ++++------ .../templates/post-build/common-variables.yml | 36 ++++- .../templates/post-build/post-build.yml | 30 +++-- eng/common/templates/steps/promote-build.yml | 13 ++ eng/common/tools.ps1 | 11 +- eng/common/tools.sh | 24 ++-- global.json | 2 +- 32 files changed, 644 insertions(+), 454 deletions(-) rename eng/common/templates/post-build/channels/{public-dev-release.yml => netcore-dev-30.yml} (62%) create mode 100644 eng/common/templates/post-build/channels/netcore-dev-31.yml rename eng/common/templates/post-build/channels/{internal-servicing.yml => netcore-internal-30.yml} (56%) rename eng/common/templates/post-build/channels/{public-release.yml => netcore-release-30.yml} (57%) create mode 100644 eng/common/templates/post-build/channels/netcore-release-31.yml create mode 100644 eng/common/templates/steps/promote-build.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0cdb65d7e..ab7e29fb0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,9 +65,9 @@ - + https://github.com/dotnet/arcade - 7aa107d818fe87e627154c0331d6de5d47f39a45 + 0f5cfb20a355c27bc84cedd049c946b44a7fc1da diff --git a/eng/common/build.ps1 b/eng/common/build.ps1 index feb58d141..e001ccb48 100644 --- a/eng/common/build.ps1 +++ b/eng/common/build.ps1 @@ -85,6 +85,10 @@ function Build { # Re-assign properties to a new variable because PowerShell doesn't let us append properties directly for unclear reasons. # Explicitly set the type as string[] because otherwise PowerShell would make this char[] if $properties is empty. [string[]] $msbuildArgs = $properties + + # Resolve relative project paths into full paths + $projects = ($projects.Split(';').ForEach({Resolve-Path $_}) -join ';') + $msbuildArgs += "/p:Projects=$projects" $properties = $msbuildArgs } diff --git a/eng/common/darc-init.ps1 b/eng/common/darc-init.ps1 index 8854d979f..46d175fdf 100644 --- a/eng/common/darc-init.ps1 +++ b/eng/common/darc-init.ps1 @@ -1,9 +1,9 @@ param ( $darcVersion = $null, - $versionEndpoint = "https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16" + $versionEndpoint = "https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16", + $verbosity = "m" ) -$verbosity = "m" . $PSScriptRoot\tools.ps1 function InstallDarcCli ($darcVersion) { diff --git a/eng/common/darc-init.sh b/eng/common/darc-init.sh index abdd0bc05..242429bca 100755 --- a/eng/common/darc-init.sh +++ b/eng/common/darc-init.sh @@ -3,6 +3,7 @@ source="${BASH_SOURCE[0]}" darcVersion='' versionEndpoint="https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16" +verbosity=m while [[ $# > 0 ]]; do opt="$(echo "$1" | awk '{print tolower($0)}')" @@ -15,6 +16,10 @@ while [[ $# > 0 ]]; do versionEndpoint=$2 shift ;; + --verbosity) + verbosity=$2 + shift + ;; *) echo "Invalid argument: $1" usage @@ -34,7 +39,6 @@ while [[ -h "$source" ]]; do [[ $source != /* ]] && source="$scriptroot/$source" done scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" -verbosity=m . "$scriptroot/tools.sh" diff --git a/eng/common/native/CommonLibrary.psm1 b/eng/common/native/CommonLibrary.psm1 index 2a08d5246..41416862d 100644 --- a/eng/common/native/CommonLibrary.psm1 +++ b/eng/common/native/CommonLibrary.psm1 @@ -152,6 +152,8 @@ function Get-File { } else { Write-Verbose "Downloading $Uri" + # Don't display the console progress UI - it's a huge perf hit + $ProgressPreference = 'SilentlyContinue' while($Attempt -Lt $DownloadRetries) { try { diff --git a/eng/common/performance/perfhelixpublish.proj b/eng/common/performance/perfhelixpublish.proj index 05e5f0989..e5826b532 100644 --- a/eng/common/performance/perfhelixpublish.proj +++ b/eng/common/performance/perfhelixpublish.proj @@ -5,8 +5,14 @@ --dotnet-versions %DOTNET_VERSION% --cli-source-info args --cli-branch %PERFLAB_BRANCH% --cli-commit-sha %PERFLAB_HASH% --cli-repository https://github.com/%PERFLAB_REPO% --cli-source-timestamp %PERFLAB_BUILDTIMESTAMP% py -3 %HELIX_CORRELATION_PAYLOAD%\Core_Root\CoreRun.exe + %HELIX_CORRELATION_PAYLOAD%\Baseline_Core_Root\CoreRun.exe $(HelixPreCommands);call %HELIX_CORRELATION_PAYLOAD%\performance\tools\machine-setup.cmd %HELIX_CORRELATION_PAYLOAD%\artifacts\BenchmarkDotNet.Artifacts + %HELIX_CORRELATION_PAYLOAD%\artifacts\BenchmarkDotNet.Artifacts_Baseline + %HELIX_CORRELATION_PAYLOAD%\performance\src\tools\ResultsComparer\ResultsComparer.csproj + %HELIX_CORRELATION_PAYLOAD%\performance\tools\dotnet\$(Architecture)\dotnet.exe + %25%25 + %HELIX_WORKITEM_ROOT%\testResults.xml @@ -24,14 +30,24 @@ --dotnet-versions $DOTNET_VERSION --cli-source-info args --cli-branch $PERFLAB_BRANCH --cli-commit-sha $PERFLAB_HASH --cli-repository https://github.com/$PERFLAB_REPO --cli-source-timestamp $PERFLAB_BUILDTIMESTAMP python3 $(BaseDirectory)/Core_Root/corerun + $(BaseDirectory)/Baseline_Core_Root/corerun $(HelixPreCommands);chmod +x $(PerformanceDirectory)/tools/machine-setup.sh;. $(PerformanceDirectory)/tools/machine-setup.sh $(BaseDirectory)/artifacts/BenchmarkDotNet.Artifacts + $(BaseDirectory)/artifacts/BenchmarkDotNet.Artifacts_Baseline + $(PerformanceDirectory)/src/tools/ResultsComparer/ResultsComparer.csproj + $(PerformanceDirectory)/tools/dotnet/$(Architecture)/dotnet + %25 + $HELIX_WORKITEM_ROOT/testResults.xml --corerun $(CoreRun) + + --corerun $(BaselineCoreRun) + + $(Python) $(WorkItemCommand) --incremental no --architecture $(Architecture) -f $(_Framework) $(PerfLabArguments) @@ -57,20 +73,29 @@ + + false + + $(WorkItemDirectory) - $(WorkItemCommand) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(CoreRunArgument) --artifacts $(ArtifactsDirectory) --partition-count $(PartitionCount) --partition-index %(HelixWorkItem.Index)" + $(WorkItemCommand) --bdn-artifacts $(BaselineArtifactsDirectory) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(BaselineCoreRunArgument) --partition-count $(PartitionCount) --partition-index %(HelixWorkItem.Index)" + $(WorkItemCommand) --bdn-artifacts $(ArtifactsDirectory) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(CoreRunArgument) --partition-count $(PartitionCount) --partition-index %(HelixWorkItem.Index)" + $(DotnetExe) run -f $(_Framework) -p $(ResultsComparer) --base $(BaselineArtifactsDirectory) --diff $(ArtifactsDirectory) --threshold 2$(Percent) --xml $(XMLResults);$(FinalCommand) 4:00 + $(WorkItemDirectory) - $(WorkItemCommand) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(CoreRunArgument) --artifacts $(ArtifactsDirectory)" + $(WorkItemCommand) --bdn-artifacts $(BaselineArtifactsDirectory) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(BaselineCoreRunArgument)" + $(WorkItemCommand) --bdn-artifacts $(ArtifactsDirectory) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(CoreRunArgument)" + $(DotnetExe) run -f $(_Framework) -p $(ResultsComparer) --base $(BaselineArtifactsDirectory) --diff $(ArtifactsDirectory) --threshold 2$(Percent) --xml $(XMLResults) 4:00 diff --git a/eng/common/performance/performance-setup.ps1 b/eng/common/performance/performance-setup.ps1 index 4a6706b63..ec41965fc 100644 --- a/eng/common/performance/performance-setup.ps1 +++ b/eng/common/performance/performance-setup.ps1 @@ -1,6 +1,7 @@ Param( [string] $SourceDirectory=$env:BUILD_SOURCESDIRECTORY, [string] $CoreRootDirectory, + [string] $BaselineCoreRootDirectory, [string] $Architecture="x64", [string] $Framework="netcoreapp5.0", [string] $CompilationMode="Tiered", @@ -12,11 +13,13 @@ Param( [string] $Csproj="src\benchmarks\micro\MicroBenchmarks.csproj", [string] $Kind="micro", [switch] $Internal, + [switch] $Compare, [string] $Configurations="CompilationMode=$CompilationMode" ) -$RunFromPerformanceRepo = ($Repository -eq "dotnet/performance") +$RunFromPerformanceRepo = ($Repository -eq "dotnet/performance") -or ($Repository -eq "dotnet-performance") $UseCoreRun = ($CoreRootDirectory -ne [string]::Empty) +$UseBaselineCoreRun = ($BaselineCoreRootDirectory -ne [string]::Empty) $PayloadDirectory = (Join-Path $SourceDirectory "Payload") $PerformanceDirectory = (Join-Path $PayloadDirectory "performance") @@ -29,7 +32,13 @@ $HelixSourcePrefix = "pr" $Queue = "Windows.10.Amd64.ClientRS4.DevEx.15.8.Open" if ($Framework.StartsWith("netcoreapp")) { - $Queue = "Windows.10.Amd64.ClientRS4.Open" + $Queue = "Windows.10.Amd64.ClientRS5.Open" +} + +if ($Compare) { + $Queue = "Windows.10.Amd64.19H1.Tiger.Perf.Open" + $PerfLabArguments = "" + $ExtraBenchmarkDotNetArguments = "" } if ($Internal) { @@ -56,6 +65,10 @@ if ($UseCoreRun) { $NewCoreRoot = (Join-Path $PayloadDirectory "Core_Root") Move-Item -Path $CoreRootDirectory -Destination $NewCoreRoot } +if ($UseBaselineCoreRun) { + $NewBaselineCoreRoot = (Join-Path $PayloadDirectory "Baseline_Core_Root") + Move-Item -Path $BaselineCoreRootDirectory -Destination $NewBaselineCoreRoot +} $DocsDir = (Join-Path $PerformanceDirectory "docs") robocopy $DocsDir $WorkItemDirectory @@ -80,7 +93,9 @@ Write-PipelineSetVariable -Name 'TargetCsproj' -Value "$Csproj" -IsMultiJobVaria Write-PipelineSetVariable -Name 'Kind' -Value "$Kind" -IsMultiJobVariable $false Write-PipelineSetVariable -Name 'Architecture' -Value "$Architecture" -IsMultiJobVariable $false Write-PipelineSetVariable -Name 'UseCoreRun' -Value "$UseCoreRun" -IsMultiJobVariable $false +Write-PipelineSetVariable -Name 'UseBaselineCoreRun' -Value "$UseBaselineCoreRun" -IsMultiJobVariable $false Write-PipelineSetVariable -Name 'RunFromPerfRepo' -Value "$RunFromPerformanceRepo" -IsMultiJobVariable $false +Write-PipelineSetVariable -Name 'Compare' -Value "$Compare" -IsMultiJobVariable $false # Helix Arguments Write-PipelineSetVariable -Name 'Creator' -Value "$Creator" -IsMultiJobVariable $false diff --git a/eng/common/performance/performance-setup.sh b/eng/common/performance/performance-setup.sh index 76126b1f8..2f2092166 100755 --- a/eng/common/performance/performance-setup.sh +++ b/eng/common/performance/performance-setup.sh @@ -2,6 +2,7 @@ source_directory=$BUILD_SOURCESDIRECTORY core_root_directory= +baseline_core_root_directory= architecture=x64 framework=netcoreapp5.0 compilation_mode=tiered @@ -10,12 +11,14 @@ branch=$BUILD_SOURCEBRANCH commit_sha=$BUILD_SOURCEVERSION build_number=$BUILD_BUILDNUMBER internal=false +compare=false kind="micro" run_categories="coreclr corefx" csproj="src\benchmarks\micro\MicroBenchmarks.csproj" configurations= run_from_perf_repo=false use_core_run=true +use_baseline_core_run=true while (($# > 0)); do lowerI="$(echo $1 | awk '{print tolower($0)}')" @@ -28,6 +31,10 @@ while (($# > 0)); do core_root_directory=$2 shift 2 ;; + --baselinecorerootdirectory) + baseline_core_root_directory=$2 + shift 2 + ;; --architecture) architecture=$2 shift 2 @@ -72,6 +79,10 @@ while (($# > 0)); do internal=true shift 1 ;; + --compare) + compare=true + shift 1 + ;; --configurations) configurations=$2 shift 2 @@ -102,7 +113,7 @@ while (($# > 0)); do esac done -if [[ "$repository" == "dotnet/performance" ]]; then +if [ "$repository" == "dotnet/performance" ] || [ "$repository" == "dotnet-performance" ]; then run_from_perf_repo=true fi @@ -114,6 +125,10 @@ if [ -z "$core_root_directory" ]; then use_core_run=false fi +if [ -z "$baseline_core_root_directory" ]; then + use_baseline_core_run=false +fi + payload_directory=$source_directory/Payload performance_directory=$payload_directory/performance workitem_directory=$source_directory/workitem @@ -123,6 +138,19 @@ queue=Ubuntu.1804.Amd64.Open creator=$BUILD_DEFINITIONNAME helix_source_prefix="pr" +if [[ "$compare" == true ]]; then + extra_benchmark_dotnet_arguments= + perflab_arguments= + + # No open queues for arm64 + if [[ "$architecture" = "arm64" ]]; then + echo "Compare not available for arm64" + exit 1 + fi + + queue=Ubuntu.1804.Amd64.Tiger.Perf.Open +fi + if [[ "$internal" == true ]]; then perflab_arguments="--upload-to-perflab-container" helix_source_prefix="official" @@ -156,6 +184,11 @@ if [[ "$use_core_run" = true ]]; then mv $core_root_directory $new_core_root fi +if [[ "$use_baseline_core_run" = true ]]; then + new_baseline_core_root=$payload_directory/Baseline_Core_Root + mv $baseline_core_root_directory $new_baseline_core_root +fi + ci=true _script_dir=$(pwd)/eng/common @@ -163,6 +196,7 @@ _script_dir=$(pwd)/eng/common # Make sure all of our variables are available for future steps Write-PipelineSetVariable -name "UseCoreRun" -value "$use_core_run" -is_multi_job_variable false +Write-PipelineSetVariable -name "UseBaselineCoreRun" -value "$use_baseline_core_run" -is_multi_job_variable false Write-PipelineSetVariable -name "Architecture" -value "$architecture" -is_multi_job_variable false Write-PipelineSetVariable -name "PayloadDirectory" -value "$payload_directory" -is_multi_job_variable false Write-PipelineSetVariable -name "PerformanceDirectory" -value "$performance_directory" -is_multi_job_variable false @@ -178,4 +212,5 @@ Write-PipelineSetVariable -name "RunFromPerfRepo" -value "$run_from_perf_repo" - Write-PipelineSetVariable -name "Creator" -value "$creator" -is_multi_job_variable false Write-PipelineSetVariable -name "HelixSourcePrefix" -value "$helix_source_prefix" -is_multi_job_variable false Write-PipelineSetVariable -name "Kind" -value "$kind" -is_multi_job_variable false -Write-PipelineSetVariable -name "_BuildConfig" -value "$architecture.$kind.$framework" -is_multi_job_variable false \ No newline at end of file +Write-PipelineSetVariable -name "_BuildConfig" -value "$architecture.$kind.$framework" -is_multi_job_variable false +Write-PipelineSetVariable -name "Compare" -value "$compare" -is_multi_job_variable false diff --git a/eng/common/post-build/sourcelink-validation.ps1 b/eng/common/post-build/sourcelink-validation.ps1 index 428e8c960..bbfdacca1 100644 --- a/eng/common/post-build/sourcelink-validation.ps1 +++ b/eng/common/post-build/sourcelink-validation.ps1 @@ -215,7 +215,7 @@ function ValidateSourceLinkLinks { } $ValidationFailures = 0 - foreach ($Job in $Jobs) { + foreach ($Job in @(Get-Job)) { $jobResult = Wait-Job -Id $Job.Id | Receive-Job if ($jobResult -ne "0") { $ValidationFailures++ diff --git a/eng/common/post-build/symbols-validation.ps1 b/eng/common/post-build/symbols-validation.ps1 index d5ec51b15..096ac321d 100644 --- a/eng/common/post-build/symbols-validation.ps1 +++ b/eng/common/post-build/symbols-validation.ps1 @@ -37,10 +37,10 @@ function FirstMatchingSymbolDescriptionOrDefault { # DWARF file for a .dylib $DylibDwarf = $SymbolPath.Replace($Extension, ".dylib.dwarf") - $dotnetsymbolExe = "$env:USERPROFILE\.dotnet\tools" - $dotnetsymbolExe = Resolve-Path "$dotnetsymbolExe\dotnet-symbol.exe" + $dotnetSymbolExe = "$env:USERPROFILE\.dotnet\tools" + $dotnetSymbolExe = Resolve-Path "$dotnetSymbolExe\dotnet-symbol.exe" - & $dotnetsymbolExe --symbols --modules --windows-pdbs $TargetServerParam $FullPath -o $SymbolsPath | Out-Null + & $dotnetSymbolExe --symbols --modules --windows-pdbs $TargetServerParam $FullPath -o $SymbolsPath | Out-Null if (Test-Path $PdbPath) { return "PDB" @@ -159,25 +159,25 @@ function CheckSymbolsAvailable { } } -function Installdotnetsymbol { - $dotnetsymbolPackageName = "dotnet-symbol" +function InstallDotnetSymbol { + $dotnetSymbolPackageName = "dotnet-symbol" $dotnetRoot = InitializeDotNetCli -install:$true $dotnet = "$dotnetRoot\dotnet.exe" $toolList = & "$dotnet" tool list --global - if (($toolList -like "*$dotnetsymbolPackageName*") -and ($toolList -like "*$dotnetsymbolVersion*")) { - Write-Host "dotnet-symbol version $dotnetsymbolVersion is already installed." + if (($toolList -like "*$dotnetSymbolPackageName*") -and ($toolList -like "*$dotnetSymbolVersion*")) { + Write-Host "dotnet-symbol version $dotnetSymbolVersion is already installed." } else { - Write-Host "Installing dotnet-symbol version $dotnetsymbolVersion..." + Write-Host "Installing dotnet-symbol version $dotnetSymbolVersion..." Write-Host "You may need to restart your command window if this is the first dotnet tool you have installed." - & "$dotnet" tool install $dotnetsymbolPackageName --version $dotnetsymbolVersion --verbosity "minimal" --global + & "$dotnet" tool install $dotnetSymbolPackageName --version $dotnetSymbolVersion --verbosity "minimal" --global } } try { - Installdotnetsymbol + InstallDotnetSymbol CheckSymbolsAvailable } diff --git a/eng/common/sdl/execute-all-sdl-tools.ps1 b/eng/common/sdl/execute-all-sdl-tools.ps1 index 6d9bdcf72..01799d63f 100644 --- a/eng/common/sdl/execute-all-sdl-tools.ps1 +++ b/eng/common/sdl/execute-all-sdl-tools.ps1 @@ -45,6 +45,7 @@ if ($GuardianPackageName) { $guardianCliLocation = $GuardianCliLocation } +$workingDirectory = (Split-Path $SourceDirectory -Parent) $ValidPath = Test-Path $guardianCliLocation if ($ValidPath -eq $False) @@ -53,13 +54,13 @@ if ($ValidPath -eq $False) exit 1 } -& $(Join-Path $PSScriptRoot "init-sdl.ps1") -GuardianCliLocation $guardianCliLocation -Repository $RepoName -BranchName $BranchName -WorkingDirectory $ArtifactsDirectory -AzureDevOpsAccessToken $AzureDevOpsAccessToken -GuardianLoggerLevel $GuardianLoggerLevel -$gdnFolder = Join-Path $ArtifactsDirectory ".gdn" +& $(Join-Path $PSScriptRoot "init-sdl.ps1") -GuardianCliLocation $guardianCliLocation -Repository $RepoName -BranchName $BranchName -WorkingDirectory $workingDirectory -AzureDevOpsAccessToken $AzureDevOpsAccessToken -GuardianLoggerLevel $GuardianLoggerLevel +$gdnFolder = Join-Path $workingDirectory ".gdn" if ($TsaOnboard) { if ($TsaCodebaseName -and $TsaNotificationEmail -and $TsaCodebaseAdmin -and $TsaBugAreaPath) { - Write-Host "$guardianCliLocation tsa-onboard --codebase-name `"$TsaCodebaseName`" --notification-alias `"$TsaNotificationEmail`" --codebase-admin `"$TsaCodebaseAdmin`" --instance-url `"$TsaInstanceUrl`" --project-name `"$TsaProjectName`" --area-path `"$TsaBugAreaPath`" --iteration-path `"$TsaIterationPath`" --working-directory $ArtifactsDirectory --logger-level $GuardianLoggerLevel" - & $guardianCliLocation tsa-onboard --codebase-name "$TsaCodebaseName" --notification-alias "$TsaNotificationEmail" --codebase-admin "$TsaCodebaseAdmin" --instance-url "$TsaInstanceUrl" --project-name "$TsaProjectName" --area-path "$TsaBugAreaPath" --iteration-path "$TsaIterationPath" --working-directory $ArtifactsDirectory --logger-level $GuardianLoggerLevel + Write-Host "$guardianCliLocation tsa-onboard --codebase-name `"$TsaCodebaseName`" --notification-alias `"$TsaNotificationEmail`" --codebase-admin `"$TsaCodebaseAdmin`" --instance-url `"$TsaInstanceUrl`" --project-name `"$TsaProjectName`" --area-path `"$TsaBugAreaPath`" --iteration-path `"$TsaIterationPath`" --working-directory $workingDirectory --logger-level $GuardianLoggerLevel" + & $guardianCliLocation tsa-onboard --codebase-name "$TsaCodebaseName" --notification-alias "$TsaNotificationEmail" --codebase-admin "$TsaCodebaseAdmin" --instance-url "$TsaInstanceUrl" --project-name "$TsaProjectName" --area-path "$TsaBugAreaPath" --iteration-path "$TsaIterationPath" --working-directory $workingDirectory --logger-level $GuardianLoggerLevel if ($LASTEXITCODE -ne 0) { Write-Host "Guardian tsa-onboard failed with exit code $LASTEXITCODE." exit $LASTEXITCODE @@ -71,10 +72,10 @@ if ($TsaOnboard) { } if ($ArtifactToolsList -and $ArtifactToolsList.Count -gt 0) { - & $(Join-Path $PSScriptRoot "run-sdl.ps1") -GuardianCliLocation $guardianCliLocation -WorkingDirectory $ArtifactsDirectory -TargetDirectory $ArtifactsDirectory -GdnFolder $gdnFolder -ToolsList $ArtifactToolsList -AzureDevOpsAccessToken $AzureDevOpsAccessToken -UpdateBaseline $UpdateBaseline -GuardianLoggerLevel $GuardianLoggerLevel -CrScanAdditionalRunConfigParams $CrScanAdditionalRunConfigParams -PoliCheckAdditionalRunConfigParams $PoliCheckAdditionalRunConfigParams + & $(Join-Path $PSScriptRoot "run-sdl.ps1") -GuardianCliLocation $guardianCliLocation -WorkingDirectory $workingDirectory -TargetDirectory $ArtifactsDirectory -GdnFolder $gdnFolder -ToolsList $ArtifactToolsList -AzureDevOpsAccessToken $AzureDevOpsAccessToken -UpdateBaseline $UpdateBaseline -GuardianLoggerLevel $GuardianLoggerLevel -CrScanAdditionalRunConfigParams $CrScanAdditionalRunConfigParams -PoliCheckAdditionalRunConfigParams $PoliCheckAdditionalRunConfigParams } if ($SourceToolsList -and $SourceToolsList.Count -gt 0) { - & $(Join-Path $PSScriptRoot "run-sdl.ps1") -GuardianCliLocation $guardianCliLocation -WorkingDirectory $ArtifactsDirectory -TargetDirectory $SourceDirectory -GdnFolder $gdnFolder -ToolsList $SourceToolsList -AzureDevOpsAccessToken $AzureDevOpsAccessToken -UpdateBaseline $UpdateBaseline -GuardianLoggerLevel $GuardianLoggerLevel -CrScanAdditionalRunConfigParams $CrScanAdditionalRunConfigParams -PoliCheckAdditionalRunConfigParams $PoliCheckAdditionalRunConfigParams + & $(Join-Path $PSScriptRoot "run-sdl.ps1") -GuardianCliLocation $guardianCliLocation -WorkingDirectory $workingDirectory -TargetDirectory $SourceDirectory -GdnFolder $gdnFolder -ToolsList $SourceToolsList -AzureDevOpsAccessToken $AzureDevOpsAccessToken -UpdateBaseline $UpdateBaseline -GuardianLoggerLevel $GuardianLoggerLevel -CrScanAdditionalRunConfigParams $CrScanAdditionalRunConfigParams -PoliCheckAdditionalRunConfigParams $PoliCheckAdditionalRunConfigParams } if ($UpdateBaseline) { @@ -86,8 +87,8 @@ if ($TsaPublish) { if (-not $TsaRepositoryName) { $TsaRepositoryName = "$($Repository)-$($BranchName)" } - Write-Host "$guardianCliLocation tsa-publish --all-tools --repository-name `"$TsaRepositoryName`" --branch-name `"$TsaBranchName`" --build-number `"$BuildNumber`" --codebase-name `"$TsaCodebaseName`" --notification-alias `"$TsaNotificationEmail`" --codebase-admin `"$TsaCodebaseAdmin`" --instance-url `"$TsaInstanceUrl`" --project-name `"$TsaProjectName`" --area-path `"$TsaBugAreaPath`" --iteration-path `"$TsaIterationPath`" --working-directory $ArtifactsDirectory --logger-level $GuardianLoggerLevel" - & $guardianCliLocation tsa-publish --all-tools --repository-name "$TsaRepositoryName" --branch-name "$TsaBranchName" --build-number "$BuildNumber" --onboard $True --codebase-name "$TsaCodebaseName" --notification-alias "$TsaNotificationEmail" --codebase-admin "$TsaCodebaseAdmin" --instance-url "$TsaInstanceUrl" --project-name "$TsaProjectName" --area-path "$TsaBugAreaPath" --iteration-path "$TsaIterationPath" --working-directory $ArtifactsDirectory --logger-level $GuardianLoggerLevel + Write-Host "$guardianCliLocation tsa-publish --all-tools --repository-name `"$TsaRepositoryName`" --branch-name `"$TsaBranchName`" --build-number `"$BuildNumber`" --codebase-name `"$TsaCodebaseName`" --notification-alias `"$TsaNotificationEmail`" --codebase-admin `"$TsaCodebaseAdmin`" --instance-url `"$TsaInstanceUrl`" --project-name `"$TsaProjectName`" --area-path `"$TsaBugAreaPath`" --iteration-path `"$TsaIterationPath`" --working-directory $workingDirectory --logger-level $GuardianLoggerLevel" + & $guardianCliLocation tsa-publish --all-tools --repository-name "$TsaRepositoryName" --branch-name "$TsaBranchName" --build-number "$BuildNumber" --onboard $True --codebase-name "$TsaCodebaseName" --notification-alias "$TsaNotificationEmail" --codebase-admin "$TsaCodebaseAdmin" --instance-url "$TsaInstanceUrl" --project-name "$TsaProjectName" --area-path "$TsaBugAreaPath" --iteration-path "$TsaIterationPath" --working-directory $workingDirectory --logger-level $GuardianLoggerLevel if ($LASTEXITCODE -ne 0) { Write-Host "Guardian tsa-publish failed with exit code $LASTEXITCODE." exit $LASTEXITCODE diff --git a/eng/common/sdl/init-sdl.ps1 b/eng/common/sdl/init-sdl.ps1 index 26e01c067..c737eb0e7 100644 --- a/eng/common/sdl/init-sdl.ps1 +++ b/eng/common/sdl/init-sdl.ps1 @@ -11,6 +11,9 @@ $ErrorActionPreference = "Stop" Set-StrictMode -Version 2.0 $LASTEXITCODE = 0 +# Don't display the console progress UI - it's a huge perf hit +$ProgressPreference = 'SilentlyContinue' + # Construct basic auth from AzDO access token; construct URI to the repository's gdn folder stored in that repository; construct location of zip file $encodedPat = [Convert]::ToBase64String([System.Text.Encoding]::ASCII.GetBytes(":$AzureDevOpsAccessToken")) $escapedRepository = [Uri]::EscapeDataString("/$Repository/$BranchName/.gdn") diff --git a/eng/common/sdl/packages.config b/eng/common/sdl/packages.config index 3f97ac2f1..256ffbfb9 100644 --- a/eng/common/sdl/packages.config +++ b/eng/common/sdl/packages.config @@ -1,4 +1,4 @@ - + - + diff --git a/eng/common/sdl/run-sdl.ps1 b/eng/common/sdl/run-sdl.ps1 index b90c4399b..9bc25314a 100644 --- a/eng/common/sdl/run-sdl.ps1 +++ b/eng/common/sdl/run-sdl.ps1 @@ -32,16 +32,16 @@ foreach ($tool in $ToolsList) { Write-Host $tool # We have to manually configure tools that run on source to look at the source directory only if ($tool -eq "credscan") { - Write-Host "$GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args `" TargetDirectory : $TargetDirectory `" `" OutputType : pre `" $(If ($CrScanAdditionalRunConfigParams) {$CrScanAdditionalRunConfigParams})" - & $GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args " TargetDirectory : $TargetDirectory " "OutputType : pre" $(If ($CrScanAdditionalRunConfigParams) {$CrScanAdditionalRunConfigParams}) + Write-Host "$GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args `" TargetDirectory < $TargetDirectory `" `" OutputType < pre `" $(If ($CrScanAdditionalRunConfigParams) {$CrScanAdditionalRunConfigParams})" + & $GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args " TargetDirectory < $TargetDirectory " "OutputType < pre" $(If ($CrScanAdditionalRunConfigParams) {$CrScanAdditionalRunConfigParams}) if ($LASTEXITCODE -ne 0) { Write-Host "Guardian configure for $tool failed with exit code $LASTEXITCODE." exit $LASTEXITCODE } } if ($tool -eq "policheck") { - Write-Host "$GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args `" Target : $TargetDirectory `" $(If ($PoliCheckAdditionalRunConfigParams) {$PoliCheckAdditionalRunConfigParams})" - & $GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args " Target : $TargetDirectory " $(If ($PoliCheckAdditionalRunConfigParams) {$PoliCheckAdditionalRunConfigParams}) + Write-Host "$GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args `" Target < $TargetDirectory `" $(If ($PoliCheckAdditionalRunConfigParams) {$PoliCheckAdditionalRunConfigParams})" + & $GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args " Target < $TargetDirectory " $(If ($PoliCheckAdditionalRunConfigParams) {$PoliCheckAdditionalRunConfigParams}) if ($LASTEXITCODE -ne 0) { Write-Host "Guardian configure for $tool failed with exit code $LASTEXITCODE." exit $LASTEXITCODE @@ -56,4 +56,4 @@ Write-Host "$GuardianCliLocation run --working-directory $WorkingDirectory --bas if ($LASTEXITCODE -ne 0) { Write-Host "Guardian run for $ToolsList using $configParam failed with exit code $LASTEXITCODE." exit $LASTEXITCODE -} \ No newline at end of file +} diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index 91621cf88..a7f996419 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -1,7 +1,10 @@ parameters: overrideParameters: '' # Optional: to override values for parameters. additionalParameters: '' # Optional: parameters that need user specific values eg: '-SourceToolsList @("abc","def") -ArtifactToolsList @("ghi","jkl")' - continueOnError: false # optional: determines whether to continue the build if the step errors; + # There is some sort of bug (has been reported) in Azure DevOps where if this parameter is named + # 'continueOnError', the parameter value is not correctly picked up. + # This can also be remedied by the caller (post-build.yml) if it does not use a nested parameter + sdlContinueOnError: false # optional: determines whether to continue the build if the step errors; dependsOn: '' # Optional: dependencies of the job jobs: @@ -26,12 +29,12 @@ jobs: -InputPath $(Build.SourcesDirectory)\artifacts\BlobArtifacts -ExtractPath $(Build.SourcesDirectory)\artifacts\BlobArtifacts displayName: Extract Blob Artifacts - continueOnError: ${{ parameters.continueOnError }} + continueOnError: ${{ parameters.sdlContinueOnError }} - powershell: eng/common/sdl/extract-artifact-packages.ps1 -InputPath $(Build.SourcesDirectory)\artifacts\PackageArtifacts -ExtractPath $(Build.SourcesDirectory)\artifacts\PackageArtifacts displayName: Extract Package Artifacts - continueOnError: ${{ parameters.continueOnError }} + continueOnError: ${{ parameters.sdlContinueOnError }} - task: NuGetToolInstaller@1 displayName: 'Install NuGet.exe' - task: NuGetCommand@2 @@ -45,12 +48,12 @@ jobs: - ${{ if ne(parameters.overrideParameters, '') }}: - powershell: eng/common/sdl/execute-all-sdl-tools.ps1 ${{ parameters.overrideParameters }} displayName: Execute SDL - continueOnError: ${{ parameters.continueOnError }} + continueOnError: ${{ parameters.sdlContinueOnError }} - ${{ if eq(parameters.overrideParameters, '') }}: - powershell: eng/common/sdl/execute-all-sdl-tools.ps1 - -GuardianPackageName Microsoft.Guardian.Cli.0.7.1 + -GuardianPackageName Microsoft.Guardian.Cli.0.7.2 -NugetPackageDirectory $(Build.SourcesDirectory)\.packages -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw) ${{ parameters.additionalParameters }} displayName: Execute SDL - continueOnError: ${{ parameters.continueOnError }} + continueOnError: ${{ parameters.sdlContinueOnError }} diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 8db456bb7..ffda80a19 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -24,7 +24,7 @@ parameters: workspace: '' -# Job base template specific parameters + # Job base template specific parameters # Optional: Enable installing Microbuild plugin # if 'true', these "variables" must be specified in the variables object or as part of the queue matrix # _TeamName - the name of your team @@ -151,6 +151,9 @@ jobs: continueOnError: ${{ parameters.continueOnError }} condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - task: NuGetAuthenticate@0 + - ${{ each step in parameters.steps }}: - ${{ step }} diff --git a/eng/common/templates/job/performance.yml b/eng/common/templates/job/performance.yml index ef809253d..f877fd7a8 100644 --- a/eng/common/templates/job/performance.yml +++ b/eng/common/templates/job/performance.yml @@ -5,6 +5,7 @@ parameters: displayName: '' # optional -- display name for the job. Will use jobName if not passed pool: '' # required -- name of the Build pool container: '' # required -- name of the container + osGroup: '' # required -- operating system for the job extraSetupParameters: '' # optional -- extra arguments to pass to the setup script frameworks: ['netcoreapp3.0'] # optional -- list of frameworks to run against continueOnError: 'false' # optional -- determines whether to continue the build if the step errors @@ -44,12 +45,13 @@ jobs: - HelixPreCommand: '' - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - ${{ if eq(variables['Agent.Os'], 'Windows_NT') }}: + - ${{ if eq( parameters.osGroup, 'Windows_NT') }}: - HelixPreCommand: 'set "PERFLAB_UPLOAD_TOKEN=$(PerfCommandUploadToken)"' - IsInternal: -Internal - - ${{ if ne(variables['Agent.Os'], 'Windows_NT') }}: + - ${{ if ne(parameters.osGroup, 'Windows_NT') }}: - HelixPreCommand: 'export PERFLAB_UPLOAD_TOKEN="$(PerfCommandUploadTokenLinux)"' - IsInternal: --internal + - group: DotNet-HelixApi-Access - group: dotnet-benchview diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index 9e77ef1b5..b722975f9 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -47,6 +47,10 @@ jobs: downloadPath: '$(Build.StagingDirectory)/Download' condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} + + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - task: NuGetAuthenticate@0 + - task: PowerShell@2 displayName: Publish Build Assets inputs: @@ -59,6 +63,7 @@ jobs: /p:Configuration=$(_BuildConfig) condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} + - task: powershell@2 displayName: Create ReleaseConfigs Artifact inputs: @@ -67,12 +72,14 @@ jobs: Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(BARBuildId) Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value "$(DefaultChannels)" Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(IsStableBuild) + - task: PublishBuildArtifacts@1 displayName: Publish ReleaseConfigs Artifact inputs: PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs.txt' PublishLocation: Container ArtifactName: ReleaseConfigs + - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: - task: PublishBuildArtifacts@1 displayName: Publish Logs to VSTS diff --git a/eng/common/templates/post-build/channels/public-dev-release.yml b/eng/common/templates/post-build/channels/netcore-dev-30.yml similarity index 62% rename from eng/common/templates/post-build/channels/public-dev-release.yml rename to eng/common/templates/post-build/channels/netcore-dev-30.yml index afa954214..3c5eb8398 100644 --- a/eng/common/templates/post-build/channels/public-dev-release.yml +++ b/eng/common/templates/post-build/channels/netcore-dev-30.yml @@ -1,15 +1,14 @@ parameters: - enableSymbolValidation: true symbolPublishingAdditionalParameters: '' artifactsPublishingAdditionalParameters: '' publishInstallersAndChecksums: false stages: -- stage: Publish +- stage: NetCore_Dev30_Publish dependsOn: validate variables: - template: ../common-variables.yml - displayName: Developer Channel + displayName: .NET Core 3.0 Dev Publishing jobs: - template: ../setup-maestro-vars.yml @@ -39,15 +38,15 @@ stages: inputs: filePath: eng\common\sdk-task.ps1 arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet - /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) - /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) + /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) + /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' /p:Configuration=Release ${{ parameters.symbolPublishingAdditionalParameters }} - - job: + - job: publish_assets displayName: Publish Assets dependsOn: setupMaestroVars variables: @@ -79,22 +78,33 @@ stages: buildType: current artifactName: AssetManifests + - task: NuGetToolInstaller@1 + displayName: 'Install NuGet.exe' + + # This is necessary whenever we want to publish/restore to an AzDO private feed + - task: NuGetAuthenticate@0 + displayName: 'Authenticate to AzDO Feeds' + - task: PowerShell@2 - displayName: Add Assets Location + displayName: Publish Assets env: - AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-unviersal-packages-rw) + AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw) inputs: filePath: eng\common\sdk-task.ps1 arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ChannelId=$(PublicDevRelease_30_Channel_Id) /p:ArtifactsCategory=$(_DotNetArtifactsCategory) /p:IsStableBuild=$(IsStableBuild) /p:IsInternalBuild=$(IsInternalBuild) /p:RepositoryName=$(Build.Repository.Name) /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(Agent.BuildDirectory)\Nuget\NuGet.exe - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-unviersal-packages-rw)' - /p:TargetFeedPAT='$(dn-bot-dnceng-unviersal-packages-rw)' + /p:StaticInternalFeed=$(StaticInternalFeed) + /p:InternalChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl) + /p:InternalChecksumsTargetStaticFeedKey=$(InternalChecksumsBlobFeedKey) + /p:InternalInstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl) + /p:InternalInstallersTargetStaticFeedKey=$(InternalInstallersBlobFeedKey) + /p:NugetPath=$(NuGetExeToolPath) + /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' + /p:TargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' /p:BARBuildId=$(BARBuildId) /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' @@ -109,57 +119,7 @@ stages: /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) ${{ parameters.artifactsPublishingAdditionalParameters }} - - - task: NuGetCommand@2 - displayName: Publish Packages to AzDO Feed - condition: contains(variables['TargetAzDOFeed'], 'pkgs.visualstudio.com') - inputs: - command: push - vstsFeed: $(AzDoFeedName) - packagesToPush: $(Build.ArtifactStagingDirectory)\PackageArtifacts\*.nupkg - publishVstsFeed: $(AzDoFeedName) - - task: PowerShell@2 - displayName: Publish Blobs to AzDO Feed - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-blobs-to-azdo.ps1 - arguments: -FeedName $(AzDoFeedName) - -SourceFolderCollection $(Build.ArtifactStagingDirectory)/BlobArtifacts/ - -PersonalAccessToken $(dn-bot-dnceng-unviersal-packages-rw) - enabled: false - - -- stage: PublishValidation - displayName: Publish Validation - variables: - - template: ../common-variables.yml - jobs: - - template: ../setup-maestro-vars.yml - - - ${{ if eq(parameters.enableSymbolValidation, 'true') }}: - - job: - displayName: Symbol Availability - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicDevRelease_30_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: PowerShell@2 - displayName: Check Symbol Availability - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/symbols-validation.ps1 - arguments: -InputPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ -ExtractPath $(Agent.BuildDirectory)/Temp/ -DotnetSymbolVersion $(SymbolToolVersion) - - - template: ../darc-gather-drop.yml - parameters: - ChannelId: ${{ variables.PublicDevRelease_30_Channel_Id }} - - - template: ../promote-build.yml - parameters: - ChannelId: ${{ variables.PublicDevRelease_30_Channel_Id }} + - template: ../../steps/promote-build.yml + parameters: + ChannelId: ${{ variables.PublicDevRelease_30_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-dev-31.yml b/eng/common/templates/post-build/channels/netcore-dev-31.yml new file mode 100644 index 000000000..965309d15 --- /dev/null +++ b/eng/common/templates/post-build/channels/netcore-dev-31.yml @@ -0,0 +1,125 @@ +parameters: + symbolPublishingAdditionalParameters: '' + artifactsPublishingAdditionalParameters: '' + publishInstallersAndChecksums: false + +stages: +- stage: NetCore_Dev31_Publish + dependsOn: validate + variables: + - template: ../common-variables.yml + displayName: .NET Core 3.1 Dev Publishing + jobs: + - template: ../setup-maestro-vars.yml + + - job: + displayName: Symbol Publishing + dependsOn: setupMaestroVars + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicDevRelease_31_Channel_Id)) + variables: + - group: DotNet-Symbol-Server-Pats + pool: + vmImage: 'windows-2019' + steps: + - task: DownloadBuildArtifacts@0 + displayName: Download Blob Artifacts + inputs: + artifactName: 'BlobArtifacts' + continueOnError: true + + - task: DownloadBuildArtifacts@0 + displayName: Download PDB Artifacts + inputs: + artifactName: 'PDBArtifacts' + continueOnError: true + + - task: PowerShell@2 + displayName: Publish + inputs: + filePath: eng\common\sdk-task.ps1 + arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet + /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) + /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) + /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' + /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' + /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' + /p:Configuration=Release + ${{ parameters.symbolPublishingAdditionalParameters }} + + - job: + displayName: Publish Assets + dependsOn: setupMaestroVars + variables: + - group: DotNet-Blob-Feed + - group: AzureDevOps-Artifact-Feeds-Pats + - name: BARBuildId + value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] + - name: IsStableBuild + value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicDevRelease_31_Channel_Id)) + pool: + vmImage: 'windows-2019' + steps: + - task: DownloadBuildArtifacts@0 + displayName: Download Package Artifacts + inputs: + buildType: current + artifactName: PackageArtifacts + + - task: DownloadBuildArtifacts@0 + displayName: Download Blob Artifacts + inputs: + buildType: current + artifactName: BlobArtifacts + + - task: DownloadBuildArtifacts@0 + displayName: Download Asset Manifests + inputs: + buildType: current + artifactName: AssetManifests + + - task: NuGetToolInstaller@1 + displayName: 'Install NuGet.exe' + + # This is necessary whenever we want to publish/restore to an AzDO private feed + - task: NuGetAuthenticate@0 + displayName: 'Authenticate to AzDO Feeds' + + - task: PowerShell@2 + displayName: Publish Assets + env: + AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw) + inputs: + filePath: eng\common\sdk-task.ps1 + arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet + /p:ArtifactsCategory=$(_DotNetArtifactsCategory) + /p:IsStableBuild=$(IsStableBuild) + /p:IsInternalBuild=$(IsInternalBuild) + /p:RepositoryName=$(Build.Repository.Name) + /p:CommitSha=$(Build.SourceVersion) + /p:StaticInternalFeed=$(StaticInternalFeed) + /p:InternalChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl) + /p:InternalChecksumsTargetStaticFeedKey=$(InternalChecksumsBlobFeedKey) + /p:InternalInstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl) + /p:InternalInstallersTargetStaticFeedKey=$(InternalInstallersBlobFeedKey) + /p:NugetPath=$(NuGetExeToolPath) + /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' + /p:TargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' + /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' + /p:BARBuildId=$(BARBuildId) + /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' + /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' + /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' + /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' + /p:Configuration=Release + /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} + /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) + /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) + /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) + /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) + ${{ parameters.artifactsPublishingAdditionalParameters }} + + - template: ../../steps/promote-build.yml + parameters: + ChannelId: ${{ variables.PublicDevRelease_31_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-dev-5.yml b/eng/common/templates/post-build/channels/netcore-dev-5.yml index 812def315..9975dda4e 100644 --- a/eng/common/templates/post-build/channels/netcore-dev-5.yml +++ b/eng/common/templates/post-build/channels/netcore-dev-5.yml @@ -1,15 +1,15 @@ parameters: - enableSymbolValidation: true symbolPublishingAdditionalParameters: '' artifactsPublishingAdditionalParameters: '' publishInstallersAndChecksums: false + publishToAzureDevOpsFeeds: true stages: - stage: NetCore_Dev5_Publish dependsOn: validate variables: - template: ../common-variables.yml - displayName: .NET Core 5 Dev Channel + displayName: .NET Core 5 Dev Publishing jobs: - template: ../setup-maestro-vars.yml @@ -39,15 +39,15 @@ stages: inputs: filePath: eng\common\sdk-task.ps1 arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet - /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) - /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) + /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) + /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' /p:Configuration=Release ${{ parameters.symbolPublishingAdditionalParameters }} - - job: + - job: publish_assets displayName: Publish Assets dependsOn: setupMaestroVars variables: @@ -79,22 +79,33 @@ stages: buildType: current artifactName: AssetManifests + - task: NuGetToolInstaller@1 + displayName: 'Install NuGet.exe' + + # This is necessary whenever we want to publish/restore to an AzDO private feed + - task: NuGetAuthenticate@0 + displayName: 'Authenticate to AzDO Feeds' + - task: PowerShell@2 - displayName: Add Assets Location + displayName: Publish Assets env: - AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-unviersal-packages-rw) + AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw) inputs: filePath: eng\common\sdk-task.ps1 arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ChannelId=$(NetCore_5_Dev_Channel_Id) /p:ArtifactsCategory=$(_DotNetArtifactsCategory) /p:IsStableBuild=$(IsStableBuild) /p:IsInternalBuild=$(IsInternalBuild) /p:RepositoryName=$(Build.Repository.Name) /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(Agent.BuildDirectory)\Nuget\NuGet.exe - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-unviersal-packages-rw)' - /p:TargetFeedPAT='$(dn-bot-dnceng-unviersal-packages-rw)' + /p:StaticInternalFeed=$(StaticInternalFeed) + /p:InternalChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl) + /p:InternalChecksumsTargetStaticFeedKey=$(InternalChecksumsBlobFeedKey) + /p:InternalInstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl) + /p:InternalInstallersTargetStaticFeedKey=$(InternalInstallersBlobFeedKey) + /p:NugetPath=$(NuGetExeToolPath) + /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' + /p:TargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' /p:BARBuildId=$(BARBuildId) /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' @@ -103,63 +114,18 @@ stages: /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' /p:Configuration=Release + /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) + /p:PublishToAzureDevOpsNuGetFeeds=${{ parameters.publishToAzureDevOpsFeeds }} + /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json' + /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json' + /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' ${{ parameters.artifactsPublishingAdditionalParameters }} - - - task: NuGetCommand@2 - displayName: Publish Packages to AzDO Feed - condition: contains(variables['TargetAzDOFeed'], 'pkgs.visualstudio.com') - inputs: - command: push - vstsFeed: $(AzDoFeedName) - packagesToPush: $(Build.ArtifactStagingDirectory)\PackageArtifacts\*.nupkg - publishVstsFeed: $(AzDoFeedName) - - task: PowerShell@2 - displayName: Publish Blobs to AzDO Feed - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-blobs-to-azdo.ps1 - arguments: -FeedName $(AzDoFeedName) - -SourceFolderCollection $(Build.ArtifactStagingDirectory)/BlobArtifacts/ - -PersonalAccessToken $(dn-bot-dnceng-unviersal-packages-rw) - enabled: false - - -- stage: NetCore_Dev5_PublishValidation - displayName: Publish Validation - variables: - - template: ../common-variables.yml - jobs: - - template: ../setup-maestro-vars.yml - - - ${{ if eq(parameters.enableSymbolValidation, 'true') }}: - - job: - displayName: Symbol Availability - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_5_Dev_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: PowerShell@2 - displayName: Check Symbol Availability - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/symbols-validation.ps1 - arguments: -InputPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ -ExtractPath $(Agent.BuildDirectory)/Temp/ -DotnetSymbolVersion $(SymbolToolVersion) - - - template: ../darc-gather-drop.yml - parameters: - ChannelId: ${{ variables.NetCore_5_Dev_Channel_Id }} - - - template: ../promote-build.yml - parameters: - ChannelId: ${{ variables.NetCore_5_Dev_Channel_Id }} + - template: ../../steps/promote-build.yml + parameters: + ChannelId: ${{ variables.NetCore_5_Dev_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/internal-servicing.yml b/eng/common/templates/post-build/channels/netcore-internal-30.yml similarity index 56% rename from eng/common/templates/post-build/channels/internal-servicing.yml rename to eng/common/templates/post-build/channels/netcore-internal-30.yml index 4ca36358d..20eef377b 100644 --- a/eng/common/templates/post-build/channels/internal-servicing.yml +++ b/eng/common/templates/post-build/channels/netcore-internal-30.yml @@ -1,14 +1,13 @@ parameters: - enableSymbolValidation: true symbolPublishingAdditionalParameters: '' artifactsPublishingAdditionalParameters: '' stages: -- stage: IS_Publish +- stage: NetCore_30_Internal_Servicing_Publishing dependsOn: validate variables: - template: ../common-variables.yml - displayName: Internal Servicing + displayName: .NET Core 3.0 Internal Servicing Publishing jobs: - template: ../setup-maestro-vars.yml @@ -38,8 +37,8 @@ stages: inputs: filePath: eng\common\sdk-task.ps1 arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet - /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) - /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) + /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) + /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' @@ -78,81 +77,42 @@ stages: buildType: current artifactName: AssetManifests + - task: NuGetToolInstaller@1 + displayName: 'Install NuGet.exe' + + # This is necessary whenever we want to publish/restore to an AzDO private feed + - task: NuGetAuthenticate@0 + displayName: 'Authenticate to AzDO Feeds' + - task: PowerShell@2 - displayName: Add Assets Location + displayName: Publish Assets env: - AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-unviersal-packages-rw) + AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw) inputs: filePath: eng\common\sdk-task.ps1 arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ChannelId=$(InternalServicing_30_Channel_Id) /p:IsStableBuild=$(IsStableBuild) /p:IsInternalBuild=$(IsInternalBuild) /p:RepositoryName=$(Build.Repository.Name) /p:CommitSha=$(Build.SourceVersion) - /p:AzureStorageAccountName=$(ProxyBackedFeedsAccountName) - /p:AzureStorageAccountKey=$(dotnetfeed-storage-access-key-1) - /p:AzureDevOpsFeedsBaseUrl=$(dotnetfeed-internal-private-feed-url) - /p:StaticInternalFeed=$(dotnetfeed-internal-nonstable-feed-url) - /p:NugetPath=$(Agent.BuildDirectory)\Nuget\NuGet.exe + /p:StaticInternalFeed=$(StaticInternalFeed) + /p:InternalChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl) + /p:InternalChecksumsTargetStaticFeedKey=$(InternalChecksumsBlobFeedKey) + /p:InternalInstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl) + /p:InternalInstallersTargetStaticFeedKey=$(InternalInstallersBlobFeedKey) + /p:NugetPath=$(NuGetExeToolPath) + /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' + /p:TargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' + /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' /p:BARBuildId=$(BARBuildId) /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)\BlobArtifacts' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)\PackageArtifacts' + /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' /p:Configuration=Release ${{ parameters.artifactsPublishingAdditionalParameters }} - - - task: NuGetCommand@2 - displayName: Publish Packages to AzDO Feed - condition: contains(variables['TargetAzDOFeed'], 'pkgs.visualstudio.com') - inputs: - command: push - vstsFeed: $(AzDoFeedName) - packagesToPush: $(Build.ArtifactStagingDirectory)\PackageArtifacts\*.nupkg - publishVstsFeed: $(AzDoFeedName) - - task: PowerShell@2 - displayName: Publish Blobs to AzDO Feed - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-blobs-to-azdo.ps1 - arguments: -FeedName $(AzDoFeedName) - -SourceFolderCollection $(Build.ArtifactStagingDirectory)/BlobArtifacts/ - -PersonalAccessToken $(dn-bot-dnceng-unviersal-packages-rw) - enabled: false - - - template: ../trigger-subscription.yml + - template: ../../steps/promote-build.yml parameters: - ChannelId: ${{ variables.InternalServicing_30_Channel_Id }} - -- stage: IS_PublishValidation - displayName: Publish Validation - variables: - - template: ../common-variables.yml - jobs: - - template: ../setup-maestro-vars.yml - - - ${{ if eq(parameters.enableSymbolValidation, 'true') }}: - - job: - displayName: Symbol Availability - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.InternalServicing_30_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: PowerShell@2 - displayName: Check Symbol Availability - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/symbols-validation.ps1 - arguments: -InputPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ -ExtractPath $(Agent.BuildDirectory)/Temp/ -DotnetSymbolVersion $(SymbolToolVersion) - - - template: ../promote-build.yml - parameters: - ChannelId: ${{ variables.InternalServicing_30_Channel_Id }} + ChannelId: ${{ variables.InternalServicing_30_Channel_Id }} \ No newline at end of file diff --git a/eng/common/templates/post-build/channels/public-release.yml b/eng/common/templates/post-build/channels/netcore-release-30.yml similarity index 57% rename from eng/common/templates/post-build/channels/public-release.yml rename to eng/common/templates/post-build/channels/netcore-release-30.yml index 7ec1f89c0..5a5c28e1b 100644 --- a/eng/common/templates/post-build/channels/public-release.yml +++ b/eng/common/templates/post-build/channels/netcore-release-30.yml @@ -1,14 +1,13 @@ parameters: - enableSymbolValidation: true symbolPublishingAdditionalParameters: '' artifactsPublishingAdditionalParameters: '' stages: -- stage: PubRel_Publish +- stage: NetCore_Release30_Publish dependsOn: validate variables: - template: ../common-variables.yml - displayName: Public Release + displayName: .NET Core 3.0 Release Publishing jobs: - template: ../setup-maestro-vars.yml @@ -38,8 +37,8 @@ stages: inputs: filePath: eng\common\sdk-task.ps1 arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet - /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) - /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) + /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) + /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' @@ -78,82 +77,42 @@ stages: buildType: current artifactName: AssetManifests + - task: NuGetToolInstaller@1 + displayName: 'Install NuGet.exe' + + # This is necessary whenever we want to publish/restore to an AzDO private feed + - task: NuGetAuthenticate@0 + displayName: 'Authenticate to AzDO Feeds' + - task: PowerShell@2 - displayName: Publish + displayName: Publish Assets env: - AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-unviersal-packages-rw) + AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw) inputs: filePath: eng\common\sdk-task.ps1 arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ChannelId=$(PublicRelease_30_Channel_Id) /p:IsStableBuild=$(IsStableBuild) /p:IsInternalBuild=$(IsInternalBuild) /p:RepositoryName=$(Build.Repository.Name) /p:CommitSha=$(Build.SourceVersion) + /p:StaticInternalFeed=$(StaticInternalFeed) + /p:InternalChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl) + /p:InternalChecksumsTargetStaticFeedKey=$(InternalChecksumsBlobFeedKey) + /p:InternalInstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl) + /p:InternalInstallersTargetStaticFeedKey=$(InternalInstallersBlobFeedKey) + /p:NugetPath=$(NuGetExeToolPath) + /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' + /p:TargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:AzureStorageAccountName=$(ProxyBackedFeedsAccountName) - /p:AzureStorageAccountKey=$(dotnetfeed-storage-access-key-1) - /p:AzureDevOpsFeedsBaseUrl=$(dotnetfeed-internal-private-feed-url) - /p:StaticInternalFeed=$(dotnetfeed-internal-nonstable-feed-url) - /p:NugetPath=$(Agent.BuildDirectory)\Nuget\NuGet.exe /p:BARBuildId=$(BARBuildId) /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)\BlobArtifacts' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)\PackageArtifacts' + /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' /p:Configuration=Release ${{ parameters.artifactsPublishingAdditionalParameters }} - - - task: NuGetCommand@2 - displayName: Publish Packages to AzDO Feed - condition: contains(variables['TargetAzDOFeed'], 'pkgs.visualstudio.com') - inputs: - command: push - vstsFeed: $(AzDoFeedName) - packagesToPush: $(Build.ArtifactStagingDirectory)\PackageArtifacts\*.nupkg - publishVstsFeed: $(AzDoFeedName) - - task: PowerShell@2 - displayName: Publish Blobs to AzDO Feed - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-blobs-to-azdo.ps1 - arguments: -FeedName $(AzDoFeedName) - -SourceFolderCollection $(Build.ArtifactStagingDirectory)/BlobArtifacts/ - -PersonalAccessToken $(dn-bot-dnceng-unviersal-packages-rw) - enabled: false - - - template: ../trigger-subscription.yml + - template: ../../steps/promote-build.yml parameters: ChannelId: ${{ variables.PublicRelease_30_Channel_Id }} - -- stage: PubRel_PublishValidation - displayName: Publish Validation - variables: - - template: ../common-variables.yml - jobs: - - template: ../setup-maestro-vars.yml - - - ${{ if eq(parameters.enableSymbolValidation, 'true') }}: - - job: - displayName: Symbol Availability - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicRelease_30_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: PowerShell@2 - displayName: Check Symbol Availability - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/symbols-validation.ps1 - arguments: -InputPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ -ExtractPath $(Agent.BuildDirectory)/Temp/ -DotnetSymbolVersion $(SymbolToolVersion) - - - template: ../promote-build.yml - parameters: - ChannelId: ${{ variables.PublicRelease_30_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-release-31.yml b/eng/common/templates/post-build/channels/netcore-release-31.yml new file mode 100644 index 000000000..294521588 --- /dev/null +++ b/eng/common/templates/post-build/channels/netcore-release-31.yml @@ -0,0 +1,124 @@ +parameters: + symbolPublishingAdditionalParameters: '' + artifactsPublishingAdditionalParameters: '' + +stages: +- stage: NetCore_Release31_Publish + dependsOn: validate + variables: + - template: ../common-variables.yml + displayName: .NET Core 3.1 Release Publishing + jobs: + - template: ../setup-maestro-vars.yml + + - job: + displayName: Symbol Publishing + dependsOn: setupMaestroVars + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicRelease_31_Channel_Id)) + variables: + - group: DotNet-Symbol-Server-Pats + pool: + vmImage: 'windows-2019' + steps: + - task: DownloadBuildArtifacts@0 + displayName: Download Blob Artifacts + inputs: + artifactName: 'BlobArtifacts' + continueOnError: true + + - task: DownloadBuildArtifacts@0 + displayName: Download PDB Artifacts + inputs: + artifactName: 'PDBArtifacts' + continueOnError: true + + - task: PowerShell@2 + displayName: Publish + inputs: + filePath: eng\common\sdk-task.ps1 + arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet + /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) + /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) + /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' + /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' + /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' + /p:Configuration=Release + ${{ parameters.symbolPublishingAdditionalParameters }} + + - job: publish_assets + displayName: Publish Assets + dependsOn: setupMaestroVars + variables: + - group: DotNet-Blob-Feed + - group: AzureDevOps-Artifact-Feeds-Pats + - name: BARBuildId + value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] + - name: IsStableBuild + value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicRelease_31_Channel_Id)) + pool: + vmImage: 'windows-2019' + steps: + - task: DownloadBuildArtifacts@0 + displayName: Download Package Artifacts + inputs: + buildType: current + artifactName: PackageArtifacts + + - task: DownloadBuildArtifacts@0 + displayName: Download Blob Artifacts + inputs: + buildType: current + artifactName: BlobArtifacts + + - task: DownloadBuildArtifacts@0 + displayName: Download Asset Manifests + inputs: + buildType: current + artifactName: AssetManifests + + - task: NuGetToolInstaller@1 + displayName: 'Install NuGet.exe' + + # This is necessary whenever we want to publish/restore to an AzDO private feed + - task: NuGetAuthenticate@0 + displayName: 'Authenticate to AzDO Feeds' + + - task: PowerShell@2 + displayName: Publish Assets + env: + AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw) + inputs: + filePath: eng\common\sdk-task.ps1 + arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet + /p:ArtifactsCategory=$(_DotNetArtifactsCategory) + /p:IsStableBuild=$(IsStableBuild) + /p:IsInternalBuild=$(IsInternalBuild) + /p:RepositoryName=$(Build.Repository.Name) + /p:CommitSha=$(Build.SourceVersion) + /p:StaticInternalFeed=$(StaticInternalFeed) + /p:InternalChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl) + /p:InternalChecksumsTargetStaticFeedKey=$(InternalChecksumsBlobFeedKey) + /p:InternalInstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl) + /p:InternalInstallersTargetStaticFeedKey=$(InternalInstallersBlobFeedKey) + /p:NugetPath=$(NuGetExeToolPath) + /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' + /p:TargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' + /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' + /p:BARBuildId=$(BARBuildId) + /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' + /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' + /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' + /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' + /p:Configuration=Release + /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} + /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) + /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) + /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) + /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) + ${{ parameters.artifactsPublishingAdditionalParameters }} + + - template: ../../steps/promote-build.yml + parameters: + ChannelId: ${{ variables.PublicRelease_31_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-tools-latest.yml b/eng/common/templates/post-build/channels/netcore-tools-latest.yml index c2d207673..09445aee0 100644 --- a/eng/common/templates/post-build/channels/netcore-tools-latest.yml +++ b/eng/common/templates/post-build/channels/netcore-tools-latest.yml @@ -1,15 +1,15 @@ parameters: - enableSymbolValidation: true symbolPublishingAdditionalParameters: '' artifactsPublishingAdditionalParameters: '' publishInstallersAndChecksums: false + publishToAzureDevOpsFeeds: true stages: - stage: NetCore_Tools_Latest_Publish dependsOn: validate variables: - template: ../common-variables.yml - displayName: .NET Tools - Latest + displayName: .NET Tools - Latest Publishing jobs: - template: ../setup-maestro-vars.yml @@ -39,15 +39,15 @@ stages: inputs: filePath: eng\common\sdk-task.ps1 arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet - /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) - /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) + /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) + /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' /p:Configuration=Release ${{ parameters.symbolPublishingAdditionalParameters }} - - job: + - job: publish_assets displayName: Publish Assets dependsOn: setupMaestroVars variables: @@ -79,22 +79,33 @@ stages: buildType: current artifactName: AssetManifests + - task: NuGetToolInstaller@1 + displayName: 'Install NuGet.exe' + + # This is necessary whenever we want to publish/restore to an AzDO private feed + - task: NuGetAuthenticate@0 + displayName: 'Authenticate to AzDO Feeds' + - task: PowerShell@2 - displayName: Add Assets Location + displayName: Publish Assets env: - AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-unviersal-packages-rw) + AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw) inputs: filePath: eng\common\sdk-task.ps1 arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ChannelId=$(NetCore_Tools_Latest_Channel_Id) /p:ArtifactsCategory=$(_DotNetArtifactsCategory) /p:IsStableBuild=$(IsStableBuild) /p:IsInternalBuild=$(IsInternalBuild) /p:RepositoryName=$(Build.Repository.Name) /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(Agent.BuildDirectory)\Nuget\NuGet.exe - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-unviersal-packages-rw)' - /p:TargetFeedPAT='$(dn-bot-dnceng-unviersal-packages-rw)' + /p:StaticInternalFeed=$(StaticInternalFeed) + /p:InternalChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl) + /p:InternalChecksumsTargetStaticFeedKey=$(InternalChecksumsBlobFeedKey) + /p:InternalInstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl) + /p:InternalInstallersTargetStaticFeedKey=$(InternalInstallersBlobFeedKey) + /p:NugetPath=$(NuGetExeToolPath) + /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' + /p:TargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' /p:BARBuildId=$(BARBuildId) /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' @@ -103,63 +114,18 @@ stages: /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' /p:Configuration=Release - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} + /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) + /p:PublishToAzureDevOpsNuGetFeeds=${{ parameters.publishToAzureDevOpsFeeds }} + /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw) ${{ parameters.artifactsPublishingAdditionalParameters }} - - - task: NuGetCommand@2 - displayName: Publish Packages to AzDO Feed - condition: contains(variables['TargetAzDOFeed'], 'pkgs.visualstudio.com') - inputs: - command: push - vstsFeed: $(AzDoFeedName) - packagesToPush: $(Build.ArtifactStagingDirectory)\PackageArtifacts\*.nupkg - publishVstsFeed: $(AzDoFeedName) - - - task: PowerShell@2 - displayName: Publish Blobs to AzDO Feed - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-blobs-to-azdo.ps1 - arguments: -FeedName $(AzDoFeedName) - -SourceFolderCollection $(Build.ArtifactStagingDirectory)/BlobArtifacts/ - -PersonalAccessToken $(dn-bot-dnceng-unviersal-packages-rw) - enabled: false - - -- stage: NetCore_Tools_Latest_PublishValidation - displayName: Publish Validation - variables: - - template: ../common-variables.yml - jobs: - - template: ../setup-maestro-vars.yml - - - ${{ if eq(parameters.enableSymbolValidation, 'true') }}: - - job: - displayName: Symbol Availability - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_Tools_Latest_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: PowerShell@2 - displayName: Check Symbol Availability - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/symbols-validation.ps1 - arguments: -InputPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ -ExtractPath $(Agent.BuildDirectory)/Temp/ -DotnetSymbolVersion $(SymbolToolVersion) - - - template: ../darc-gather-drop.yml - parameters: - ChannelId: ${{ variables.NetCore_Tools_Latest_Channel_Id }} - - - template: ../promote-build.yml - parameters: - ChannelId: ${{ variables.NetCore_Tools_Latest_Channel_Id }} + + - template: ../../steps/promote-build.yml + parameters: + ChannelId: ${{ variables.NetCore_Tools_Latest_Channel_Id }} \ No newline at end of file diff --git a/eng/common/templates/post-build/channels/public-validation-release.yml b/eng/common/templates/post-build/channels/public-validation-release.yml index 12124d621..4feed3297 100644 --- a/eng/common/templates/post-build/channels/public-validation-release.yml +++ b/eng/common/templates/post-build/channels/public-validation-release.yml @@ -1,17 +1,18 @@ parameters: artifactsPublishingAdditionalParameters: '' publishInstallersAndChecksums: false + publishToAzureDevOpsFeeds: true stages: - stage: PVR_Publish dependsOn: validate variables: - template: ../common-variables.yml - displayName: Validation Channel + displayName: .NET Tools - Validation Publishing jobs: - template: ../setup-maestro-vars.yml - - job: + - job: publish_assets displayName: Publish Assets dependsOn: setupMaestroVars variables: @@ -43,67 +44,48 @@ stages: buildType: current artifactName: AssetManifests + - task: NuGetToolInstaller@1 + displayName: 'Install NuGet.exe' + + # This is necessary whenever we want to publish/restore to an AzDO private feed + - task: NuGetAuthenticate@0 + displayName: 'Authenticate to AzDO Feeds' + - task: PowerShell@2 - displayName: Add Assets Location + displayName: Publish Assets env: - AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-unviersal-packages-rw) + AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw) inputs: filePath: eng\common\sdk-task.ps1 arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ChannelId=$(PublicValidationRelease_30_Channel_Id) /p:ArtifactsCategory=$(_DotNetValidationArtifactsCategory) /p:IsStableBuild=$(IsStableBuild) /p:IsInternalBuild=$(IsInternalBuild) /p:RepositoryName=$(Build.Repository.Name) /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(Agent.BuildDirectory)\Nuget\NuGet.exe - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-unviersal-packages-rw)' - /p:TargetFeedPAT='$(dn-bot-dnceng-unviersal-packages-rw)' + /p:NugetPath=$(NuGetExeToolPath) + /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' + /p:TargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' /p:BARBuildId=$(BARBuildId) /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)\BlobArtifacts' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)\PackageArtifacts' + /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' /p:Configuration=Release + /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) + /p:PublishToAzureDevOpsNuGetFeeds=${{ parameters.publishToAzureDevOpsFeeds }} + /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' ${{ parameters.artifactsPublishingAdditionalParameters }} - - - task: NuGetCommand@2 - displayName: Publish Packages to AzDO Feed - condition: contains(variables['TargetAzDOFeed'], 'pkgs.visualstudio.com') - inputs: - command: push - vstsFeed: $(AzDoFeedName) - packagesToPush: $(Build.ArtifactStagingDirectory)\PackageArtifacts\*.nupkg - publishVstsFeed: $(AzDoFeedName) - - - task: PowerShell@2 - displayName: Publish Blobs to AzDO Feed - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-blobs-to-azdo.ps1 - arguments: -FeedName $(AzDoFeedName) - -SourceFolderCollection $(Build.ArtifactStagingDirectory)/BlobArtifacts/ - -PersonalAccessToken $(dn-bot-dnceng-unviersal-packages-rw) - enabled: false - - -- stage: PVR_PublishValidation - displayName: Publish Validation - variables: - - template: ../common-variables.yml - jobs: - - template: ../setup-maestro-vars.yml - - - template: ../darc-gather-drop.yml - parameters: - ChannelId: ${{ variables.PublicValidationRelease_30_Channel_Id }} - - - template: ../promote-build.yml - parameters: - ChannelId: ${{ variables.PublicValidationRelease_30_Channel_Id }} + + - template: ../../steps/promote-build.yml + parameters: + ChannelId: ${{ variables.PublicValidationRelease_30_Channel_Id }} diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index b00d85d8c..c13476449 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -1,11 +1,16 @@ variables: - group: Publish-Build-Assets - group: DotNet-DotNetCli-Storage + - group: DotNet-MSRC-Storage # .NET Core 3 Dev - name: PublicDevRelease_30_Channel_Id value: 3 + # .NET Core 3.1 Dev + - name: PublicDevRelease_31_Channel_Id + value: 128 + # .NET Core 5 Dev - name: NetCore_5_Dev_Channel_Id value: 131 @@ -26,14 +31,14 @@ variables: - name: PublicRelease_30_Channel_Id value: 19 + # .NET Core 3.1 Release + - name: PublicRelease_31_Channel_Id + value: 129 + # Whether the build is internal or not - name: IsInternalBuild value: ${{ and(ne(variables['System.TeamProject'], 'public'), contains(variables['Build.SourceBranch'], 'internal')) }} - # Storage account name for proxy-backed feeds - - name: ProxyBackedFeedsAccountName - value: dotnetfeed - # Default Maestro++ API Endpoint and API Version - name: MaestroApiEndPoint value: "https://maestro-prod.westus2.cloudapp.azure.com" @@ -47,8 +52,27 @@ variables: - name: SymbolToolVersion value: 1.0.1 + # Feed Configurations + # These should include the suffix "/index.json" + + # Configuration for the feed where packages from internal non-stable builds will be published to + - name: StaticInternalFeed + value: 'https://dnceng.pkgs.visualstudio.com/_packaging/dotnet-core-internal/nuget/v3/index.json' + # Default locations for Installers and checksums + # Public Locations - name: ChecksumsBlobFeedUrl - value: https://dotnetcli.blob.core.windows.net/dotnet/index.json - - name: InstallersBlobFeedUrl value: https://dotnetclichecksums.blob.core.windows.net/dotnet/index.json + - name: InstallersBlobFeedUrl + value: https://dotnetcli.blob.core.windows.net/dotnet/index.json + + # Private Locations + - name: InternalChecksumsBlobFeedUrl + value: https://dotnetclichecksumsmsrc.blob.core.windows.net/dotnet/index.json + - name: InternalChecksumsBlobFeedKey + value: $(dotnetclichecksumsmsrc-storage-key) + + - name: InternalInstallersBlobFeedUrl + value: https://dotnetclimsrc.blob.core.windows.net/dotnet/index.json + - name: InternalInstallersBlobFeedKey + value: $(dotnetclimsrc-access-key) diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 3f239fae2..e473cadbc 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -1,11 +1,13 @@ parameters: - enableSourceLinkValidation: true + enableSourceLinkValidation: false enableSigningValidation: true - enableSymbolValidation: true + enableSymbolValidation: false enableNugetValidation: true publishInstallersAndChecksums: false + enableAzDONuGetFeeds: true SDLValidationParameters: enable: false + continueOnError: false params: '' # These parameters let the user customize the call to sdk-task.ps1 for publishing @@ -92,39 +94,51 @@ stages: - template: /eng/common/templates/job/execute-sdl.yml parameters: additionalParameters: ${{ parameters.SDLValidationParameters.params }} + continueOnError: ${{ parameters.SDLValidationParameters.continueOnError }} - template: \eng\common\templates\post-build\channels\netcore-dev-5.yml parameters: - enableSymbolValidation: ${{ parameters.enableSymbolValidation }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + enableAzDONuGetFeeds: ${{ parameters.enableAzDONuGetFeeds }} + +- template: \eng\common\templates\post-build\channels\netcore-dev-30.yml + parameters: symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} -- template: \eng\common\templates\post-build\channels\public-dev-release.yml +- template: \eng\common\templates\post-build\channels\netcore-dev-31.yml parameters: - enableSymbolValidation: ${{ parameters.enableSymbolValidation }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - template: \eng\common\templates\post-build\channels\netcore-tools-latest.yml parameters: - enableSymbolValidation: ${{ parameters.enableSymbolValidation }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + enableAzDONuGetFeeds: ${{ parameters.enableAzDONuGetFeeds }} - template: \eng\common\templates\post-build\channels\public-validation-release.yml parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + enableAzDONuGetFeeds: ${{ parameters.enableAzDONuGetFeeds }} -- template: \eng\common\templates\post-build\channels\public-release.yml +- template: \eng\common\templates\post-build\channels\netcore-release-30.yml parameters: symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} -- template: \eng\common\templates\post-build\channels\internal-servicing.yml +- template: \eng\common\templates\post-build\channels\netcore-release-31.yml + parameters: + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + +- template: \eng\common\templates\post-build\channels\netcore-internal-30.yml parameters: symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} diff --git a/eng/common/templates/steps/promote-build.yml b/eng/common/templates/steps/promote-build.yml new file mode 100644 index 000000000..b90404435 --- /dev/null +++ b/eng/common/templates/steps/promote-build.yml @@ -0,0 +1,13 @@ +parameters: + ChannelId: 0 + +steps: +- task: PowerShell@2 + displayName: Add Build to Channel + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/promote-build.ps1 + arguments: -BuildId $(BARBuildId) + -ChannelId ${{ parameters.ChannelId }} + -MaestroApiAccessToken $(MaestroApiAccessToken) + -MaestroApiEndPoint $(MaestroApiEndPoint) + -MaestroApiVersion $(MaestroApiVersion) diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 5688d488b..bb5638930 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -132,12 +132,7 @@ function InitializeDotNetCli([bool]$install) { if ((-not $globalJsonHasRuntimes) -and ($env:DOTNET_INSTALL_DIR -ne $null) -and (Test-Path(Join-Path $env:DOTNET_INSTALL_DIR "sdk\$dotnetSdkVersion"))) { $dotnetRoot = $env:DOTNET_INSTALL_DIR } else { - $dotnetRoot = Join-Path $RepoRoot ".dotnet" - if ($env:ARCADE_PARTITION -ne $null) - { - $dotnetRoot = Join-Path $RepoRoot ".dotnet-$env:ARCADE_PARTITION" - } if (-not (Test-Path(Join-Path $dotnetRoot "sdk\$dotnetSdkVersion"))) { if ($install) { @@ -168,6 +163,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) { $installScript = Join-Path $dotnetRoot "dotnet-install.ps1" if (!(Test-Path $installScript)) { Create-Directory $dotnetRoot + $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit Invoke-WebRequest "https://dot.net/$dotnetInstallScriptVersion/dotnet-install.ps1" -OutFile $installScript } @@ -287,6 +283,7 @@ function InitializeXCopyMSBuild([string]$packageVersion, [bool]$install) { Create-Directory $packageDir Write-Host "Downloading $packageName $packageVersion" + $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit Invoke-WebRequest "https://dotnet.myget.org/F/roslyn-tools/api/v2/package/$packageName/$packageVersion/" -OutFile $packagePath Unzip $packagePath $packageDir } @@ -573,10 +570,6 @@ function GetMSBuildBinaryLogCommandLineArgument($arguments) { $RepoRoot = Resolve-Path (Join-Path $PSScriptRoot "..\..") $EngRoot = Resolve-Path (Join-Path $PSScriptRoot "..") $ArtifactsDir = Join-Path $RepoRoot "artifacts" -if ($env:ARCADE_PARTITION -ne $null) -{ - $ArtifactsDir = Join-Path $RepoRoot "artifacts-$env:ARCADE_PARTITION" -} $ToolsetDir = Join-Path $ArtifactsDir "toolset" $ToolsDir = Join-Path $RepoRoot ".tools" $LogDir = Join-Path (Join-Path $ArtifactsDir "log") $configuration diff --git a/eng/common/tools.sh b/eng/common/tools.sh index c38532b32..94a1edd7d 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -135,9 +135,7 @@ function InitializeDotNetCli { dotnet_root="$DOTNET_INSTALL_DIR" else dotnet_root="$repo_root/.dotnet" - if [[ -n "${ARCADE_PARTITION:-}" ]]; then - dotnet_root="$repo_root/.dotnet-$ARCADE_PARTITION" - fi + export DOTNET_INSTALL_DIR="$dotnet_root" if [[ ! -d "$DOTNET_INSTALL_DIR/sdk/$dotnet_sdk_version" ]]; then @@ -210,12 +208,19 @@ function GetDotNetInstallScript { # Use curl if available, otherwise use wget if command -v curl > /dev/null; then - curl "$install_script_url" -sSL --retry 10 --create-dirs -o "$install_script" - else - wget -q -O "$install_script" "$install_script_url" + curl "$install_script_url" -sSL --retry 10 --create-dirs -o "$install_script" || { + local exit_code=$? + Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to acquire dotnet install script (exit code '$exit_code')." + ExitWithExitCode $exit_code + } + else + wget -q -O "$install_script" "$install_script_url" || { + local exit_code=$? + Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to acquire dotnet install script (exit code '$exit_code')." + ExitWithExitCode $exit_code + } fi fi - # return value _GetDotNetInstallScript="$install_script" } @@ -366,11 +371,6 @@ _script_dir=`dirname "$_ResolvePath"` eng_root=`cd -P "$_script_dir/.." && pwd` repo_root=`cd -P "$_script_dir/../.." && pwd` artifacts_dir="$repo_root/artifacts" -if [[ -n "${ARCADE_PARTITION:-}" ]]; then - artifacts_dir="$repo_root/artifacts-$ARCADE_PARTITION" - export ArtifactsDir="$artifacts_dir/" -fi - toolset_dir="$artifacts_dir/toolset" tools_dir="$repo_root/.tools" log_dir="$artifacts_dir/log/$configuration" diff --git a/global.json b/global.json index 323946328..8c6b8ec55 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.0.100-preview6-012264" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19421.1" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19460.3" } } From 527312b4af176d7aea9efec855a8bf9462218298 Mon Sep 17 00:00:00 2001 From: Livar Date: Tue, 10 Sep 2019 13:37:30 -0700 Subject: [PATCH 209/420] Fixing channel --- src/CopyToLatest/targets/BranchInfo.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CopyToLatest/targets/BranchInfo.props b/src/CopyToLatest/targets/BranchInfo.props index f11bec24c..d103b00f0 100644 --- a/src/CopyToLatest/targets/BranchInfo.props +++ b/src/CopyToLatest/targets/BranchInfo.props @@ -1,5 +1,5 @@ - release/3.0.100-preview9 + release/3.0.1xx From be82bda306227ce43a20af9ae1fbcc2ce848e8ff Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Tue, 10 Sep 2019 13:41:34 -0700 Subject: [PATCH 210/420] Set DOTNET_CLI_HOME when running local tools --- test/SdkTests/SdkTests.csproj | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/test/SdkTests/SdkTests.csproj b/test/SdkTests/SdkTests.csproj index 24c63b0dd..d68bdf9c6 100644 --- a/test/SdkTests/SdkTests.csproj +++ b/test/SdkTests/SdkTests.csproj @@ -27,6 +27,7 @@ $(ArtifactsBinDir)redist\$(Configuration)\dotnet\ $(ArtifactsBinDir)redist\$(Configuration)\dotnet-with-previous-runtimes\ $([MSBuild]::NormalizePath($(ArtifactsTmpDir), 'dotnetSdkTests')) + $(ArtifactsTmpDir)DOTNET_CLI_HOME\ @@ -203,7 +204,8 @@ + WorkingDirectory="$(TestLocalToolFolder)" + EnvironmentVariables="DOTNET_CLI_HOME=$(DOTNET_CLI_HOME)"/> $(MicrosoftNETSdkPackageVersion) @@ -216,10 +218,12 @@ + WorkingDirectory="$(TestLocalToolFolder)" + EnvironmentVariables="DOTNET_CLI_HOME=$(DOTNET_CLI_HOME)"/> - + $(ArtifactsTestResultsDir)$(TestProjectName).xml @@ -243,7 +247,8 @@ + WorkingDirectory="$(TestLocalToolFolder)" + EnvironmentVariables="DOTNET_CLI_HOME=$(DOTNET_CLI_HOME)"/> From 9931222c67f97d1bade25c6423fda0ce0b7f6685 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Tue, 10 Sep 2019 14:06:57 -0700 Subject: [PATCH 211/420] Update latest patch versions --- src/redist/targets/GenerateBundledVersions.targets | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 48bb975f7..b92727fc0 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -107,11 +107,11 @@ + LatestVersion="2.1.13" /> + LatestVersion="2.2.7" /> + LatestVersion="2.1.13"/> + LatestVersion="2.1.13"/> + LatestVersion="2.2.7"/> + LatestVersion="2.2.7"/> From 9ecef395bafc32bc5fcb934f5ffc49c0d4253359 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Tue, 10 Sep 2019 16:15:33 -0700 Subject: [PATCH 212/420] Skip test which is failing on Linux portable during NuGet restore due to too many open files --- test/SdkTests/SdkTests.csproj | 5 +++++ test/SdkTests/TestsToSkipPortableLinux.xml | 7 +++++++ 2 files changed, 12 insertions(+) create mode 100644 test/SdkTests/TestsToSkipPortableLinux.xml diff --git a/test/SdkTests/SdkTests.csproj b/test/SdkTests/SdkTests.csproj index d68bdf9c6..d33fe2504 100644 --- a/test/SdkTests/SdkTests.csproj +++ b/test/SdkTests/SdkTests.csproj @@ -246,6 +246,11 @@ $(TestArgs) -testConfigFile "$(MSBuildThisFileDirectory)TestsToSkipx86.xml" + + + $(TestArgs) -testConfigFile "$(MSBuildThisFileDirectory)TestsToSkipPortableLinux.xml" + + diff --git a/test/SdkTests/TestsToSkipPortableLinux.xml b/test/SdkTests/TestsToSkipPortableLinux.xml new file mode 100644 index 000000000..d0ea16a8d --- /dev/null +++ b/test/SdkTests/TestsToSkipPortableLinux.xml @@ -0,0 +1,7 @@ + + + + + From 24387d9c6dd9ac7bde03a2ad7086699069b0097e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 04:05:27 +0000 Subject: [PATCH 213/420] [release/3.0.1xx] Update dependencies from dotnet/toolset (#4657) * Update dependencies from https://github.com/dotnet/toolset build 20190907.28 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19457.28 * Update dependencies from https://github.com/dotnet/toolset build 20190907.29 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19457.29 * Update dependencies from https://github.com/dotnet/toolset build 20190907.31 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19457.31 * Update dependencies from https://github.com/dotnet/toolset build 20190908.6 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19458.6 * Update dependencies from https://github.com/dotnet/toolset build 20190908.17 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19458.17 * Update dependencies from https://github.com/dotnet/toolset build 20190908.23 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19458.23 * Update dependencies from https://github.com/dotnet/toolset build 20190908.26 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19458.26 * Update dependencies from https://github.com/dotnet/toolset build 20190908.28 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19458.28 * Update dependencies from https://github.com/dotnet/toolset build 20190909.1 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19459.1 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc2.19459.1 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190909.5 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19459.5 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc2.19459.1 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190909.9 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19459.9 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc2.19459.1 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190909.12 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19459.12 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc2.19459.1 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190909.15 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19459.15 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc2.19459.7 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190909.16 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19459.16 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc2.19459.7 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190909.18 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19459.18 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc2.19459.7 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190909.22 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19459.22 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc2.19459.7 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190909.24 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19459.24 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc2.19459.10 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190909.28 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19459.28 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc2.19459.10 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190910.3 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19460.3 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc2.19459.10 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190910.8 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19460.8 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc2.19459.10 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190910.13 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19460.13 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc2.19459.10 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190910.14 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19460.14 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc2.19459.10 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190910.16 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19460.16 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc2.19460.4 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190910.17 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19460.17 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc2.19460.4 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190910.18 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19460.18 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc2.19460.4 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190910.20 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19460.20 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc2.19460.4 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190910.21 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19460.21 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc2.19460.5 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190910.23 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19460.23 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc2.19460.5 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0cdb65d7e..4728d8424 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 8ede69de899bd1dd5a9dc6ccd3e00967a7ad2100 + f110fefc3240b24707ac5b7863a207f429573e3c https://github.com/dotnet/sdk b88161ed99ded0dd598779ad1afe044818422a6f - + https://github.com/dotnet/cli - dcd6fdad842d9cdd05589a12567d090b925ddd15 + 659a20596d7e7b02a9741102a63ea3a544b5e3e7 diff --git a/eng/Versions.props b/eng/Versions.props index 4e0f70ce0..2d8b1df94 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc2.19457.22 + 3.0.100-rc2.19460.23 @@ -33,7 +33,7 @@ - 3.0.100-rc2.19457.8 + 3.0.100-rc2.19460.5 0.2.0 From f0a7a9c3d7c0b883767bdf8af5a35d945b7e80bc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 04:41:14 +0000 Subject: [PATCH 214/420] Update dependencies from https://github.com/dotnet/toolset build 20190910.25 (#4723) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19460.25 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc2.19460.6 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4728d8424..8c0ef916f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - f110fefc3240b24707ac5b7863a207f429573e3c + 0b5713ad307c772f43863eff5d32507a1fb61344 https://github.com/dotnet/sdk b88161ed99ded0dd598779ad1afe044818422a6f - + https://github.com/dotnet/cli - 659a20596d7e7b02a9741102a63ea3a544b5e3e7 + 5fc8822aba38bd1c43d0b65e2c1fe0f0f28a2fab diff --git a/eng/Versions.props b/eng/Versions.props index 2d8b1df94..e57354ee3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc2.19460.23 + 3.0.100-rc2.19460.25 @@ -33,7 +33,7 @@ - 3.0.100-rc2.19460.5 + 3.0.100-rc2.19460.6 0.2.0 From b6e6e4d0cecc2fd572300ea7bedbe036aec28987 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 08:56:18 +0000 Subject: [PATCH 215/420] Update dependencies from https://github.com/dotnet/toolset build 20190911.2 (#4725) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19461.2 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc2.19461.1 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8c0ef916f..1736b9b66 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 0b5713ad307c772f43863eff5d32507a1fb61344 + 2d813145161005b00cbbaff5cc0792ae73397b04 https://github.com/dotnet/sdk b88161ed99ded0dd598779ad1afe044818422a6f - + https://github.com/dotnet/cli - 5fc8822aba38bd1c43d0b65e2c1fe0f0f28a2fab + 6497af77ab7afe29796afde471eb1ea33277b5e7 diff --git a/eng/Versions.props b/eng/Versions.props index e57354ee3..60c0571d4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc2.19460.25 + 3.0.100-rc2.19461.2 @@ -33,7 +33,7 @@ - 3.0.100-rc2.19460.6 + 3.0.100-rc2.19461.1 0.2.0 From d6e1c6bc5a363d9fdb97b8ade5aeb141924f9c1a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 14:16:09 +0000 Subject: [PATCH 216/420] Update dependencies from https://github.com/dotnet/toolset build 20190911.9 (#4730) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19461.9 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1736b9b66..d117d8c8b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 2d813145161005b00cbbaff5cc0792ae73397b04 + cf1db7da0c25a7f43499a1dfee7fb85fe59567f2 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 60c0571d4..86902cd9b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc2.19461.2 + 3.0.100-rc2.19461.9 From 5d813834d6bb3c77cbf2118556c92a532e76f8ce Mon Sep 17 00:00:00 2001 From: Livar Date: Wed, 11 Sep 2019 13:31:08 -0700 Subject: [PATCH 217/420] Change the toolset base URL back to dotnet-toolset --- src/redist/targets/GenerateLayout.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index 31067c29e..d2a0b6fd1 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -13,7 +13,7 @@ $(RedistLayoutPath)sdk\$(SdkVersion)\ https://dotnetcli.azureedge.net/dotnet/ https://dotnetcli.blob.core.windows.net/dotnet/ - https://dotnetfeed.blob.core.windows.net/dotnet-core/ + https://dotnetfeed.blob.core.windows.net/dotnet-toolset/ $(HostRid) $(HostMonikerRid) From 0891540d938637aac2f1b4e61de96df0025ec1f5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 21:04:12 +0000 Subject: [PATCH 218/420] Update dependencies from https://github.com/aspnet/AspNetCore build 20190911.7 (#4736) - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-rc2.19461.7 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-rc2.19461.7 - Microsoft.AspNetCore.App.Ref - 3.0.0-rc2.19461.7 - dotnet-user-secrets - 3.0.0-rc2.19461.7 - dotnet-dev-certs - 3.0.0-rc2.19461.7 - dotnet-watch - 3.0.0-rc2.19461.7 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 99157b7f0..bc9a572f6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup 604ef7a61aea16bc63a402dfcb2bbe5e6b7c5971 - + https://github.com/aspnet/AspNetCore - 2cae0cd451556483a176845f46887631a35da9c2 + 33120b6093eb5ee9ecf603f56e80a6a7d5a25f07 - + https://github.com/aspnet/AspNetCore - 2cae0cd451556483a176845f46887631a35da9c2 + 33120b6093eb5ee9ecf603f56e80a6a7d5a25f07 - + https://github.com/aspnet/AspNetCore - 2cae0cd451556483a176845f46887631a35da9c2 + 33120b6093eb5ee9ecf603f56e80a6a7d5a25f07 - + https://github.com/aspnet/AspNetCore - 2cae0cd451556483a176845f46887631a35da9c2 + 33120b6093eb5ee9ecf603f56e80a6a7d5a25f07 - + https://github.com/aspnet/AspNetCore - 2cae0cd451556483a176845f46887631a35da9c2 + 33120b6093eb5ee9ecf603f56e80a6a7d5a25f07 - + https://github.com/aspnet/AspNetCore - 2cae0cd451556483a176845f46887631a35da9c2 + 33120b6093eb5ee9ecf603f56e80a6a7d5a25f07 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 2617550db..088486502 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-rc2.19461.1 - 3.0.0-rc2.19461.1 - 3.0.0-rc2.19461.1 - 3.0.0-rc2.19461.1 - 3.0.0-rc2.19461.1 - 3.0.0-rc2.19461.1 + 3.0.0-rc2.19461.7 + 3.0.0-rc2.19461.7 + 3.0.0-rc2.19461.7 + 3.0.0-rc2.19461.7 + 3.0.0-rc2.19461.7 + 3.0.0-rc2.19461.7 From e7931eb941811588c94f73ef1d920e4f4de32814 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 21:50:24 +0000 Subject: [PATCH 219/420] Update dependencies from https://github.com/dotnet/toolset build 20190911.16 (#4739) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19461.16 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc2.19461.11 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7716b21ed..1c326e25a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - cf1db7da0c25a7f43499a1dfee7fb85fe59567f2 + 6b4675d1d389c15df3b9979a0a177ecf81c99a42 https://github.com/dotnet/sdk b88161ed99ded0dd598779ad1afe044818422a6f - + https://github.com/dotnet/cli - 6497af77ab7afe29796afde471eb1ea33277b5e7 + da3737fde462ef071e52f6f589adda651384cea9 diff --git a/eng/Versions.props b/eng/Versions.props index a1f128d61..71635149e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc2.19461.9 + 3.0.100-rc2.19461.16 @@ -33,7 +33,7 @@ - 3.0.100-rc2.19461.1 + 3.0.100-rc2.19461.11 0.2.0 From 59af374f7b0813d068da1a96f16241cef534c0ce Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 21:51:11 +0000 Subject: [PATCH 220/420] [release/3.0.1xx] Update dependencies from dotnet/core-setup (#4590) * Update dependencies from https://github.com/dotnet/core-setup build 20190905.08 - Microsoft.NETCore.App - 3.0.0-rc1-19455-08 - NETStandard.Library.Ref - 2.1.0-rc1-19455-08 - Microsoft.WindowsDesktop.App - 3.0.0-rc1-19455-08 * Update dependencies from https://github.com/dotnet/core-setup build 20190905.13 - Microsoft.NETCore.App - 3.0.0-rc1-19455-13 - NETStandard.Library.Ref - 2.1.0-rc1-19455-13 - Microsoft.WindowsDesktop.App - 3.0.0-rc1-19455-13 * Update dependencies from https://github.com/dotnet/core-setup build 20190905.18 - Microsoft.NETCore.App - 3.0.0-rc1-19455-18 - NETStandard.Library.Ref - 2.1.0-rc1-19455-18 - Microsoft.WindowsDesktop.App - 3.0.0-rc1-19455-18 * Update dependencies from https://github.com/dotnet/core-setup build 20190905.28 - Microsoft.NETCore.App - 3.0.0-rc2-19455-28 - NETStandard.Library.Ref - 2.1.0-rc2-19455-28 - Microsoft.WindowsDesktop.App - 3.0.0-rc2-19455-28 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-rc1.19453.3 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-rc1.19454.2 (parent: Microsoft.WindowsDesktop.App) * Update dependencies from https://github.com/dotnet/core-setup build 20190906.06 - Microsoft.NETCore.App - 3.0.0-rc2-19456-06 - NETStandard.Library.Ref - 2.1.0-rc2-19456-06 - Microsoft.WindowsDesktop.App - 3.0.0-rc2-19456-06 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-rc1.19453.3 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-rc1.19454.2 (parent: Microsoft.WindowsDesktop.App) * Update dependencies from https://github.com/dotnet/core-setup build 20190906.09 - Microsoft.NETCore.App - 3.0.0-rc2-19456-09 - NETStandard.Library.Ref - 2.1.0-rc2-19456-09 - Microsoft.WindowsDesktop.App - 3.0.0-rc2-19456-09 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-rc1.19453.3 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-rc1.19454.2 (parent: Microsoft.WindowsDesktop.App) * Update dependencies from https://github.com/dotnet/core-setup build 20190907.02 - Microsoft.NETCore.App - 3.0.0-rc2-19457-02 - NETStandard.Library.Ref - 2.1.0-rc2-19457-02 - Microsoft.WindowsDesktop.App - 3.0.0-rc2-19457-02 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-rc1.19453.3 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-rc2.19456.4 (parent: Microsoft.WindowsDesktop.App) * Update dependencies from https://github.com/dotnet/core-setup build 20190907.04 - Microsoft.NETCore.App - 3.0.0-rc2-19457-04 - NETStandard.Library.Ref - 2.1.0-rc2-19457-04 - Microsoft.WindowsDesktop.App - 3.0.0-rc2-19457-04 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-rc1.19453.3 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-rc2.19456.4 (parent: Microsoft.WindowsDesktop.App) * Update dependencies from https://github.com/dotnet/core-setup build 20190907.07 - Microsoft.NETCore.App - 3.0.0-rc2-19457-07 - NETStandard.Library.Ref - 2.1.0-rc2-19457-07 - Microsoft.WindowsDesktop.App - 3.0.0-rc2-19457-07 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-rc1.19453.3 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-rc2.19456.4 (parent: Microsoft.WindowsDesktop.App) * Update dependencies from https://github.com/dotnet/core-setup build 20190907.14 - Microsoft.NETCore.App - 3.0.0-rc2-19457-14 - NETStandard.Library.Ref - 2.1.0-rc2-19457-14 - Microsoft.WindowsDesktop.App - 3.0.0-rc2-19457-14 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-rc1.19453.3 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-rc2.19457.1 (parent: Microsoft.WindowsDesktop.App) * Update dependencies from https://github.com/dotnet/core-setup build 20190907.15 - Microsoft.NETCore.App - 3.0.0-rc2-19457-15 - NETStandard.Library.Ref - 2.1.0-rc2-19457-15 - Microsoft.WindowsDesktop.App - 3.0.0-rc2-19457-15 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-rc1.19453.3 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-rc2.19457.1 (parent: Microsoft.WindowsDesktop.App) * Update dependencies from https://github.com/dotnet/core-setup build 20190908.06 - Microsoft.NETCore.App - 3.0.0-rc2-19458-06 - NETStandard.Library.Ref - 2.1.0-rc2-19458-06 - Microsoft.WindowsDesktop.App - 3.0.0-rc2-19458-06 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-rc1.19453.3 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-rc2.19457.1 (parent: Microsoft.WindowsDesktop.App) * Update dependencies from https://github.com/dotnet/core-setup build 20190908.09 - Microsoft.NETCore.App - 3.0.0-rc2-19458-09 - NETStandard.Library.Ref - 2.1.0-rc2-19458-09 - Microsoft.WindowsDesktop.App - 3.0.0-rc2-19458-09 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-rc1.19453.3 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-rc2.19458.1 (parent: Microsoft.WindowsDesktop.App) * Update dependencies from https://github.com/dotnet/core-setup build 20190908.11 - Microsoft.NETCore.App - 3.0.0-rc2-19458-11 - NETStandard.Library.Ref - 2.1.0-rc2-19458-11 - Microsoft.WindowsDesktop.App - 3.0.0-rc2-19458-11 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-rc1.19453.3 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-rc2.19458.1 (parent: Microsoft.WindowsDesktop.App) * Update dependencies from https://github.com/dotnet/core-setup build 20190909.07 - Microsoft.NETCore.App - 3.0.0-rc2-19459-07 - NETStandard.Library.Ref - 2.1.0-rc2-19459-07 - Microsoft.WindowsDesktop.App - 3.0.0-rc2-19459-07 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-rc1.19453.3 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-rc2.19458.1 (parent: Microsoft.WindowsDesktop.App) * Update dependencies from https://github.com/dotnet/core-setup build 20190909.16 - Microsoft.NETCore.App - 3.0.0-rc2-19459-16 - NETStandard.Library.Ref - 2.1.0-rc2-19459-16 - Microsoft.WindowsDesktop.App - 3.0.0-rc2-19459-16 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-rc1.19453.3 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-rc2.19459.2 (parent: Microsoft.WindowsDesktop.App) * Update dependencies from https://github.com/dotnet/core-setup build 20190909.21 - Microsoft.NETCore.App - 3.0.0-rc2-19459-21 - NETStandard.Library.Ref - 2.1.0-rc2-19459-21 - Microsoft.WindowsDesktop.App - 3.0.0-rc2-19459-21 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-rc1.19453.3 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-rc2.19459.2 (parent: Microsoft.WindowsDesktop.App) * Update dependencies from https://github.com/dotnet/core-setup build 20190909.28 - Microsoft.NETCore.App - 3.0.0-rc2-19459-28 - NETStandard.Library.Ref - 2.1.0-rc2-19459-28 - Microsoft.WindowsDesktop.App - 3.0.0-rc2-19459-28 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-rc1.19453.3 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-rc2.19459.2 (parent: Microsoft.WindowsDesktop.App) * Update dependencies from https://github.com/dotnet/core-setup build 20190909.33 - Microsoft.NETCore.App - 3.0.0-rc2-19459-33 - NETStandard.Library.Ref - 2.1.0-rc2-19459-33 - Microsoft.WindowsDesktop.App - 3.0.0-rc2-19459-33 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-rc1.19453.3 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-rc2.19459.2 (parent: Microsoft.WindowsDesktop.App) * Update dependencies from https://github.com/dotnet/core-setup build 20190909.40 - Microsoft.NETCore.App - 3.0.0-rc2-19459-40 - NETStandard.Library.Ref - 2.1.0-rc2-19459-40 - Microsoft.WindowsDesktop.App - 3.0.0-rc2-19459-40 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-rc1.19453.3 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-rc2.19459.11 (parent: Microsoft.WindowsDesktop.App) * Update dependencies from https://github.com/dotnet/core-setup build 20190910.02 - Microsoft.NETCore.App - 3.0.0-rc2-19460-02 - NETStandard.Library.Ref - 2.1.0-rc2-19460-02 - Microsoft.WindowsDesktop.App - 3.0.0-rc2-19460-02 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-rc1.19453.3 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-rc2.19459.11 (parent: Microsoft.WindowsDesktop.App) --- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1c326e25a..ba820dc01 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 8f5d7b1ba4f744199ba006cac38dfcb9a2408880 + 4421cfb105df112492038e5c5a70c24bce48e72f - + https://github.com/dotnet/core-setup - 8f5d7b1ba4f744199ba006cac38dfcb9a2408880 + 4421cfb105df112492038e5c5a70c24bce48e72f - + https://github.com/dotnet/core-setup - 8f5d7b1ba4f744199ba006cac38dfcb9a2408880 + 4421cfb105df112492038e5c5a70c24bce48e72f https://github.com/aspnet/AspNetCore @@ -57,11 +57,11 @@ https://github.com/dotnet/winforms - 9104c48ca015b5a4c8e029c330af6d68bc11b0b8 + dc6297c0fb269c3a78ce36333012753c6555aeb9 - + https://github.com/dotnet/wpf - 1c3dd24d7188899a5f12d1caa31630f66bd4c2fd + 14e10bf45f490943b79e3fbca0141d9ecc4f85ed diff --git a/eng/Versions.props b/eng/Versions.props index 71635149e..9d5e7e56f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ - 3.0.0-rc1.19455.14 + 3.0.0-rc2.19459.11 @@ -44,7 +44,7 @@ $(MicrosoftNETSdkPackageVersion) - 3.0.0-rc1-19456-20 + 3.0.0-rc2-19460-02 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -52,11 +52,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-rc1-19456-20 + 2.1.0-rc2-19460-02 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-rc1-19456-20 + 3.0.0-rc2-19460-02 $(MicrosoftWindowsDesktopAppPackageVersion) From 156186121d6e8ba3873e4964819bca8697f5e95b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 22:06:17 +0000 Subject: [PATCH 221/420] [release/3.0.1xx] Update dependencies from aspnet/AspNetCore (#4627) * Update dependencies from https://github.com/aspnet/AspNetCore build 20190906.7 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-rc2.19456.7 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-rc2.19456.7 - Microsoft.AspNetCore.App.Ref - 3.0.0-rc2.19456.7 - dotnet-watch - 3.0.0-rc2.19456.7 - dotnet-user-secrets - 3.0.0-rc2.19456.7 - dotnet-dev-certs - 3.0.0-rc2.19456.7 * Update dependencies from https://github.com/aspnet/AspNetCore build 20190906.8 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-rc2.19456.8 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-rc2.19456.8 - Microsoft.AspNetCore.App.Ref - 3.0.0-rc2.19456.8 - dotnet-watch - 3.0.0-rc2.19456.8 - dotnet-user-secrets - 3.0.0-rc2.19456.8 - dotnet-dev-certs - 3.0.0-rc2.19456.8 * Update dependencies from https://github.com/aspnet/AspNetCore build 20190906.11 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-rc2.19456.11 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-rc2.19456.11 - Microsoft.AspNetCore.App.Ref - 3.0.0-rc2.19456.11 - dotnet-watch - 3.0.0-rc2.19456.11 - dotnet-user-secrets - 3.0.0-rc2.19456.11 - dotnet-dev-certs - 3.0.0-rc2.19456.11 * Update dependencies from https://github.com/aspnet/AspNetCore build 20190906.14 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-rc2.19456.14 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-rc2.19456.14 - Microsoft.AspNetCore.App.Ref - 3.0.0-rc2.19456.14 - dotnet-watch - 3.0.0-rc2.19456.14 - dotnet-user-secrets - 3.0.0-rc2.19456.14 - dotnet-dev-certs - 3.0.0-rc2.19456.14 * Update dependencies from https://github.com/aspnet/AspNetCore build 20190908.7 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-rc2.19458.7 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-rc2.19458.7 - Microsoft.AspNetCore.App.Ref - 3.0.0-rc2.19458.7 - dotnet-watch - 3.0.0-rc2.19458.7 - dotnet-user-secrets - 3.0.0-rc2.19458.7 - dotnet-dev-certs - 3.0.0-rc2.19458.7 * Update dependencies from https://github.com/aspnet/AspNetCore build 20190909.2 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-rc2.19459.2 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-rc2.19459.2 - Microsoft.AspNetCore.App.Ref - 3.0.0-rc2.19459.2 - dotnet-watch - 3.0.0-rc2.19459.2 - dotnet-user-secrets - 3.0.0-rc2.19459.2 - dotnet-dev-certs - 3.0.0-rc2.19459.2 * Update dependencies from https://github.com/aspnet/AspNetCore build 20190909.3 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-rc2.19459.3 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-rc2.19459.3 - Microsoft.AspNetCore.App.Ref - 3.0.0-rc2.19459.3 - dotnet-watch - 3.0.0-rc2.19459.3 - dotnet-user-secrets - 3.0.0-rc2.19459.3 - dotnet-dev-certs - 3.0.0-rc2.19459.3 * Update dependencies from https://github.com/aspnet/AspNetCore build 20190909.5 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-rc2.19459.5 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-rc2.19459.5 - Microsoft.AspNetCore.App.Ref - 3.0.0-rc2.19459.5 - dotnet-watch - 3.0.0-rc2.19459.5 - dotnet-user-secrets - 3.0.0-rc2.19459.5 - dotnet-dev-certs - 3.0.0-rc2.19459.5 * Update dependencies from https://github.com/aspnet/AspNetCore build 20190910.4 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-rc2.19460.4 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-rc2.19460.4 - Microsoft.AspNetCore.App.Ref - 3.0.0-rc2.19460.4 - dotnet-watch - 3.0.0-rc2.19460.4 - dotnet-user-secrets - 3.0.0-rc2.19460.4 - dotnet-dev-certs - 3.0.0-rc2.19460.4 * Update dependencies from https://github.com/aspnet/AspNetCore build 20190910.6 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-rc2.19460.6 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-rc2.19460.6 - Microsoft.AspNetCore.App.Ref - 3.0.0-rc2.19460.6 - dotnet-watch - 3.0.0-rc2.19460.6 - dotnet-user-secrets - 3.0.0-rc2.19460.6 - dotnet-dev-certs - 3.0.0-rc2.19460.6 * Update dependencies from https://github.com/aspnet/AspNetCore build 20190910.8 - dotnet-user-secrets - 3.0.0-rc2.19460.8 - dotnet-watch - 3.0.0-rc2.19460.8 - Microsoft.AspNetCore.App.Ref - 3.0.0-rc2.19460.8 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-rc2.19460.8 - dotnet-dev-certs - 3.0.0-rc2.19460.8 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-rc2.19460.8 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ba820dc01..b7a53d758 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup 4421cfb105df112492038e5c5a70c24bce48e72f - + https://github.com/aspnet/AspNetCore - 91a6fcc93d96530f3d9ad15c2942ff167d2e8e46 + 04705ee4f1ae72c839c63af2e281ad9526602b5e - + https://github.com/aspnet/AspNetCore - 91a6fcc93d96530f3d9ad15c2942ff167d2e8e46 + 04705ee4f1ae72c839c63af2e281ad9526602b5e - + https://github.com/aspnet/AspNetCore - 91a6fcc93d96530f3d9ad15c2942ff167d2e8e46 + 04705ee4f1ae72c839c63af2e281ad9526602b5e - + https://github.com/aspnet/AspNetCore - 91a6fcc93d96530f3d9ad15c2942ff167d2e8e46 + 04705ee4f1ae72c839c63af2e281ad9526602b5e - + https://github.com/aspnet/AspNetCore - 91a6fcc93d96530f3d9ad15c2942ff167d2e8e46 + 04705ee4f1ae72c839c63af2e281ad9526602b5e - + https://github.com/aspnet/AspNetCore - 91a6fcc93d96530f3d9ad15c2942ff167d2e8e46 + 04705ee4f1ae72c839c63af2e281ad9526602b5e https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 9d5e7e56f..329181de7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-rc2.19456.2 - 3.0.0-rc2.19456.2 - 3.0.0-rc2.19456.2 - 3.0.0-rc2.19456.2 - 3.0.0-rc2.19456.2 - 3.0.0-rc2.19456.2 + 3.0.0-rc2.19460.8 + 3.0.0-rc2.19460.8 + 3.0.0-rc2.19460.8 + 3.0.0-rc2.19460.8 + 3.0.0-rc2.19460.8 + 3.0.0-rc2.19460.8 From 5689e044b417ba2ff047cc2d5d429b3ccbfbfbfb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 22:20:37 +0000 Subject: [PATCH 222/420] Update dependencies from https://github.com/dotnet/toolset build 20190911.18 (#4741) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19461.18 Dependency coherency updates - Microsoft.NET.Sdk - 3.0.100-rc2.19455.7 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bc9a572f6..97219a35d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,13 +42,13 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 5ee52504c8c42f23c0d467cd335b2b5c71491561 + 8ea43e0e2251c770e1255ed788a574db08a5df7b - + https://github.com/dotnet/sdk - 83dffb6faab234c0c878e92c1679fa47c0cab3dd + b88161ed99ded0dd598779ad1afe044818422a6f https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index 088486502..6a74ae23f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19461.12 + 3.1.100-preview1.19461.18 @@ -40,7 +40,7 @@ - 3.0.100-rc1.19422.1 + 3.0.100-rc2.19455.7 $(MicrosoftNETSdkPackageVersion) From 957ff6dc9d1839d873756620b324496f3b867e7c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 22:26:13 +0000 Subject: [PATCH 223/420] Update dependencies from https://github.com/dotnet/toolset build 20190911.17 (#4743) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19461.17 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b7a53d758..0e5b58c9c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 6b4675d1d389c15df3b9979a0a177ecf81c99a42 + 48d16a6402df247082661ddf90a2781b51e83bf3 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 329181de7..9ddc06621 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc2.19461.16 + 3.0.100-rc2.19461.17 From db6496271cde572883f1f65275a318f25f61cf45 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Wed, 11 Sep 2019 17:45:08 -0500 Subject: [PATCH 224/420] Don't overwrite AspNetCoreSharedFxInstallerRid if it's already set. (#4734) --- src/redist/targets/GenerateLayout.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index d2a0b6fd1..c203d406a 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -48,7 +48,7 @@ linux-$(Architecture) dotnet-runtime-$(MicrosoftNETCoreAppPackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) - $(SharedFrameworkRid) + $(SharedFrameworkRid) linux-x64 $(AspNetCoreSharedFxInstallerRid) x64 From 4ad8bb3cb69bffaf3b7b6444949226f5bf077e63 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 22:50:23 +0000 Subject: [PATCH 225/420] Update dependencies from https://github.com/dotnet/toolset build 20190911.19 (#4745) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19461.19 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 97219a35d..fe2ec7479 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 8ea43e0e2251c770e1255ed788a574db08a5df7b + e104f8ed5f70661ee0700a2a42c2a810d378139c https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 6a74ae23f..8247ee21e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19461.18 + 3.1.100-preview1.19461.19 From a77fab9b7f0c1060be2941edc91dbce0f774917a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2019 23:16:03 +0000 Subject: [PATCH 226/420] Update dependencies from https://github.com/dotnet/toolset build 20190911.20 (#4748) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19461.20 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19461.12 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fe2ec7479..75c0de759 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - e104f8ed5f70661ee0700a2a42c2a810d378139c + afd7f170e1ed82653a17af718603e52e15aaf523 https://github.com/dotnet/sdk b88161ed99ded0dd598779ad1afe044818422a6f - + https://github.com/dotnet/cli - a6e4f7bfd93943b9336fd4741343a3bdbc5f550b + 524a5e9a0394e449323f47be47526eec480d7791 diff --git a/eng/Versions.props b/eng/Versions.props index 8247ee21e..7c3dd77d1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19461.19 + 3.1.100-preview1.19461.20 @@ -33,7 +33,7 @@ - 3.1.100-preview1.19461.7 + 3.1.100-preview1.19461.12 0.2.0 From 0e0ab3e6f355f8ea1922b7a8e76d2dc52624c8ba Mon Sep 17 00:00:00 2001 From: jbeisner Date: Wed, 11 Sep 2019 17:14:57 -0700 Subject: [PATCH 227/420] Add an icon to the SDKPlaceHolder MSI --- .../targets/packaging/windows/clisdk/msi.ico | Bin 0 -> 2238 bytes .../packaging/windows/clisdk/sdkplaceholder.wxs | 2 ++ 2 files changed, 2 insertions(+) create mode 100644 src/redist/targets/packaging/windows/clisdk/msi.ico diff --git a/src/redist/targets/packaging/windows/clisdk/msi.ico b/src/redist/targets/packaging/windows/clisdk/msi.ico new file mode 100644 index 0000000000000000000000000000000000000000..c2e2717c2067edbc06ff048d7cd5c3076335e9b9 GIT binary patch literal 2238 zcmaKuKTIn}5QoQlmd-lS&`?njs!(r5l?c~Juc0Q@*69#Zq?m>}BofjVkz6EEQlv4J zB^M?|im;-Df}kgb;z{R=Y-r9>o|t?)XN*mFSu=OH^P4~4&7A>}2A_=$VYTGvmdF}c zpJE%>=U4;3t!90)V}oNdTOAR8q|>QS9J!R?a45q+hcfx&CuugD(rUG2Wo1QHS65|i zZB5qK*JX2aQ?|CYWN&Xzc6WDWXJ<#Yx3{J9mCD<(5 zbo6%=awIuXvGyDs3=RedgM-14U~n)v7#s`^2E&BG!QfzUFgO?t9R>%3gTcYzU~q~L z4hM%z9I7?}Je<=fU=hQgZW$I&b5A2rQ4foa0nu~eVezooSm5w*csM*99u6B793BP_ zgNGrF&coqh@GwMrDMuS2ed-T;8*iEpRP+u+*{JCqUFem^@|41<+Y@a#PtYPD00mrvwJ+27xn zgM$M(K0cPy(^I*)xR742C)d~4a(jC#cXxME6ouU1-^+A5mB~LUKXki%k2_2^eFxHs zdbUe-(^e&4UX*CJ+snS^T~UP4{jJ|yiYNy

U(Dtk#dt7fO`KgS^c1Vw@4s?e~t( z&ldvf{Hn}HV*)}q$qx_D1!nnGF=o-=2$eMtc*-vZ7LezNTs`Y`|Ed@ah)AGiSuX0v zUzNqTX(fF!A>zOJ4-e<({eGU0E1fLnGe*tHe?UDuIXN6xnNB7P`AIJcNb>jH!*L3j z%XvA=uZsTJ*-5v1NP#MAGpj5!+FGxws<3qQab@Y*n5jPHqvxX$<XWGLUYoqG?=Aj^?4tXrV- zXJ)>h^;tmDA8&4W?R%G(m(2yeuAKD0-aQ2@=`}~L&3E&FW!-Me@}B};*U6s+ysqEO z13se913so(0Jr(NKA%qWRee6&bTOar{F#kjtUTApOo!8k4!;x~Zpha|G5d@&_QlN7 gwb>ia4NP8Ir~YrEG3ERLd&Kw^)6nVv*avy@FS@;$H2?qr literal 0 HcmV?d00001 diff --git a/src/redist/targets/packaging/windows/clisdk/sdkplaceholder.wxs b/src/redist/targets/packaging/windows/clisdk/sdkplaceholder.wxs index a3d5b9e98..1576a03bd 100644 --- a/src/redist/targets/packaging/windows/clisdk/sdkplaceholder.wxs +++ b/src/redist/targets/packaging/windows/clisdk/sdkplaceholder.wxs @@ -18,6 +18,8 @@ + + From d550e2a9ec52de99d7471043228483da48f22f12 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 12 Sep 2019 02:35:40 +0000 Subject: [PATCH 228/420] Update dependencies from https://github.com/aspnet/AspNetCore build 20190911.12 (#4756) - dotnet-user-secrets - 3.0.0-rc2.19461.12 - dotnet-watch - 3.0.0-rc2.19461.12 - Microsoft.AspNetCore.App.Ref - 3.0.0-rc2.19461.12 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-rc2.19461.12 - dotnet-dev-certs - 3.0.0-rc2.19461.12 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-rc2.19461.12 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 75c0de759..666998fda 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup 604ef7a61aea16bc63a402dfcb2bbe5e6b7c5971 - + https://github.com/aspnet/AspNetCore - 33120b6093eb5ee9ecf603f56e80a6a7d5a25f07 + 04f37e59d54af63cdd1d2d196f0f4970e7b8818a - + https://github.com/aspnet/AspNetCore - 33120b6093eb5ee9ecf603f56e80a6a7d5a25f07 + 04f37e59d54af63cdd1d2d196f0f4970e7b8818a - + https://github.com/aspnet/AspNetCore - 33120b6093eb5ee9ecf603f56e80a6a7d5a25f07 + 04f37e59d54af63cdd1d2d196f0f4970e7b8818a - + https://github.com/aspnet/AspNetCore - 33120b6093eb5ee9ecf603f56e80a6a7d5a25f07 + 04f37e59d54af63cdd1d2d196f0f4970e7b8818a - + https://github.com/aspnet/AspNetCore - 33120b6093eb5ee9ecf603f56e80a6a7d5a25f07 + 04f37e59d54af63cdd1d2d196f0f4970e7b8818a - + https://github.com/aspnet/AspNetCore - 33120b6093eb5ee9ecf603f56e80a6a7d5a25f07 + 04f37e59d54af63cdd1d2d196f0f4970e7b8818a https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 7c3dd77d1..37c39d911 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-rc2.19461.7 - 3.0.0-rc2.19461.7 - 3.0.0-rc2.19461.7 - 3.0.0-rc2.19461.7 - 3.0.0-rc2.19461.7 - 3.0.0-rc2.19461.7 + 3.0.0-rc2.19461.12 + 3.0.0-rc2.19461.12 + 3.0.0-rc2.19461.12 + 3.0.0-rc2.19461.12 + 3.0.0-rc2.19461.12 + 3.0.0-rc2.19461.12 From d1dc94589a699f28f82a391e40df5442aac200ee Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 12 Sep 2019 04:15:42 +0000 Subject: [PATCH 229/420] Update dependencies from https://github.com/dotnet/toolset build 20190911.27 (#4758) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19461.27 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 666998fda..161e1f45a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - afd7f170e1ed82653a17af718603e52e15aaf523 + e7e7fd3a69a9265e64df4eed15b62d726cdedb9a https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 37c39d911..1c02e3647 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19461.20 + 3.1.100-preview1.19461.27 From b90ef8b77df13c7884514936f3e6493f4e73c115 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 12 Sep 2019 12:05:43 +0000 Subject: [PATCH 230/420] Update dependencies from https://github.com/aspnet/AspNetCore build 20190912.2 (#4765) - dotnet-user-secrets - 3.0.0-rc2.19462.2 - dotnet-watch - 3.0.0-rc2.19462.2 - Microsoft.AspNetCore.App.Ref - 3.0.0-rc2.19462.2 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-rc2.19462.2 - dotnet-dev-certs - 3.0.0-rc2.19462.2 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-rc2.19462.2 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 161e1f45a..fd126ddc1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup 604ef7a61aea16bc63a402dfcb2bbe5e6b7c5971 - + https://github.com/aspnet/AspNetCore - 04f37e59d54af63cdd1d2d196f0f4970e7b8818a + db1aca12a532e4b37a91d8037b50a22d1ef21239 - + https://github.com/aspnet/AspNetCore - 04f37e59d54af63cdd1d2d196f0f4970e7b8818a + db1aca12a532e4b37a91d8037b50a22d1ef21239 - + https://github.com/aspnet/AspNetCore - 04f37e59d54af63cdd1d2d196f0f4970e7b8818a + db1aca12a532e4b37a91d8037b50a22d1ef21239 - + https://github.com/aspnet/AspNetCore - 04f37e59d54af63cdd1d2d196f0f4970e7b8818a + db1aca12a532e4b37a91d8037b50a22d1ef21239 - + https://github.com/aspnet/AspNetCore - 04f37e59d54af63cdd1d2d196f0f4970e7b8818a + db1aca12a532e4b37a91d8037b50a22d1ef21239 - + https://github.com/aspnet/AspNetCore - 04f37e59d54af63cdd1d2d196f0f4970e7b8818a + db1aca12a532e4b37a91d8037b50a22d1ef21239 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 1c02e3647..a9ef9a4cc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-rc2.19461.12 - 3.0.0-rc2.19461.12 - 3.0.0-rc2.19461.12 - 3.0.0-rc2.19461.12 - 3.0.0-rc2.19461.12 - 3.0.0-rc2.19461.12 + 3.0.0-rc2.19462.2 + 3.0.0-rc2.19462.2 + 3.0.0-rc2.19462.2 + 3.0.0-rc2.19462.2 + 3.0.0-rc2.19462.2 + 3.0.0-rc2.19462.2 From 5fdd6263b6fcbd627812f48c157bdfa26ee722ed Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 12 Sep 2019 13:16:19 +0000 Subject: [PATCH 231/420] Update dependencies from https://github.com/dotnet/arcade build 20190911.7 (#4769) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19461.7 --- eng/Version.Details.xml | 4 +- .../post-build/channels/netcore-dev-30.yml | 13 ++++--- .../post-build/channels/netcore-dev-31.yml | 15 ++++---- .../post-build/channels/netcore-dev-5.yml | 29 ++++++-------- .../channels/netcore-internal-30.yml | 38 +++++++++++-------- .../channels/netcore-release-30.yml | 38 +++++++++++-------- .../channels/netcore-release-31.yml | 14 ++++--- .../channels/netcore-tools-latest.yml | 33 +++++++--------- .../channels/public-validation-release.yml | 26 ++++++------- .../templates/post-build/common-variables.yml | 4 -- .../templates/post-build/post-build.yml | 6 +-- global.json | 2 +- 12 files changed, 112 insertions(+), 110 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fd126ddc1..bc5baf333 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,9 +65,9 @@ - + https://github.com/dotnet/arcade - 0f5cfb20a355c27bc84cedd049c946b44a7fc1da + 8eb29ba860a3cfcfe68f9a8256caa7efc1f1aaba diff --git a/eng/common/templates/post-build/channels/netcore-dev-30.yml b/eng/common/templates/post-build/channels/netcore-dev-30.yml index 3c5eb8398..69f1a9013 100644 --- a/eng/common/templates/post-build/channels/netcore-dev-30.yml +++ b/eng/common/templates/post-build/channels/netcore-dev-30.yml @@ -97,14 +97,8 @@ stages: /p:IsInternalBuild=$(IsInternalBuild) /p:RepositoryName=$(Build.Repository.Name) /p:CommitSha=$(Build.SourceVersion) - /p:StaticInternalFeed=$(StaticInternalFeed) - /p:InternalChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl) - /p:InternalChecksumsTargetStaticFeedKey=$(InternalChecksumsBlobFeedKey) - /p:InternalInstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl) - /p:InternalInstallersTargetStaticFeedKey=$(InternalInstallersBlobFeedKey) /p:NugetPath=$(NuGetExeToolPath) /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:TargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' /p:BARBuildId=$(BARBuildId) /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' @@ -118,6 +112,13 @@ stages: /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) + /p:PublishToAzureDevOpsNuGetFeeds=true + /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json' + /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json' + /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-symbols/nuget/v3/index.json' + /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' ${{ parameters.artifactsPublishingAdditionalParameters }} - template: ../../steps/promote-build.yml diff --git a/eng/common/templates/post-build/channels/netcore-dev-31.yml b/eng/common/templates/post-build/channels/netcore-dev-31.yml index 965309d15..720a0ab08 100644 --- a/eng/common/templates/post-build/channels/netcore-dev-31.yml +++ b/eng/common/templates/post-build/channels/netcore-dev-31.yml @@ -46,7 +46,7 @@ stages: /p:Configuration=Release ${{ parameters.symbolPublishingAdditionalParameters }} - - job: + - job: publish_assets displayName: Publish Assets dependsOn: setupMaestroVars variables: @@ -97,14 +97,8 @@ stages: /p:IsInternalBuild=$(IsInternalBuild) /p:RepositoryName=$(Build.Repository.Name) /p:CommitSha=$(Build.SourceVersion) - /p:StaticInternalFeed=$(StaticInternalFeed) - /p:InternalChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl) - /p:InternalChecksumsTargetStaticFeedKey=$(InternalChecksumsBlobFeedKey) - /p:InternalInstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl) - /p:InternalInstallersTargetStaticFeedKey=$(InternalInstallersBlobFeedKey) /p:NugetPath=$(NuGetExeToolPath) /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:TargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' /p:BARBuildId=$(BARBuildId) /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' @@ -118,6 +112,13 @@ stages: /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) + /p:PublishToAzureDevOpsNuGetFeeds=true + /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' + /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' + /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' + /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' ${{ parameters.artifactsPublishingAdditionalParameters }} - template: ../../steps/promote-build.yml diff --git a/eng/common/templates/post-build/channels/netcore-dev-5.yml b/eng/common/templates/post-build/channels/netcore-dev-5.yml index 9975dda4e..9c81e39e9 100644 --- a/eng/common/templates/post-build/channels/netcore-dev-5.yml +++ b/eng/common/templates/post-build/channels/netcore-dev-5.yml @@ -2,7 +2,6 @@ parameters: symbolPublishingAdditionalParameters: '' artifactsPublishingAdditionalParameters: '' publishInstallersAndChecksums: false - publishToAzureDevOpsFeeds: true stages: - stage: NetCore_Dev5_Publish @@ -92,38 +91,34 @@ stages: AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw) inputs: filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet + arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet /p:ArtifactsCategory=$(_DotNetArtifactsCategory) /p:IsStableBuild=$(IsStableBuild) /p:IsInternalBuild=$(IsInternalBuild) /p:RepositoryName=$(Build.Repository.Name) /p:CommitSha=$(Build.SourceVersion) - /p:StaticInternalFeed=$(StaticInternalFeed) - /p:InternalChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl) - /p:InternalChecksumsTargetStaticFeedKey=$(InternalChecksumsBlobFeedKey) - /p:InternalInstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl) - /p:InternalInstallersTargetStaticFeedKey=$(InternalInstallersBlobFeedKey) /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:TargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' + /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' + /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' + /p:BARBuildId=$(BARBuildId) + /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' + /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' + /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' + /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' /p:Configuration=Release /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=${{ parameters.publishToAzureDevOpsFeeds }} + /p:PublishToAzureDevOpsNuGetFeeds=true /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json' /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json' /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json' + /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' ${{ parameters.artifactsPublishingAdditionalParameters }} - template: ../../steps/promote-build.yml diff --git a/eng/common/templates/post-build/channels/netcore-internal-30.yml b/eng/common/templates/post-build/channels/netcore-internal-30.yml index 20eef377b..594a1a9a7 100644 --- a/eng/common/templates/post-build/channels/netcore-internal-30.yml +++ b/eng/common/templates/post-build/channels/netcore-internal-30.yml @@ -90,27 +90,33 @@ stages: AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw) inputs: filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet + arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet /p:IsStableBuild=$(IsStableBuild) /p:IsInternalBuild=$(IsInternalBuild) /p:RepositoryName=$(Build.Repository.Name) /p:CommitSha=$(Build.SourceVersion) - /p:StaticInternalFeed=$(StaticInternalFeed) - /p:InternalChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl) - /p:InternalChecksumsTargetStaticFeedKey=$(InternalChecksumsBlobFeedKey) - /p:InternalInstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl) - /p:InternalInstallersTargetStaticFeedKey=$(InternalInstallersBlobFeedKey) /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:TargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release + /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' + /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' + /p:BARBuildId=$(BARBuildId) + /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' + /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' + /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' + /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' + /p:Configuration=Release + /p:PublishInstallersAndChecksums=true + /p:ChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl) + /p:ChecksumsTargetStaticFeedKey=$(InternalChecksumsBlobFeedKey) + /p:InstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl) + /p:InstallersTargetStaticFeedKey=$(InternalInstallersBlobFeedKey) + /p:PublishToAzureDevOpsNuGetFeeds=true + /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v3/index.json' + /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v3/index.json' + /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-symbols/nuget/v3/index.json' + /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' ${{ parameters.artifactsPublishingAdditionalParameters }} - template: ../../steps/promote-build.yml diff --git a/eng/common/templates/post-build/channels/netcore-release-30.yml b/eng/common/templates/post-build/channels/netcore-release-30.yml index 5a5c28e1b..8ba9237ff 100644 --- a/eng/common/templates/post-build/channels/netcore-release-30.yml +++ b/eng/common/templates/post-build/channels/netcore-release-30.yml @@ -1,6 +1,7 @@ parameters: symbolPublishingAdditionalParameters: '' artifactsPublishingAdditionalParameters: '' + publishInstallersAndChecksums: false stages: - stage: NetCore_Release30_Publish @@ -90,27 +91,34 @@ stages: AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw) inputs: filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet + arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet + /p:ArtifactsCategory=$(_DotNetArtifactsCategory) /p:IsStableBuild=$(IsStableBuild) /p:IsInternalBuild=$(IsInternalBuild) /p:RepositoryName=$(Build.Repository.Name) /p:CommitSha=$(Build.SourceVersion) - /p:StaticInternalFeed=$(StaticInternalFeed) - /p:InternalChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl) - /p:InternalChecksumsTargetStaticFeedKey=$(InternalChecksumsBlobFeedKey) - /p:InternalInstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl) - /p:InternalInstallersTargetStaticFeedKey=$(InternalInstallersBlobFeedKey) /p:NugetPath=$(NuGetExeToolPath) /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:TargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release + /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' + /p:BARBuildId=$(BARBuildId) + /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' + /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' + /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' + /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' + /p:Configuration=Release + /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} + /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) + /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) + /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) + /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) + /p:PublishToAzureDevOpsNuGetFeeds=true + /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json' + /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json' + /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-symbols/nuget/v3/index.json' + /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' ${{ parameters.artifactsPublishingAdditionalParameters }} - template: ../../steps/promote-build.yml diff --git a/eng/common/templates/post-build/channels/netcore-release-31.yml b/eng/common/templates/post-build/channels/netcore-release-31.yml index 294521588..d8270eada 100644 --- a/eng/common/templates/post-build/channels/netcore-release-31.yml +++ b/eng/common/templates/post-build/channels/netcore-release-31.yml @@ -1,6 +1,7 @@ parameters: symbolPublishingAdditionalParameters: '' artifactsPublishingAdditionalParameters: '' + publishInstallersAndChecksums: false stages: - stage: NetCore_Release31_Publish @@ -96,14 +97,8 @@ stages: /p:IsInternalBuild=$(IsInternalBuild) /p:RepositoryName=$(Build.Repository.Name) /p:CommitSha=$(Build.SourceVersion) - /p:StaticInternalFeed=$(StaticInternalFeed) - /p:InternalChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl) - /p:InternalChecksumsTargetStaticFeedKey=$(InternalChecksumsBlobFeedKey) - /p:InternalInstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl) - /p:InternalInstallersTargetStaticFeedKey=$(InternalInstallersBlobFeedKey) /p:NugetPath=$(NuGetExeToolPath) /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:TargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' /p:BARBuildId=$(BARBuildId) /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' @@ -117,6 +112,13 @@ stages: /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) + /p:PublishToAzureDevOpsNuGetFeeds=true + /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' + /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' + /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' + /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' ${{ parameters.artifactsPublishingAdditionalParameters }} - template: ../../steps/promote-build.yml diff --git a/eng/common/templates/post-build/channels/netcore-tools-latest.yml b/eng/common/templates/post-build/channels/netcore-tools-latest.yml index 09445aee0..c75d18673 100644 --- a/eng/common/templates/post-build/channels/netcore-tools-latest.yml +++ b/eng/common/templates/post-build/channels/netcore-tools-latest.yml @@ -2,7 +2,6 @@ parameters: symbolPublishingAdditionalParameters: '' artifactsPublishingAdditionalParameters: '' publishInstallersAndChecksums: false - publishToAzureDevOpsFeeds: true stages: - stage: NetCore_Tools_Latest_Publish @@ -92,40 +91,36 @@ stages: AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw) inputs: filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet + arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet /p:ArtifactsCategory=$(_DotNetArtifactsCategory) /p:IsStableBuild=$(IsStableBuild) /p:IsInternalBuild=$(IsInternalBuild) /p:RepositoryName=$(Build.Repository.Name) /p:CommitSha=$(Build.SourceVersion) - /p:StaticInternalFeed=$(StaticInternalFeed) - /p:InternalChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl) - /p:InternalChecksumsTargetStaticFeedKey=$(InternalChecksumsBlobFeedKey) - /p:InternalInstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl) - /p:InternalInstallersTargetStaticFeedKey=$(InternalInstallersBlobFeedKey) /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:TargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' + /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' + /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' + /p:BARBuildId=$(BARBuildId) + /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' + /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' + /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' + /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' /p:Configuration=Release /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=${{ parameters.publishToAzureDevOpsFeeds }} + /p:PublishToAzureDevOpsNuGetFeeds=true /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw) + /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' + /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' ${{ parameters.artifactsPublishingAdditionalParameters }} - + - template: ../../steps/promote-build.yml parameters: ChannelId: ${{ variables.NetCore_Tools_Latest_Channel_Id }} \ No newline at end of file diff --git a/eng/common/templates/post-build/channels/public-validation-release.yml b/eng/common/templates/post-build/channels/public-validation-release.yml index 4feed3297..fb2c23d0f 100644 --- a/eng/common/templates/post-build/channels/public-validation-release.yml +++ b/eng/common/templates/post-build/channels/public-validation-release.yml @@ -1,7 +1,6 @@ parameters: artifactsPublishingAdditionalParameters: '' publishInstallersAndChecksums: false - publishToAzureDevOpsFeeds: true stages: - stage: PVR_Publish @@ -57,35 +56,36 @@ stages: AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw) inputs: filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet + arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet /p:ArtifactsCategory=$(_DotNetValidationArtifactsCategory) /p:IsStableBuild=$(IsStableBuild) /p:IsInternalBuild=$(IsInternalBuild) /p:RepositoryName=$(Build.Repository.Name) /p:CommitSha=$(Build.SourceVersion) /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:TargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' + /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' + /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' + /p:BARBuildId=$(BARBuildId) + /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' + /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' + /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' + /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' /p:Configuration=Release /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=${{ parameters.publishToAzureDevOpsFeeds }} + /p:PublishToAzureDevOpsNuGetFeeds=true /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' + /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' ${{ parameters.artifactsPublishingAdditionalParameters }} - + - template: ../../steps/promote-build.yml parameters: ChannelId: ${{ variables.PublicValidationRelease_30_Channel_Id }} diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index c13476449..adb2a854f 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -55,10 +55,6 @@ variables: # Feed Configurations # These should include the suffix "/index.json" - # Configuration for the feed where packages from internal non-stable builds will be published to - - name: StaticInternalFeed - value: 'https://dnceng.pkgs.visualstudio.com/_packaging/dotnet-core-internal/nuget/v3/index.json' - # Default locations for Installers and checksums # Public Locations - name: ChecksumsBlobFeedUrl diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index e473cadbc..5b9d0a5d9 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -4,7 +4,6 @@ parameters: enableSymbolValidation: false enableNugetValidation: true publishInstallersAndChecksums: false - enableAzDONuGetFeeds: true SDLValidationParameters: enable: false continueOnError: false @@ -101,7 +100,6 @@ stages: symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - enableAzDONuGetFeeds: ${{ parameters.enableAzDONuGetFeeds }} - template: \eng\common\templates\post-build\channels\netcore-dev-30.yml parameters: @@ -120,23 +118,23 @@ stages: symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - enableAzDONuGetFeeds: ${{ parameters.enableAzDONuGetFeeds }} - template: \eng\common\templates\post-build\channels\public-validation-release.yml parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - enableAzDONuGetFeeds: ${{ parameters.enableAzDONuGetFeeds }} - template: \eng\common\templates\post-build\channels\netcore-release-30.yml parameters: symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - template: \eng\common\templates\post-build\channels\netcore-release-31.yml parameters: symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - template: \eng\common\templates\post-build\channels\netcore-internal-30.yml parameters: diff --git a/global.json b/global.json index 8c6b8ec55..3275aa5ff 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.0.100-preview6-012264" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19460.3" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19461.7" } } From 339496e7e544c6182df85cf4bbbe8dca4f8a55b1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 12 Sep 2019 13:30:49 +0000 Subject: [PATCH 232/420] Update dependencies from https://github.com/dotnet/toolset build 20190912.7 (#4770) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19462.7 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-rc1.19453.3 (parent: Microsoft.WindowsDesktop.App) --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0e5b58c9c..a9a719583 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 48d16a6402df247082661ddf90a2781b51e83bf3 + fa039b2437a86fbcae3832d55fdd999b05c262c8 https://github.com/dotnet/sdk @@ -55,7 +55,7 @@ da3737fde462ef071e52f6f589adda651384cea9 - + https://github.com/dotnet/winforms dc6297c0fb269c3a78ce36333012753c6555aeb9 diff --git a/eng/Versions.props b/eng/Versions.props index 9ddc06621..1e472c677 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,11 +12,11 @@ preview - 3.0.100-rc2.19461.17 + 3.0.100-rc2.19462.7 - 4.8.0-rc1.19455.20 + 4.8.0-rc1.19453.3 From eb0d76be0882ab82e6d9247370ec9be33dbec918 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 12 Sep 2019 14:11:35 +0000 Subject: [PATCH 233/420] Update dependencies from https://github.com/dotnet/toolset build 20190912.9 (#4775) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19462.9 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bc5baf333..fb325dba6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - e7e7fd3a69a9265e64df4eed15b62d726cdedb9a + 36d01962827407f3082e3a543a0e798d1f4bab16 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index a9ef9a4cc..910554dd8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19461.27 + 3.1.100-preview1.19462.9 From 97911e39c24c6eb23c6272bab8e75bd3b15cf3d5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 12 Sep 2019 14:41:22 +0000 Subject: [PATCH 234/420] Update dependencies from https://github.com/dotnet/toolset build 20190912.10 (#4776) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19462.10 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a9a719583..fb335d1cd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - fa039b2437a86fbcae3832d55fdd999b05c262c8 + 8489f0797ead9eb93e1dd64dcd9afa83eb5afb44 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 1e472c677..ecfa374d4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc2.19462.7 + 3.0.100-rc2.19462.10 From 9f0e3d619b5d938e5845cb693b7355b9b9922830 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 12 Sep 2019 15:15:52 +0000 Subject: [PATCH 235/420] Update dependencies from https://github.com/dotnet/toolset build 20190912.13 (#4780) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19462.13 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19462.3 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fb325dba6..d1d371b46 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 36d01962827407f3082e3a543a0e798d1f4bab16 + 2f526bcec0a913c9beb950845466104e673bda6b https://github.com/dotnet/sdk b88161ed99ded0dd598779ad1afe044818422a6f - + https://github.com/dotnet/cli - 524a5e9a0394e449323f47be47526eec480d7791 + 22df9f6178df2c65b40f6b46b5e26553c3119165 diff --git a/eng/Versions.props b/eng/Versions.props index 910554dd8..6359ef780 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19462.9 + 3.1.100-preview1.19462.13 @@ -33,7 +33,7 @@ - 3.1.100-preview1.19461.12 + 3.1.100-preview1.19462.3 0.2.0 From fd348ea66a67998c1e9106e9f02cdc3e20e8f09b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 12 Sep 2019 15:21:21 +0000 Subject: [PATCH 236/420] Update dependencies from https://github.com/dotnet/toolset build 20190912.12 (#4779) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19462.12 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fb335d1cd..dbf063618 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 8489f0797ead9eb93e1dd64dcd9afa83eb5afb44 + bfc33fb8d316b876510a427c16d0903a42235642 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index ecfa374d4..f4c856640 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc2.19462.10 + 3.0.100-rc2.19462.12 From 32ed8871619d370fa4e5875f0e611e3c89a2a81f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 12 Sep 2019 16:10:57 +0000 Subject: [PATCH 237/420] Update dependencies from https://github.com/dotnet/toolset build 20190912.15 (#4781) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19462.15 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dbf063618..75e5142bd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - bfc33fb8d316b876510a427c16d0903a42235642 + e9699df725f74fb4faf2e8592ba4ce0128fb2a9c https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index f4c856640..9f80823cb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc2.19462.12 + 3.0.100-rc2.19462.15 From 118e4306cb2b399e507efe6f0135f1bc9f8fb2df Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 12 Sep 2019 17:00:34 +0000 Subject: [PATCH 238/420] Update dependencies from https://github.com/dotnet/arcade build 20190911.7 (#4783) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19461.7 --- eng/Version.Details.xml | 4 +- .../post-build/channels/netcore-dev-30.yml | 13 ++++--- .../post-build/channels/netcore-dev-31.yml | 15 ++++---- .../post-build/channels/netcore-dev-5.yml | 29 ++++++-------- .../channels/netcore-internal-30.yml | 38 +++++++++++-------- .../channels/netcore-release-30.yml | 38 +++++++++++-------- .../channels/netcore-release-31.yml | 14 ++++--- .../channels/netcore-tools-latest.yml | 33 +++++++--------- .../channels/public-validation-release.yml | 26 ++++++------- .../templates/post-build/common-variables.yml | 4 -- .../templates/post-build/post-build.yml | 6 +-- global.json | 2 +- 12 files changed, 112 insertions(+), 110 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 75e5142bd..9a90820ce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,9 +65,9 @@ - + https://github.com/dotnet/arcade - 0f5cfb20a355c27bc84cedd049c946b44a7fc1da + 8eb29ba860a3cfcfe68f9a8256caa7efc1f1aaba diff --git a/eng/common/templates/post-build/channels/netcore-dev-30.yml b/eng/common/templates/post-build/channels/netcore-dev-30.yml index 3c5eb8398..69f1a9013 100644 --- a/eng/common/templates/post-build/channels/netcore-dev-30.yml +++ b/eng/common/templates/post-build/channels/netcore-dev-30.yml @@ -97,14 +97,8 @@ stages: /p:IsInternalBuild=$(IsInternalBuild) /p:RepositoryName=$(Build.Repository.Name) /p:CommitSha=$(Build.SourceVersion) - /p:StaticInternalFeed=$(StaticInternalFeed) - /p:InternalChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl) - /p:InternalChecksumsTargetStaticFeedKey=$(InternalChecksumsBlobFeedKey) - /p:InternalInstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl) - /p:InternalInstallersTargetStaticFeedKey=$(InternalInstallersBlobFeedKey) /p:NugetPath=$(NuGetExeToolPath) /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:TargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' /p:BARBuildId=$(BARBuildId) /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' @@ -118,6 +112,13 @@ stages: /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) + /p:PublishToAzureDevOpsNuGetFeeds=true + /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json' + /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json' + /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-symbols/nuget/v3/index.json' + /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' ${{ parameters.artifactsPublishingAdditionalParameters }} - template: ../../steps/promote-build.yml diff --git a/eng/common/templates/post-build/channels/netcore-dev-31.yml b/eng/common/templates/post-build/channels/netcore-dev-31.yml index 965309d15..720a0ab08 100644 --- a/eng/common/templates/post-build/channels/netcore-dev-31.yml +++ b/eng/common/templates/post-build/channels/netcore-dev-31.yml @@ -46,7 +46,7 @@ stages: /p:Configuration=Release ${{ parameters.symbolPublishingAdditionalParameters }} - - job: + - job: publish_assets displayName: Publish Assets dependsOn: setupMaestroVars variables: @@ -97,14 +97,8 @@ stages: /p:IsInternalBuild=$(IsInternalBuild) /p:RepositoryName=$(Build.Repository.Name) /p:CommitSha=$(Build.SourceVersion) - /p:StaticInternalFeed=$(StaticInternalFeed) - /p:InternalChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl) - /p:InternalChecksumsTargetStaticFeedKey=$(InternalChecksumsBlobFeedKey) - /p:InternalInstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl) - /p:InternalInstallersTargetStaticFeedKey=$(InternalInstallersBlobFeedKey) /p:NugetPath=$(NuGetExeToolPath) /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:TargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' /p:BARBuildId=$(BARBuildId) /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' @@ -118,6 +112,13 @@ stages: /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) + /p:PublishToAzureDevOpsNuGetFeeds=true + /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' + /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' + /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' + /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' ${{ parameters.artifactsPublishingAdditionalParameters }} - template: ../../steps/promote-build.yml diff --git a/eng/common/templates/post-build/channels/netcore-dev-5.yml b/eng/common/templates/post-build/channels/netcore-dev-5.yml index 9975dda4e..9c81e39e9 100644 --- a/eng/common/templates/post-build/channels/netcore-dev-5.yml +++ b/eng/common/templates/post-build/channels/netcore-dev-5.yml @@ -2,7 +2,6 @@ parameters: symbolPublishingAdditionalParameters: '' artifactsPublishingAdditionalParameters: '' publishInstallersAndChecksums: false - publishToAzureDevOpsFeeds: true stages: - stage: NetCore_Dev5_Publish @@ -92,38 +91,34 @@ stages: AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw) inputs: filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet + arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet /p:ArtifactsCategory=$(_DotNetArtifactsCategory) /p:IsStableBuild=$(IsStableBuild) /p:IsInternalBuild=$(IsInternalBuild) /p:RepositoryName=$(Build.Repository.Name) /p:CommitSha=$(Build.SourceVersion) - /p:StaticInternalFeed=$(StaticInternalFeed) - /p:InternalChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl) - /p:InternalChecksumsTargetStaticFeedKey=$(InternalChecksumsBlobFeedKey) - /p:InternalInstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl) - /p:InternalInstallersTargetStaticFeedKey=$(InternalInstallersBlobFeedKey) /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:TargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' + /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' + /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' + /p:BARBuildId=$(BARBuildId) + /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' + /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' + /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' + /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' /p:Configuration=Release /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=${{ parameters.publishToAzureDevOpsFeeds }} + /p:PublishToAzureDevOpsNuGetFeeds=true /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json' /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json' /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json' + /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' ${{ parameters.artifactsPublishingAdditionalParameters }} - template: ../../steps/promote-build.yml diff --git a/eng/common/templates/post-build/channels/netcore-internal-30.yml b/eng/common/templates/post-build/channels/netcore-internal-30.yml index 20eef377b..594a1a9a7 100644 --- a/eng/common/templates/post-build/channels/netcore-internal-30.yml +++ b/eng/common/templates/post-build/channels/netcore-internal-30.yml @@ -90,27 +90,33 @@ stages: AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw) inputs: filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet + arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet /p:IsStableBuild=$(IsStableBuild) /p:IsInternalBuild=$(IsInternalBuild) /p:RepositoryName=$(Build.Repository.Name) /p:CommitSha=$(Build.SourceVersion) - /p:StaticInternalFeed=$(StaticInternalFeed) - /p:InternalChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl) - /p:InternalChecksumsTargetStaticFeedKey=$(InternalChecksumsBlobFeedKey) - /p:InternalInstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl) - /p:InternalInstallersTargetStaticFeedKey=$(InternalInstallersBlobFeedKey) /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:TargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release + /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' + /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' + /p:BARBuildId=$(BARBuildId) + /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' + /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' + /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' + /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' + /p:Configuration=Release + /p:PublishInstallersAndChecksums=true + /p:ChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl) + /p:ChecksumsTargetStaticFeedKey=$(InternalChecksumsBlobFeedKey) + /p:InstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl) + /p:InstallersTargetStaticFeedKey=$(InternalInstallersBlobFeedKey) + /p:PublishToAzureDevOpsNuGetFeeds=true + /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v3/index.json' + /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v3/index.json' + /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-symbols/nuget/v3/index.json' + /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' ${{ parameters.artifactsPublishingAdditionalParameters }} - template: ../../steps/promote-build.yml diff --git a/eng/common/templates/post-build/channels/netcore-release-30.yml b/eng/common/templates/post-build/channels/netcore-release-30.yml index 5a5c28e1b..8ba9237ff 100644 --- a/eng/common/templates/post-build/channels/netcore-release-30.yml +++ b/eng/common/templates/post-build/channels/netcore-release-30.yml @@ -1,6 +1,7 @@ parameters: symbolPublishingAdditionalParameters: '' artifactsPublishingAdditionalParameters: '' + publishInstallersAndChecksums: false stages: - stage: NetCore_Release30_Publish @@ -90,27 +91,34 @@ stages: AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw) inputs: filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet + arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet + /p:ArtifactsCategory=$(_DotNetArtifactsCategory) /p:IsStableBuild=$(IsStableBuild) /p:IsInternalBuild=$(IsInternalBuild) /p:RepositoryName=$(Build.Repository.Name) /p:CommitSha=$(Build.SourceVersion) - /p:StaticInternalFeed=$(StaticInternalFeed) - /p:InternalChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl) - /p:InternalChecksumsTargetStaticFeedKey=$(InternalChecksumsBlobFeedKey) - /p:InternalInstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl) - /p:InternalInstallersTargetStaticFeedKey=$(InternalInstallersBlobFeedKey) /p:NugetPath=$(NuGetExeToolPath) /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:TargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release + /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' + /p:BARBuildId=$(BARBuildId) + /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' + /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' + /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' + /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' + /p:Configuration=Release + /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} + /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) + /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) + /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) + /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) + /p:PublishToAzureDevOpsNuGetFeeds=true + /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json' + /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json' + /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-symbols/nuget/v3/index.json' + /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' ${{ parameters.artifactsPublishingAdditionalParameters }} - template: ../../steps/promote-build.yml diff --git a/eng/common/templates/post-build/channels/netcore-release-31.yml b/eng/common/templates/post-build/channels/netcore-release-31.yml index 294521588..d8270eada 100644 --- a/eng/common/templates/post-build/channels/netcore-release-31.yml +++ b/eng/common/templates/post-build/channels/netcore-release-31.yml @@ -1,6 +1,7 @@ parameters: symbolPublishingAdditionalParameters: '' artifactsPublishingAdditionalParameters: '' + publishInstallersAndChecksums: false stages: - stage: NetCore_Release31_Publish @@ -96,14 +97,8 @@ stages: /p:IsInternalBuild=$(IsInternalBuild) /p:RepositoryName=$(Build.Repository.Name) /p:CommitSha=$(Build.SourceVersion) - /p:StaticInternalFeed=$(StaticInternalFeed) - /p:InternalChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl) - /p:InternalChecksumsTargetStaticFeedKey=$(InternalChecksumsBlobFeedKey) - /p:InternalInstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl) - /p:InternalInstallersTargetStaticFeedKey=$(InternalInstallersBlobFeedKey) /p:NugetPath=$(NuGetExeToolPath) /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:TargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' /p:BARBuildId=$(BARBuildId) /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' @@ -117,6 +112,13 @@ stages: /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) + /p:PublishToAzureDevOpsNuGetFeeds=true + /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' + /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' + /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' + /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' ${{ parameters.artifactsPublishingAdditionalParameters }} - template: ../../steps/promote-build.yml diff --git a/eng/common/templates/post-build/channels/netcore-tools-latest.yml b/eng/common/templates/post-build/channels/netcore-tools-latest.yml index 09445aee0..c75d18673 100644 --- a/eng/common/templates/post-build/channels/netcore-tools-latest.yml +++ b/eng/common/templates/post-build/channels/netcore-tools-latest.yml @@ -2,7 +2,6 @@ parameters: symbolPublishingAdditionalParameters: '' artifactsPublishingAdditionalParameters: '' publishInstallersAndChecksums: false - publishToAzureDevOpsFeeds: true stages: - stage: NetCore_Tools_Latest_Publish @@ -92,40 +91,36 @@ stages: AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw) inputs: filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet + arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet /p:ArtifactsCategory=$(_DotNetArtifactsCategory) /p:IsStableBuild=$(IsStableBuild) /p:IsInternalBuild=$(IsInternalBuild) /p:RepositoryName=$(Build.Repository.Name) /p:CommitSha=$(Build.SourceVersion) - /p:StaticInternalFeed=$(StaticInternalFeed) - /p:InternalChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl) - /p:InternalChecksumsTargetStaticFeedKey=$(InternalChecksumsBlobFeedKey) - /p:InternalInstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl) - /p:InternalInstallersTargetStaticFeedKey=$(InternalInstallersBlobFeedKey) /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:TargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' + /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' + /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' + /p:BARBuildId=$(BARBuildId) + /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' + /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' + /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' + /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' /p:Configuration=Release /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=${{ parameters.publishToAzureDevOpsFeeds }} + /p:PublishToAzureDevOpsNuGetFeeds=true /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw) + /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' + /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' ${{ parameters.artifactsPublishingAdditionalParameters }} - + - template: ../../steps/promote-build.yml parameters: ChannelId: ${{ variables.NetCore_Tools_Latest_Channel_Id }} \ No newline at end of file diff --git a/eng/common/templates/post-build/channels/public-validation-release.yml b/eng/common/templates/post-build/channels/public-validation-release.yml index 4feed3297..fb2c23d0f 100644 --- a/eng/common/templates/post-build/channels/public-validation-release.yml +++ b/eng/common/templates/post-build/channels/public-validation-release.yml @@ -1,7 +1,6 @@ parameters: artifactsPublishingAdditionalParameters: '' publishInstallersAndChecksums: false - publishToAzureDevOpsFeeds: true stages: - stage: PVR_Publish @@ -57,35 +56,36 @@ stages: AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw) inputs: filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet + arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet /p:ArtifactsCategory=$(_DotNetValidationArtifactsCategory) /p:IsStableBuild=$(IsStableBuild) /p:IsInternalBuild=$(IsInternalBuild) /p:RepositoryName=$(Build.Repository.Name) /p:CommitSha=$(Build.SourceVersion) /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:TargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' + /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' + /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' + /p:BARBuildId=$(BARBuildId) + /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' + /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' + /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' + /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' /p:Configuration=Release /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=${{ parameters.publishToAzureDevOpsFeeds }} + /p:PublishToAzureDevOpsNuGetFeeds=true /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' + /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' ${{ parameters.artifactsPublishingAdditionalParameters }} - + - template: ../../steps/promote-build.yml parameters: ChannelId: ${{ variables.PublicValidationRelease_30_Channel_Id }} diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index c13476449..adb2a854f 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -55,10 +55,6 @@ variables: # Feed Configurations # These should include the suffix "/index.json" - # Configuration for the feed where packages from internal non-stable builds will be published to - - name: StaticInternalFeed - value: 'https://dnceng.pkgs.visualstudio.com/_packaging/dotnet-core-internal/nuget/v3/index.json' - # Default locations for Installers and checksums # Public Locations - name: ChecksumsBlobFeedUrl diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index e473cadbc..5b9d0a5d9 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -4,7 +4,6 @@ parameters: enableSymbolValidation: false enableNugetValidation: true publishInstallersAndChecksums: false - enableAzDONuGetFeeds: true SDLValidationParameters: enable: false continueOnError: false @@ -101,7 +100,6 @@ stages: symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - enableAzDONuGetFeeds: ${{ parameters.enableAzDONuGetFeeds }} - template: \eng\common\templates\post-build\channels\netcore-dev-30.yml parameters: @@ -120,23 +118,23 @@ stages: symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - enableAzDONuGetFeeds: ${{ parameters.enableAzDONuGetFeeds }} - template: \eng\common\templates\post-build\channels\public-validation-release.yml parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - enableAzDONuGetFeeds: ${{ parameters.enableAzDONuGetFeeds }} - template: \eng\common\templates\post-build\channels\netcore-release-30.yml parameters: symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - template: \eng\common\templates\post-build\channels\netcore-release-31.yml parameters: symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - template: \eng\common\templates\post-build\channels\netcore-internal-30.yml parameters: diff --git a/global.json b/global.json index 8c6b8ec55..3275aa5ff 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.0.100-preview6-012264" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19460.3" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19461.7" } } From c84ef86d91878064a3b73d0e8d50d1e107260715 Mon Sep 17 00:00:00 2001 From: riarenas Date: Tue, 10 Sep 2019 12:33:20 -0700 Subject: [PATCH 239/420] Changes for core-sdk to move to yaml stages --- .vsts-ci.yml | 575 +++++++++++++++------------- build.sh | 2 +- eng/Publishing.props | 42 +- eng/build.yml | 12 +- eng/docker/alpine.3.6/Dockerfile | 5 +- eng/docker/centos/Dockerfile | 5 +- eng/docker/debian/Dockerfile | 5 +- eng/docker/fedora.23/Dockerfile | 5 +- eng/docker/fedora.24/Dockerfile | 3 +- eng/docker/fedora.27/Dockerfile | 3 +- eng/docker/fedora.28/Dockerfile | 3 +- eng/docker/fedora.29/Dockerfile | 3 +- eng/docker/opensuse.13.2/Dockerfile | 5 +- eng/docker/opensuse.42.1/Dockerfile | 5 +- eng/docker/opensuse.42.3/Dockerfile | 5 +- eng/docker/rhel.6/Dockerfile | 5 +- eng/docker/rhel/Dockerfile | 5 +- eng/docker/ubuntu.14.04/Dockerfile | 5 +- eng/docker/ubuntu.16.04/Dockerfile | 5 +- eng/docker/ubuntu.16.10/Dockerfile | 5 +- eng/docker/ubuntu.18.04/Dockerfile | 5 +- eng/dockerrun.ps1 | 6 +- eng/dockerrun.sh | 6 +- 23 files changed, 395 insertions(+), 325 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 31dff1c60..53e7c784e 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -12,300 +12,329 @@ variables: value: https://dotnetclichecksums.blob.core.windows.net/dotnet/index.json - name: _ArcadePublishBlobFeedUrl value: https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json +- name: _DotNetArtifactsCategory + value: .NETCoreValidation # temporary variable name, so that we can test this change. +- name: _DotNetValidationArtifactsCategory + value: .NETCoreValidation +- name: _PublishUsingPipelines + value: false - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - group: DotNet-DotNetCli-Storage - group: DotNet-Blob-Feed + - name: _PublishUsingPipelines + value: true -jobs: -- template: /eng/build.yml - parameters: - agentOs: Windows_NT - pool: - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: - name: NetCorePublic-Pool - queue: buildpool.windows.10.amd64.vs2017.open - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - name: NetCoreInternal-Pool - queue: buildpool.windows.10.amd64.vs2017 - timeoutInMinutes: 180 - strategy: - matrix: - # Public-only builds +stages: +- stage: build + jobs: + - template: /eng/build.yml + parameters: + agentOs: Windows_NT + pool: ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: - Build_Debug_x86: - _BuildConfig: Debug - _BuildArchitecture: x86 - _DOTNET_CLI_UI_LANGUAGE: '' - _DropSuffix: '' - Build_ES_Debug_x64: - _BuildConfig: Debug - _BuildArchitecture: x64 - _DOTNET_CLI_UI_LANGUAGE: es - _DropSuffix: '' - Build_DropSuffix_Release_x64: + name: NetCorePublic-Pool + queue: buildpool.windows.10.amd64.vs2017.open + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + name: NetCoreInternal-Pool + queue: buildpool.windows.10.amd64.vs2017 + timeoutInMinutes: 180 + strategy: + matrix: + # Public-only builds + ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + Build_Debug_x86: + _BuildConfig: Debug + _BuildArchitecture: x86 + _DOTNET_CLI_UI_LANGUAGE: '' + _DropSuffix: '' + Build_ES_Debug_x64: + _BuildConfig: Debug + _BuildArchitecture: x64 + _DOTNET_CLI_UI_LANGUAGE: es + _DropSuffix: '' + Build_DropSuffix_Release_x64: + _BuildConfig: Release + _BuildArchitecture: x64 + _DOTNET_CLI_UI_LANGUAGE: '' + _DropSuffix: true + # Internal-only builds + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + Build_Release_x86: + _BuildConfig: Release + _BuildArchitecture: x86 + _DOTNET_CLI_UI_LANGUAGE: '' + _DropSuffix: '' + # Always run builds + Build_Release_x64: _BuildConfig: Release _BuildArchitecture: x64 _DOTNET_CLI_UI_LANGUAGE: '' - _DropSuffix: true - # Internal-only builds - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - Build_Release_x86: + _DropSuffix: '' + _AdditionalBuildParameters: '/p:PublishInternalAsset=true + /p:DotNetPublishBlobFeedKey=$(dotnetfeed-storage-access-key-1) + /p:DotNetPublishBlobFeedUrl=$(_ArcadePublishBlobFeedUrl)' + Build_Release_arm: _BuildConfig: Release - _BuildArchitecture: x86 + _BuildArchitecture: arm _DOTNET_CLI_UI_LANGUAGE: '' _DropSuffix: '' - # Always run builds - Build_Release_x64: - _BuildConfig: Release - _BuildArchitecture: x64 - _DOTNET_CLI_UI_LANGUAGE: '' - _DropSuffix: '' - _AdditionalBuildParameters: '/p:PublishInternalAsset=true - /p:DotNetPublishBlobFeedKey=$(dotnetfeed-storage-access-key-1) - /p:DotNetPublishBlobFeedUrl=$(_ArcadePublishBlobFeedUrl)' - Build_Release_arm: - _BuildConfig: Release - _BuildArchitecture: arm - _DOTNET_CLI_UI_LANGUAGE: '' - _DropSuffix: '' -- template: /eng/build.yml - parameters: - agentOs: Linux - pool: - name: Hosted Ubuntu 1604 - timeoutInMinutes: 180 - strategy: - matrix: - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: - Build_Ubuntu_14_04_Release_x64: - _BuildConfig: Release - _DockerParameter: '--docker ubuntu.14.04' - _LinuxPortable: '' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _DropSuffix: '' - Build_Ubuntu_16_04_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker ubuntu.16.04' - _LinuxPortable: '' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _DropSuffix: '' - Build_Ubuntu_18_04_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker ubuntu.18.04' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _DropSuffix: '' - Build_Fedora_27_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker fedora.27' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _DropSuffix: '' - Build_Fedora_28_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker fedora.28' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _DropSuffix: '' - Build_Fedora_29_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker fedora.29' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _DropSuffix: '' - Build_OpenSUSE_42_3_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker opensuse.42.3' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _DropSuffix: '' - Build_CentOS_7_1_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker centos' - _LinuxPortable: '' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _DropSuffix: '' - Build_Debian_Jessie_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker debian' - _LinuxPortable: '' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _DropSuffix: '' - Build_Rhel_7_2_Release_x64: - _BuildConfig: Release - _DockerParameter: '--docker rhel' - _LinuxPortable: '' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _DropSuffix: '' - Build_Rhel_6_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker rhel.6' - _LinuxPortable: '' - _RuntimeIdentifier: '--runtime-id rhel.6-x64' - _BuildArchitecture: 'x64' - _DropSuffix: '' - Build_Arm_Debug: - _BuildConfig: Debug - _DockerParameter: '' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '--runtime-id linux-arm' - _BuildArchitecture: 'arm' - _DropSuffix: '' - Build_Arm64_Debug: - _BuildConfig: Debug - _DockerParameter: '' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '--runtime-id linux-arm64' - _BuildArchitecture: 'arm64' - _DropSuffix: '' - Build_Linux_musl_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker alpine.3.6' - _LinuxPortable: '' - _RuntimeIdentifier: '--runtime-id linux-musl-x64' - _BuildArchitecture: 'x64' - _DropSuffix: '' - Build_LinuxPortable_NoSuffix_Release_x64: + - template: /eng/build.yml + parameters: + agentOs: Linux + pool: + name: Hosted Ubuntu 1604 + timeoutInMinutes: 180 + strategy: + matrix: + ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + Build_Ubuntu_14_04_Release_x64: + _BuildConfig: Release + _DockerParameter: '--docker ubuntu.14.04' + _LinuxPortable: '' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _DropSuffix: '' + Build_Ubuntu_16_04_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker ubuntu.16.04' + _LinuxPortable: '' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _DropSuffix: '' + Build_Ubuntu_18_04_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker ubuntu.18.04' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _DropSuffix: '' + Build_Fedora_27_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker fedora.27' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _DropSuffix: '' + Build_Fedora_28_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker fedora.28' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _DropSuffix: '' + Build_Fedora_29_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker fedora.29' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _DropSuffix: '' + Build_OpenSUSE_42_3_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker opensuse.42.3' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _DropSuffix: '' + Build_CentOS_7_1_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker centos' + _LinuxPortable: '' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _DropSuffix: '' + Build_Debian_Jessie_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker debian' + _LinuxPortable: '' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _DropSuffix: '' + Build_Rhel_7_2_Release_x64: + _BuildConfig: Release + _DockerParameter: '--docker rhel' + _LinuxPortable: '' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _DropSuffix: '' + Build_Rhel_6_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker rhel.6' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id rhel.6-x64' + _BuildArchitecture: 'x64' + _DropSuffix: '' + Build_Arm_Debug: + _BuildConfig: Debug + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm' + _BuildArchitecture: 'arm' + _DropSuffix: '' + Build_Arm64_Debug: + _BuildConfig: Debug + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm64' + _BuildArchitecture: 'arm64' + _DropSuffix: '' + Build_Linux_musl_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker alpine.3.6' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-x64' + _BuildArchitecture: 'x64' + _DropSuffix: '' + Build_LinuxPortable_NoSuffix_Release_x64: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _DropSuffix: true + Build_Arm_NoSuffix_Release: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm' + _BuildArchitecture: 'arm' + _DropSuffix: true + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + Build_Arm_Release: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm' + _BuildArchitecture: 'arm' + _DropSuffix: '' + Build_Arm64_Release: + _BuildConfig: Release + _DockerParameter: '' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '--runtime-id linux-arm64' + _BuildArchitecture: 'arm64' + _DropSuffix: '' + Build_Rhel_6_Release_x64: + _BuildConfig: Release + _DockerParameter: '--docker rhel.6' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id rhel.6-x64' + _BuildArchitecture: 'x64' + _DropSuffix: '' + Build_Linux_musl_Release_x64: + _BuildConfig: Release + _DockerParameter: '--docker alpine.3.6' + _LinuxPortable: '' + _RuntimeIdentifier: '--runtime-id linux-musl-x64' + _BuildArchitecture: 'x64' + _DropSuffix: '' + Build_Linux_Portable_Deb_Release_x64: + _BuildConfig: Release + _DockerParameter: '--docker ubuntu.16.04' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _DropSuffix: '' + # Do not publish zips and tarballs. The linux-x64 binaries are + # already published by Build_LinuxPortable_Release_x64 + _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false' + Build_Linux_Portable_Rpm_Release_x64: + _BuildConfig: Release + _DockerParameter: '--docker rhel' + _LinuxPortable: '--linux-portable' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' + _DropSuffix: '' + # Do not publish zips and tarballs. The linux-x64 binaries are + # already published by Build_LinuxPortable_Release_x64 + _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false' + Build_LinuxPortable_Release_x64: _BuildConfig: Release _DockerParameter: '' _LinuxPortable: '--linux-portable' _RuntimeIdentifier: '' _BuildArchitecture: 'x64' - _DropSuffix: true - Build_Arm_NoSuffix_Release: - _BuildConfig: Release - _DockerParameter: '' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '--runtime-id linux-arm' - _BuildArchitecture: 'arm' - _DropSuffix: true - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - Build_Arm_Release: - _BuildConfig: Release - _DockerParameter: '' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '--runtime-id linux-arm' - _BuildArchitecture: 'arm' _DropSuffix: '' - Build_Arm64_Release: - _BuildConfig: Release - _DockerParameter: '' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '--runtime-id linux-arm64' - _BuildArchitecture: 'arm64' - _DropSuffix: '' - Build_Rhel_6_Release_x64: - _BuildConfig: Release - _DockerParameter: '--docker rhel.6' - _LinuxPortable: '' - _RuntimeIdentifier: '--runtime-id rhel.6-x64' - _BuildArchitecture: 'x64' - _DropSuffix: '' - Build_Linux_musl_Release_x64: - _BuildConfig: Release - _DockerParameter: '--docker alpine.3.6' - _LinuxPortable: '' - _RuntimeIdentifier: '--runtime-id linux-musl-x64' - _BuildArchitecture: 'x64' - _DropSuffix: '' - Build_Linux_Portable_Deb_Release_x64: - _BuildConfig: Release - _DockerParameter: '--docker ubuntu.16.04' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _DropSuffix: '' - # Do not publish zips and tarballs. The linux-x64 binaries are - # already published by Build_LinuxPortable_Release_x64 - _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false' - Build_Linux_Portable_Rpm_Release_x64: - _BuildConfig: Release - _DockerParameter: '--docker rhel' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _DropSuffix: '' - # Do not publish zips and tarballs. The linux-x64 binaries are - # already published by Build_LinuxPortable_Release_x64 - _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false' - Build_LinuxPortable_Release_x64: - _BuildConfig: Release - _DockerParameter: '' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _DropSuffix: '' -- template: /eng/build.yml - parameters: - agentOs: Darwin - pool: - name: Hosted macOS - timeoutInMinutes: 180 - strategy: - matrix: - Build_Release: - _BuildConfig: Release + - template: /eng/build.yml + parameters: + agentOs: Darwin + pool: + name: Hosted macOS + timeoutInMinutes: 180 + strategy: + matrix: + Build_Release: + _BuildConfig: Release -# https://github.com/dotnet/core-sdk/issues/248 -# - template: /eng/build.yml -# parameters: -# agentOs: FreeBSD -# queue: -# name: dnceng-freebsd-internal -# timeoutInMinutes: 180 -# matrix: -# Build_Release: -# _BuildConfig: Release -# _AdditionalBuildParameters: '/p:DisableSourceLink=true /p:DISABLE_CROSSGEN=true' + # https://github.com/dotnet/core-sdk/issues/248 + # - template: /eng/build.yml + # parameters: + # agentOs: FreeBSD + # queue: + # name: dnceng-freebsd-internal + # timeoutInMinutes: 180 + # matrix: + # Build_Release: + # _BuildConfig: Release + # _AdditionalBuildParameters: '/p:DisableSourceLink=true /p:DISABLE_CROSSGEN=true' + + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: /eng/common/templates/job/publish-build-assets.yml + parameters: + dependsOn: + - Windows_NT + - Linux + - Darwin + publishUsingPipelines: true + pool: + vmImage: vs2017-win2016 + +# - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: +# - template: /eng/common/templates/job/generate-graph-files.yml +# parameters: +# continueOnError: true +# includeToolset: false +# dependsOn: +# - Asset_Registry_Publish +# pool: +# vmImage: vs2017-win2016 - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - job: Copy_SDK_To_Latest + - template: eng\common\templates\post-build\post-build.yml + parameters: + # Symbol validation isn't being very reliable lately. This should be enabled back + # once this issue is resolved: https://github.com/dotnet/arcade/issues/2871 + enableSymbolValidation: false + # This repo doesn't produce any signed packages. + enableSigningValidation: false + publishInstallersAndChecksums: true + enableSourceLinkValidation: false # Disabling for testing in internal-only branc + +- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), not(contains(variables['Build.SourceBranch'], 'refs/heads/internal/'))) }}: + - stage: copy_to_latest + displayName: Copy to latest dependsOn: - - Windows_NT - - Linux - - Darwin - pool: - name: Hosted VS2017 - condition: succeeded() - variables: - - group: DotNet-DotNetCli-Storage - steps: - - script: eng/CopyToLatest.cmd - /p:DotnetPublishSdkAssetsBlobFeedUrl=$(_PublishBlobFeedUrl) - /p:DotNetPublishSdkAssetsBlobFeedKey=$(dotnetcli-storage-key) - /p:DotnetPublishChecksumsBlobFeedUrl=$(_PublishChecksumsBlobFeedUrl) - /p:DotNetPublishChecksumsBlobFeedKey=$(dotnetclichecksums-storage-key) - displayName: Copy to latest - -- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - template: /eng/common/templates/job/publish-build-assets.yml - parameters: - dependsOn: - - Windows_NT - - Linux - - Darwin - enablePublishBuildArtifacts: true + # This will run only after all the publishing stages have run and have been validated. + # These stages are introduced in the eng/common/templates/post-build/channels YAML templates + - NetCore_Dev31_Publish + - NetCore_Dev30_Publish + - NetCore_Dev5_Publish + - NetCore_Release30_Publish + - NetCore_Release31_Publish + - PVR_Publish + jobs: + - job: Copy_SDK_To_Latest pool: - vmImage: vs2017-win2016 - -- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - template: /eng/common/templates/job/generate-graph-files.yml - parameters: - continueOnError: true - includeToolset: false - dependsOn: - - Asset_Registry_Publish - pool: - vmImage: vs2017-win2016 + name: Hosted VS2017 + condition: succeeded() + variables: + - group: DotNet-DotNetCli-Storage + steps: + - script: eng/CopyToLatest.cmd + /p:DotnetPublishSdkAssetsBlobFeedUrl=https://dotnetcli.blob.core.windows.net/riarenas/index.json + /p:DotNetPublishSdkAssetsBlobFeedKey=$(dotnetcli-storage-key) + /p:DotnetPublishChecksumsBlobFeedUrl=https://dotnetclichecksums.blob.core.windows.net/riarenas/index.json + /p:DotNetPublishChecksumsBlobFeedKey=$(dotnetclichecksums-storage-key) + displayName: Copy to latest diff --git a/build.sh b/build.sh index 01aab3a14..7ff647c40 100755 --- a/build.sh +++ b/build.sh @@ -46,7 +46,7 @@ done dockerbuild() { - BUILD_COMMAND=/opt/code/run-build.sh $DIR/eng/dockerrun.sh --non-interactive "$@" + BUILD_COMMAND=$DIR/run-build.sh $DIR/eng/dockerrun.sh --non-interactive "$@" } # Check if we need to build in docker diff --git a/eng/Publishing.props b/eng/Publishing.props index f40cf64be..ed7bbcd19 100644 --- a/eng/Publishing.props +++ b/eng/Publishing.props @@ -9,9 +9,7 @@ $(Product) assets/$(Product) $(DotnetPublishChecksumsBlobFeedUrl) - $(DotNetPublishChecksumsBlobFeedKey) $(DotnetPublishSdkAssetsBlobFeedUrl) - $(DotNetPublishSdkAssetsBlobFeedKey) false true @@ -33,6 +31,9 @@ $(ArtifactsLogDir)AssetManifest\$(AssetManifestFileName).xml $(ArtifactsLogDir)AssetManifest\$(ChecksumsAssetManifestFileName).xml + + $(ArtifactsDir)..\DotnetAssetsTmpDir\$([System.Guid]::NewGuid()) + $(ArtifactsDir)..\ChecksumAssetsTmpDir\$([System.Guid]::NewGuid()) @@ -45,9 +46,7 @@ - - true - + @@ -74,9 +73,10 @@ - + + + + PublishFlatContainer="true" + AssetsTemporaryDirectory="$(DotnetTempWorkingDirectory)" /> - + PublishFlatContainer="true" + AssetsTemporaryDirectory="$(ChecksumTempWorkingDirectory)" /> + + + + + + + + diff --git a/eng/build.yml b/eng/build.yml index 5ceca2945..07ca10348 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -14,13 +14,19 @@ parameters: # Job timeout timeoutInMinutes: 180 + # Publish using pipelines + enablePublishUsingPipelines: true + phases: - template: /eng/common/templates/job/job.yml parameters: name: ${{ parameters.agentOs }} ${{ if eq(parameters.agentOs, 'Windows_NT') }}: enableMicrobuild: true + enablePublishBuildArtifacts: true enablePublishBuildAssets: true + enablePublishTestResults: true + enablePublishUsingPipelines: ${{parameters.enablePublishUsingPipelines}} enableTelemetry: true helixRepo: dotnet/core-sdk pool: ${{ parameters.pool }} @@ -38,20 +44,22 @@ phases: - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - group: DotNet-Symbol-Server-PATs - group: DotNet-HelixApi-Access + - group: DotNet-Blob-Feed - _DotNetPublishToBlobFeed: true - _PushToVSFeed: true - _SignType: real - _BuildArgs: /p:OfficialBuildId=$(BUILD.BUILDNUMBER) /p:DotNetPublishToBlobFeed=$(_DotNetPublishToBlobFeed) + /p:DotNetPublishBlobFeedKey=$(dotnetfeed-storage-access-key-1) + /p:DotNetPublishBlobFeedUrl=$(PB_PublishBlobFeedUrl) /p:DotnetPublishSdkAssetsBlobFeedUrl=$(_PublishBlobFeedUrl) - /p:DotNetPublishSdkAssetsBlobFeedKey=$(dotnetcli-storage-key) /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) /p:PB_PublishType=blob /p:DotnetPublishChecksumsBlobFeedUrl=$(_PublishChecksumsBlobFeedUrl) - /p:DotNetPublishChecksumsBlobFeedKey=$(dotnetclichecksums-storage-key) /p:DotNetSignType=real /p:TeamName=$(_TeamName) + /p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines) steps: - checkout: self diff --git a/eng/docker/alpine.3.6/Dockerfile b/eng/docker/alpine.3.6/Dockerfile index 61bd7a5c8..ac6a7264b 100644 --- a/eng/docker/alpine.3.6/Dockerfile +++ b/eng/docker/alpine.3.6/Dockerfile @@ -21,6 +21,7 @@ RUN chmod -R a+rwx /home # Set user to the one we just created USER ${USER_ID} -# Set working directory -WORKDIR /opt/code +# Set working directory +ARG WORK_DIR +WORKDIR ${WORK_DIR} diff --git a/eng/docker/centos/Dockerfile b/eng/docker/centos/Dockerfile index 101c18973..eec66c48c 100644 --- a/eng/docker/centos/Dockerfile +++ b/eng/docker/centos/Dockerfile @@ -21,5 +21,6 @@ RUN chmod -R 755 /usr/bin/sudo # Set user to the one we just created USER ${USER_ID} -# Set working directory -WORKDIR /opt/code +# Set working directory +ARG WORK_DIR +WORKDIR ${WORK_DIR} diff --git a/eng/docker/debian/Dockerfile b/eng/docker/debian/Dockerfile index e8316daed..6511762c8 100644 --- a/eng/docker/debian/Dockerfile +++ b/eng/docker/debian/Dockerfile @@ -27,5 +27,6 @@ RUN chmod -R 755 /usr/lib/sudo # Set user to the one we just created USER ${USER_ID} -# Set working directory -WORKDIR /opt/code +# Set working directory +ARG WORK_DIR +WORKDIR ${WORK_DIR} diff --git a/eng/docker/fedora.23/Dockerfile b/eng/docker/fedora.23/Dockerfile index b8508bde7..0d156e137 100644 --- a/eng/docker/fedora.23/Dockerfile +++ b/eng/docker/fedora.23/Dockerfile @@ -26,5 +26,6 @@ RUN chmod -R a+rwx /home # Set user to the one we just created USER ${USER_ID} -# Set working directory -WORKDIR /opt/code +# Set working directory +ARG WORK_DIR +WORKDIR ${WORK_DIR} diff --git a/eng/docker/fedora.24/Dockerfile b/eng/docker/fedora.24/Dockerfile index bc33dd00c..ff1edb0a0 100644 --- a/eng/docker/fedora.24/Dockerfile +++ b/eng/docker/fedora.24/Dockerfile @@ -25,4 +25,5 @@ RUN chmod -R a+rwx /home USER ${USER_ID} # Set working directory -WORKDIR /opt/code +ARG WORK_DIR +WORKDIR ${WORK_DIR} diff --git a/eng/docker/fedora.27/Dockerfile b/eng/docker/fedora.27/Dockerfile index e0f6e851d..f6eaa8fbd 100644 --- a/eng/docker/fedora.27/Dockerfile +++ b/eng/docker/fedora.27/Dockerfile @@ -29,4 +29,5 @@ RUN chmod -R a+rwx /home USER ${USER_ID} # Set working directory -WORKDIR /opt/code \ No newline at end of file +ARG WORK_DIR +WORKDIR ${WORK_DIR} \ No newline at end of file diff --git a/eng/docker/fedora.28/Dockerfile b/eng/docker/fedora.28/Dockerfile index f910321b6..5e08f7a19 100644 --- a/eng/docker/fedora.28/Dockerfile +++ b/eng/docker/fedora.28/Dockerfile @@ -26,4 +26,5 @@ RUN chmod -R a+rwx /home USER ${USER_ID} # Set working directory -WORKDIR /opt/code \ No newline at end of file +ARG WORK_DIR +WORKDIR ${WORK_DIR} \ No newline at end of file diff --git a/eng/docker/fedora.29/Dockerfile b/eng/docker/fedora.29/Dockerfile index 0d4430378..a58f30b74 100644 --- a/eng/docker/fedora.29/Dockerfile +++ b/eng/docker/fedora.29/Dockerfile @@ -26,4 +26,5 @@ RUN chmod -R a+rwx /home USER ${USER_ID} # Set working directory -WORKDIR /opt/code \ No newline at end of file +ARG WORK_DIR +WORKDIR ${WORK_DIR} \ No newline at end of file diff --git a/eng/docker/opensuse.13.2/Dockerfile b/eng/docker/opensuse.13.2/Dockerfile index c3cb77eb4..bc8ff4617 100644 --- a/eng/docker/opensuse.13.2/Dockerfile +++ b/eng/docker/opensuse.13.2/Dockerfile @@ -21,5 +21,6 @@ RUN chmod -R 755 /usr/lib/sudo # Set user to the one we just created USER ${USER_ID} -# Set working directory -WORKDIR /opt/code +# Set working directory +ARG WORK_DIR +WORKDIR ${WORK_DIR} diff --git a/eng/docker/opensuse.42.1/Dockerfile b/eng/docker/opensuse.42.1/Dockerfile index d175339a4..fee6378a1 100644 --- a/eng/docker/opensuse.42.1/Dockerfile +++ b/eng/docker/opensuse.42.1/Dockerfile @@ -46,5 +46,6 @@ RUN chmod -R 755 /usr/lib/sudo # Set user to the one we just created USER ${USER_ID} -# Set working directory -WORKDIR /opt/code \ No newline at end of file +# Set working directory +ARG WORK_DIR +WORKDIR ${WORK_DIR} \ No newline at end of file diff --git a/eng/docker/opensuse.42.3/Dockerfile b/eng/docker/opensuse.42.3/Dockerfile index b128f8bc9..d92b408e7 100644 --- a/eng/docker/opensuse.42.3/Dockerfile +++ b/eng/docker/opensuse.42.3/Dockerfile @@ -45,5 +45,6 @@ RUN chmod -R 755 /usr/lib/sudo # Set user to the one we just created USER ${USER_ID} -# Set working directory -WORKDIR /opt/code \ No newline at end of file +# Set working directory +ARG WORK_DIR +WORKDIR ${WORK_DIR} \ No newline at end of file diff --git a/eng/docker/rhel.6/Dockerfile b/eng/docker/rhel.6/Dockerfile index 1275f3293..1895a1e30 100644 --- a/eng/docker/rhel.6/Dockerfile +++ b/eng/docker/rhel.6/Dockerfile @@ -26,6 +26,7 @@ USER ${USER_ID} # Set library path to make CURL and ICU libraries that are in /usr/local/lib visible ENV LD_LIBRARY_PATH /usr/local/lib -# Set working directory -WORKDIR /opt/code +# Set working directory +ARG WORK_DIR +WORKDIR ${WORK_DIR} diff --git a/eng/docker/rhel/Dockerfile b/eng/docker/rhel/Dockerfile index ec809ea73..cd3f4f029 100644 --- a/eng/docker/rhel/Dockerfile +++ b/eng/docker/rhel/Dockerfile @@ -19,5 +19,6 @@ RUN chown root:root /usr/bin/sudo && chmod 4755 /usr/bin/sudo # Set user to the one we just created USER ${USER_ID} -# Set working directory -WORKDIR /opt/code +# Set working directory +ARG WORK_DIR +WORKDIR ${WORK_DIR} diff --git a/eng/docker/ubuntu.14.04/Dockerfile b/eng/docker/ubuntu.14.04/Dockerfile index 995a74b3b..7e7cb6bdb 100644 --- a/eng/docker/ubuntu.14.04/Dockerfile +++ b/eng/docker/ubuntu.14.04/Dockerfile @@ -59,5 +59,6 @@ RUN chmod -R 755 /usr/lib/sudo # Set user to the one we just created USER ${USER_ID} -# Set working directory -WORKDIR /opt/code +# Set working directory +ARG WORK_DIR +WORKDIR ${WORK_DIR} diff --git a/eng/docker/ubuntu.16.04/Dockerfile b/eng/docker/ubuntu.16.04/Dockerfile index 093ade8a3..4713a4b23 100644 --- a/eng/docker/ubuntu.16.04/Dockerfile +++ b/eng/docker/ubuntu.16.04/Dockerfile @@ -52,5 +52,6 @@ RUN chmod -R 755 /usr/lib/sudo # Set user to the one we just created USER ${USER_ID} -# Set working directory -WORKDIR /opt/code +# Set working directory +ARG WORK_DIR +WORKDIR ${WORK_DIR} diff --git a/eng/docker/ubuntu.16.10/Dockerfile b/eng/docker/ubuntu.16.10/Dockerfile index dba98ed7b..0497a6fb5 100644 --- a/eng/docker/ubuntu.16.10/Dockerfile +++ b/eng/docker/ubuntu.16.10/Dockerfile @@ -59,5 +59,6 @@ RUN chmod -R 755 /usr/lib/sudo # Set user to the one we just created USER ${USER_ID} -# Set working directory -WORKDIR /opt/code \ No newline at end of file +# Set working directory +ARG WORK_DIR +WORKDIR ${WORK_DIR} \ No newline at end of file diff --git a/eng/docker/ubuntu.18.04/Dockerfile b/eng/docker/ubuntu.18.04/Dockerfile index 8bd7a99f2..39a9c0327 100644 --- a/eng/docker/ubuntu.18.04/Dockerfile +++ b/eng/docker/ubuntu.18.04/Dockerfile @@ -27,5 +27,6 @@ RUN chmod -R 755 /usr/lib/sudo # Set user to the one we just created USER ${USER_ID} -# Set working directory -WORKDIR /opt/code \ No newline at end of file +# Set working directory +ARG WORK_DIR +WORKDIR ${WORK_DIR} \ No newline at end of file diff --git a/eng/dockerrun.ps1 b/eng/dockerrun.ps1 index 17eae39b4..e3b117258 100644 --- a/eng/dockerrun.ps1 +++ b/eng/dockerrun.ps1 @@ -19,7 +19,7 @@ Write-Host "Additional args: $additionalArgs" $dockerFile = Resolve-Path (Join-Path $RepoRoot "eng\docker\$dockerImageName") -docker build --build-arg USER_ID=1000 -t "$dockerContainerTag" $dockerFile +docker build --build-arg WORK_DIR=$RepoRoot --build-arg USER_ID=1000 -t "$dockerContainerTag" $dockerFile $interactiveFlag = "-i" if ($noninteractive) @@ -31,7 +31,7 @@ if ($noninteractive) docker run $interactiveFlag -t --rm --sig-proxy=true ` --name "$dockerContainerName" ` - -v "${RepoRoot}:/opt/code" ` + -v "${RepoRoot}:${RepoRoot}" ` -e DOTNET_CORESDK_IGNORE_TAR_EXIT_CODE=1 ` -e CHANNEL ` -e DOTNET_BUILD_SKIP_CROSSGEN ` @@ -57,4 +57,4 @@ docker run $interactiveFlag -t --rm --sig-proxy=true ` -e EXTERNALRESTORESOURCES ` -e ARCADE_PARTITION="${dockerImageName}" ` $dockerContainerTag ` - /opt/code/run-build.sh @additionalArgs \ No newline at end of file + ${RepoRoot}/run-build.sh @additionalArgs \ No newline at end of file diff --git a/eng/dockerrun.sh b/eng/dockerrun.sh index 15ecbffe3..ef41e2fa8 100755 --- a/eng/dockerrun.sh +++ b/eng/dockerrun.sh @@ -39,7 +39,7 @@ while [[ $# > 0 ]]; do echo "Options:" echo " The path to the Dockerfile to use to create the build container" echo " The name of an existing Dockerfile folder under eng/docker to use as the Dockerfile" - echo " The command to run once inside the container (/opt/code is mapped to the repo root; defaults to nothing, which runs the default shell)" + echo " The command to run once inside the container (repo root is mapped to DOCKER_HOST_SHARE_DIR; defaults to nothing, which runs the default shell)" exit 0 ;; *) @@ -107,7 +107,7 @@ fi # Build the docker container (will be fast if it is already built) echo "Building Docker Container using Dockerfile: $DOCKERFILE" -docker build --build-arg USER_ID=$(id -u) -t $DOTNET_BUILD_CONTAINER_TAG $DOCKERFILE +docker build --build-arg WORK_DIR=$DOCKER_HOST_SHARE_DIR --build-arg USER_ID=$(id -u) -t $DOTNET_BUILD_CONTAINER_TAG $DOCKERFILE # Run the build in the container echo "Launching build in Docker Container" @@ -118,7 +118,7 @@ echo "Using code from: $DOCKER_HOST_SHARE_DIR" # Note: passwords/keys should not be passed in the environment docker run $INTERACTIVE -t --rm --sig-proxy=true \ --name $DOTNET_BUILD_CONTAINER_NAME \ - -v $DOCKER_HOST_SHARE_DIR:/opt/code \ + -v $DOCKER_HOST_SHARE_DIR:$DOCKER_HOST_SHARE_DIR \ -e CHANNEL \ -e DOTNET_BUILD_SKIP_CROSSGEN \ -e PUBLISH_TO_AZURE_BLOB \ From b954c7799168aa4844961741653dac5c5c718983 Mon Sep 17 00:00:00 2001 From: riarenas Date: Tue, 10 Sep 2019 14:36:39 -0700 Subject: [PATCH 240/420] remove testing changes to prepare PR --- .vsts-ci.yml | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 53e7c784e..6c3d72125 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -13,7 +13,7 @@ variables: - name: _ArcadePublishBlobFeedUrl value: https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json - name: _DotNetArtifactsCategory - value: .NETCoreValidation # temporary variable name, so that we can test this change. + value: .NETCore - name: _DotNetValidationArtifactsCategory value: .NETCoreValidation - name: _PublishUsingPipelines @@ -291,15 +291,15 @@ stages: pool: vmImage: vs2017-win2016 -# - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: -# - template: /eng/common/templates/job/generate-graph-files.yml -# parameters: -# continueOnError: true -# includeToolset: false -# dependsOn: -# - Asset_Registry_Publish -# pool: -# vmImage: vs2017-win2016 + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: /eng/common/templates/job/generate-graph-files.yml + parameters: + continueOnError: true + includeToolset: false + dependsOn: + - Asset_Registry_Publish + pool: + vmImage: vs2017-win2016 - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - template: eng\common\templates\post-build\post-build.yml @@ -310,13 +310,12 @@ stages: # This repo doesn't produce any signed packages. enableSigningValidation: false publishInstallersAndChecksums: true - enableSourceLinkValidation: false # Disabling for testing in internal-only branc - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), not(contains(variables['Build.SourceBranch'], 'refs/heads/internal/'))) }}: - stage: copy_to_latest displayName: Copy to latest dependsOn: - # This will run only after all the publishing stages have run and have been validated. + # This will run only after all the publishing stages have run. # These stages are introduced in the eng/common/templates/post-build/channels YAML templates - NetCore_Dev31_Publish - NetCore_Dev30_Publish From 5387d3d8691295566ad814d0590a320e252fff1a Mon Sep 17 00:00:00 2001 From: riarenas Date: Tue, 10 Sep 2019 14:57:28 -0700 Subject: [PATCH 241/420] fix the feed urls for copy to latest --- .vsts-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 6c3d72125..32cf436a2 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -332,8 +332,8 @@ stages: - group: DotNet-DotNetCli-Storage steps: - script: eng/CopyToLatest.cmd - /p:DotnetPublishSdkAssetsBlobFeedUrl=https://dotnetcli.blob.core.windows.net/riarenas/index.json + /p:DotnetPublishSdkAssetsBlobFeedUrl=https://dotnetcli.blob.core.windows.net/dotnet/index.json /p:DotNetPublishSdkAssetsBlobFeedKey=$(dotnetcli-storage-key) - /p:DotnetPublishChecksumsBlobFeedUrl=https://dotnetclichecksums.blob.core.windows.net/riarenas/index.json + /p:DotnetPublishChecksumsBlobFeedUrl=https://dotnetclichecksums.blob.core.windows.net/dotnet/index.json /p:DotNetPublishChecksumsBlobFeedKey=$(dotnetclichecksums-storage-key) displayName: Copy to latest From ee0209a77daf0d00e9a866936019e2db89b97a9b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 12 Sep 2019 21:06:13 +0000 Subject: [PATCH 242/420] Update dependencies from https://github.com/dotnet/toolset build 20190912.22 (#4786) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19462.22 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc2.19462.5 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9a90820ce..e529f58db 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - e9699df725f74fb4faf2e8592ba4ce0128fb2a9c + 90902dbf44e6fef8a7d36142ce0e8f410c36f529 https://github.com/dotnet/sdk b88161ed99ded0dd598779ad1afe044818422a6f - + https://github.com/dotnet/cli - da3737fde462ef071e52f6f589adda651384cea9 + d3d8e6b6c9ad11fb8b0f821e1b27a20485ca7b0f diff --git a/eng/Versions.props b/eng/Versions.props index 9f80823cb..b8294013d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc2.19462.15 + 3.0.100-rc2.19462.22 @@ -33,7 +33,7 @@ - 3.0.100-rc2.19461.11 + 3.0.100-rc2.19462.5 0.2.0 From 584439a45b9d7b1854f6efd3a938b7aaf7836562 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 12 Sep 2019 22:15:48 +0000 Subject: [PATCH 243/420] Update dependencies from https://github.com/dotnet/toolset build 20190912.23 (#4787) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19462.23 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e529f58db..0d5227429 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 90902dbf44e6fef8a7d36142ce0e8f410c36f529 + c2fb15bac31bd130214425913a0d357973d73e2a https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index b8294013d..1b7cba355 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc2.19462.22 + 3.0.100-rc2.19462.23 From 7359e01d749f09915eeba172a22cd75666b97d99 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 13 Sep 2019 04:05:45 +0000 Subject: [PATCH 244/420] Update dependencies from https://github.com/dotnet/toolset build 20190912.25 (#4793) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19462.25 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d1d371b46..3a99704c8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 2f526bcec0a913c9beb950845466104e673bda6b + fbbfab3eb995b5ecdd92b809b38619ad3071f8e8 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 6359ef780..c5efbf473 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19462.13 + 3.1.100-preview1.19462.25 From ff7b25b53374ad7e51ab7eb9f6eee199f8f35373 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 13 Sep 2019 05:25:49 +0000 Subject: [PATCH 245/420] Update dependencies from https://github.com/dotnet/toolset build 20190912.27 (#4795) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19462.27 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19462.8 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3a99704c8..abc250f5d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - fbbfab3eb995b5ecdd92b809b38619ad3071f8e8 + a8d3527fb2816d377ffabda05fb43b34bb1635db https://github.com/dotnet/sdk b88161ed99ded0dd598779ad1afe044818422a6f - + https://github.com/dotnet/cli - 22df9f6178df2c65b40f6b46b5e26553c3119165 + 25e58e48c0f49360bb5a9c804ca3b2ebeae01246 diff --git a/eng/Versions.props b/eng/Versions.props index c5efbf473..3e63ed8e5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19462.25 + 3.1.100-preview1.19462.27 @@ -33,7 +33,7 @@ - 3.1.100-preview1.19462.3 + 3.1.100-preview1.19462.8 0.2.0 From 7ad16e48f853f33c0fb7ccc1a166e7d0d0152ca8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 13 Sep 2019 08:10:56 +0000 Subject: [PATCH 246/420] Update dependencies from https://github.com/dotnet/arcade build 20190912.5 (#4798) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19462.5 --- eng/Version.Details.xml | 4 ++-- .../channels/netcore-internal-30.yml | 6 +++--- eng/common/tools.ps1 | 18 +++++++++++++++++- eng/common/tools.sh | 16 ++++++++++++++++ global.json | 2 +- 5 files changed, 39 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0d5227429..0f5ab9907 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,9 +65,9 @@ - + https://github.com/dotnet/arcade - 8eb29ba860a3cfcfe68f9a8256caa7efc1f1aaba + 6003ee189f456c92a18b097f226d4927309def27 diff --git a/eng/common/templates/post-build/channels/netcore-internal-30.yml b/eng/common/templates/post-build/channels/netcore-internal-30.yml index 594a1a9a7..053163cf6 100644 --- a/eng/common/templates/post-build/channels/netcore-internal-30.yml +++ b/eng/common/templates/post-build/channels/netcore-internal-30.yml @@ -107,9 +107,9 @@ stages: /p:Configuration=Release /p:PublishInstallersAndChecksums=true /p:ChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl) - /p:ChecksumsTargetStaticFeedKey=$(InternalChecksumsBlobFeedKey) + /p:ChecksumsAzureAccountKey=$(InternalChecksumsBlobFeedKey) /p:InstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl) - /p:InstallersTargetStaticFeedKey=$(InternalInstallersBlobFeedKey) + /p:InstallersAzureAccountKey=$(InternalInstallersBlobFeedKey) /p:PublishToAzureDevOpsNuGetFeeds=true /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v3/index.json' /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' @@ -121,4 +121,4 @@ stages: - template: ../../steps/promote-build.yml parameters: - ChannelId: ${{ variables.InternalServicing_30_Channel_Id }} \ No newline at end of file + ChannelId: ${{ variables.InternalServicing_30_Channel_Id }} diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index bb5638930..91efea940 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -153,6 +153,16 @@ function InitializeDotNetCli([bool]$install) { # Make Sure that our bootstrapped dotnet cli is available in future steps of the Azure Pipelines build Write-PipelinePrependPath -Path $dotnetRoot + + # Work around issues with Azure Artifacts credential provider + # https://github.com/dotnet/arcade/issues/3932 + if ($ci) { + $env:NUGET_PLUGIN_HANDSHAKE_TIMEOUT_IN_SECONDS = 20 + $env:NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS = 20 + Write-PipelineSetVariable -Name 'NUGET_PLUGIN_HANDSHAKE_TIMEOUT_IN_SECONDS' -Value '20' + Write-PipelineSetVariable -Name 'NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS' -Value '20' + } + Write-PipelineSetVariable -Name 'DOTNET_MULTILEVEL_LOOKUP' -Value '0' Write-PipelineSetVariable -Name 'DOTNET_SKIP_FIRST_TIME_EXPERIENCE' -Value '1' @@ -365,7 +375,6 @@ function InitializeBuildTool() { Write-PipelineTelemetryError -Category "InitializeToolset" -Message "/global.json must specify 'tools.dotnet'." ExitWithExitCode 1 } - $buildTool = @{ Path = Join-Path $dotnetRoot "dotnet.exe"; Command = "msbuild"; Tool = "dotnet"; Framework = "netcoreapp2.1" } } elseif ($msbuildEngine -eq "vs") { try { @@ -490,6 +499,13 @@ function Stop-Processes() { function MSBuild() { if ($pipelinesLog) { $buildTool = InitializeBuildTool + + # Work around issues with Azure Artifacts credential provider + # https://github.com/dotnet/arcade/issues/3932 + if ($ci -and $buildTool.Tool -eq "dotnet") { + dotnet nuget locals http-cache -c + } + $toolsetBuildProject = InitializeToolset $path = Split-Path -parent $toolsetBuildProject $path = Join-Path $path (Join-Path $buildTool.Framework "Microsoft.DotNet.Arcade.Sdk.dll") diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 94a1edd7d..757d5b9ea 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -152,6 +152,15 @@ function InitializeDotNetCli { # build steps from using anything other than what we've downloaded. Write-PipelinePrependPath -path "$dotnet_root" + # Work around issues with Azure Artifacts credential provider + # https://github.com/dotnet/arcade/issues/3932 + if [[ "$ci" == true ]]; then + export NUGET_PLUGIN_HANDSHAKE_TIMEOUT_IN_SECONDS=20 + export NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS=20 + Write-PipelineSetVariable -name "NUGET_PLUGIN_HANDSHAKE_TIMEOUT_IN_SECONDS" -value "20" + Write-PipelineSetVariable -name "NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS" -value "20" + fi + Write-PipelineSetVariable -name "DOTNET_MULTILEVEL_LOOKUP" -value "0" Write-PipelineSetVariable -name "DOTNET_SKIP_FIRST_TIME_EXPERIENCE" -value "1" @@ -328,6 +337,13 @@ function MSBuild { if [[ "$pipelines_log" == true ]]; then InitializeBuildTool InitializeToolset + + # Work around issues with Azure Artifacts credential provider + # https://github.com/dotnet/arcade/issues/3932 + if [[ "$ci" == true ]]; then + dotnet nuget locals http-cache -c + fi + local toolset_dir="${_InitializeToolset%/*}" local logger_path="$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.Arcade.Sdk.dll" args=( "${args[@]}" "-logger:$logger_path" ) diff --git a/global.json b/global.json index 3275aa5ff..1538e940a 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.0.100-preview6-012264" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19461.7" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19462.5" } } From f8f773dc98522b000ee01b427098600044a2ae77 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 13 Sep 2019 12:36:20 +0000 Subject: [PATCH 247/420] Update dependencies from https://github.com/dotnet/arcade build 20190913.1 (#4799) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19463.1 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0f5ab9907..c9fb5f09c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,9 +65,9 @@ - + https://github.com/dotnet/arcade - 6003ee189f456c92a18b097f226d4927309def27 + 372f44450f51552a8cf725acf705dc477bd8391f diff --git a/global.json b/global.json index 1538e940a..320d8b25a 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.0.100-preview6-012264" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19462.5" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19463.1" } } From dca04e7030b25f3213085b6f624c12c3e67e2b40 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 13 Sep 2019 17:24:23 +0000 Subject: [PATCH 248/420] [release/3.1.1xx] Update dependencies from dotnet/core-setup (#4792) * Update dependencies from https://github.com/dotnet/core-setup build 20190912.24 - Microsoft.NETCore.App - 3.1.0-preview1.19462.24 - NETStandard.Library.Ref - 2.1.0-preview1.19462.24 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19462.24 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.1-preview1.19462.8 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.0-preview1.19462.15 (parent: Microsoft.WindowsDesktop.App) * Update dependencies from https://github.com/dotnet/core-setup build 20190913.3 - Microsoft.NETCore.App - 3.1.0-preview1.19463.3 - NETStandard.Library.Ref - 2.1.0-preview1.19463.3 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19463.3 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.1-preview1.19462.8 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.0-preview1.19462.15 (parent: Microsoft.WindowsDesktop.App) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index abc250f5d..66b40b6b6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 604ef7a61aea16bc63a402dfcb2bbe5e6b7c5971 + 1e35b022cbc45bd8185cfa3f3151451298bf6de4 - + https://github.com/dotnet/core-setup - 604ef7a61aea16bc63a402dfcb2bbe5e6b7c5971 + 1e35b022cbc45bd8185cfa3f3151451298bf6de4 - + https://github.com/dotnet/core-setup - 604ef7a61aea16bc63a402dfcb2bbe5e6b7c5971 + 1e35b022cbc45bd8185cfa3f3151451298bf6de4 https://github.com/aspnet/AspNetCore @@ -55,13 +55,13 @@ 25e58e48c0f49360bb5a9c804ca3b2ebeae01246 - + https://github.com/dotnet/winforms - 9104c48ca015b5a4c8e029c330af6d68bc11b0b8 + 93ae5ab5d366dc65495de6abb938f6d647eaf291 - + https://github.com/dotnet/wpf - 1c3dd24d7188899a5f12d1caa31630f66bd4c2fd + acd0da083a426b222a54201c9f37860da50a906a diff --git a/eng/Versions.props b/eng/Versions.props index 3e63ed8e5..b4adc8cb5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,11 +16,11 @@ - 4.8.0-rc1.19455.20 + 4.8.1-preview1.19462.8 - 3.0.0-rc1.19455.14 + 3.1.0-preview1.19462.15 @@ -44,7 +44,7 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview1.19458.7 + 3.1.0-preview1.19463.3 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -52,11 +52,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview1.19458.7 + 2.1.0-preview1.19463.3 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview1.19458.7 + 3.1.0-preview1.19463.3 $(MicrosoftWindowsDesktopAppPackageVersion) From 452df8288d5c5650a2fa8234b915ef4735372de8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 13 Sep 2019 22:05:45 +0000 Subject: [PATCH 249/420] Update dependencies from https://github.com/dotnet/toolset build 20190913.12 (#4816) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19463.12 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c9fb5f09c..9dd8b5e32 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - c2fb15bac31bd130214425913a0d357973d73e2a + ff974460e32b3fd399cc69da724f876f1cf04b4e https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 1b7cba355..f45807e34 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc2.19462.23 + 3.0.100-rc2.19463.12 From 8363d7eb49ed604970b2baa5e2b943d70eb3ffcc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 14 Sep 2019 01:30:43 +0000 Subject: [PATCH 250/420] Update dependencies from https://github.com/dotnet/toolset build 20190913.17 (#4818) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19463.17 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9dd8b5e32..ae0babd9d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - ff974460e32b3fd399cc69da724f876f1cf04b4e + e079875d3c6b0b802ff60dd19d09c714c897ea06 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index f45807e34..fd9ac77d3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc2.19463.12 + 3.0.100-rc2.19463.17 From 5c5cd9667f4678becfc38f79e9429713583fbf3e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 13 Sep 2019 18:36:11 -0700 Subject: [PATCH 251/420] [release/3.0.1xx] Update dependencies from dotnet/core-setup (#4815) * Update dependencies from https://github.com/dotnet/core-setup build 20190913.05 - Microsoft.NETCore.App - 3.0.0-rc2-19463-05 - NETStandard.Library.Ref - 2.1.0 - Microsoft.WindowsDesktop.App - 3.0.0-rc2-19463-05 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-rc2.19462.10 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0 (parent: Microsoft.WindowsDesktop.App) * Add a dependency on Microsoft.NETCore.Platforms This is not directly depended upon, but causes Maestro to flow stable feed locations. * Use runtime package version * Fix installer download locations * Update windows desktop installer location * Explicit reference the host model * Make ref package version explicit * Update property used to identify host version * Update apphost versions * Updated property versions to be used for branding, crossgen and bundled versions generation. --- NuGet.config | 5 +++ eng/Version.Details.xml | 45 ++++++++++++++----- eng/Versions.props | 27 ++++++----- src/redist/targets/Branding.targets | 12 ++--- src/redist/targets/Crossgen.targets | 2 +- .../targets/GenerateBundledVersions.targets | 14 +++--- src/redist/targets/GenerateLayout.targets | 26 +++++------ 7 files changed, 82 insertions(+), 49 deletions(-) diff --git a/NuGet.config b/NuGet.config index 227180760..1838fae07 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,6 +6,11 @@ + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ae0babd9d..733d2be36 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,42 @@ - + https://github.com/dotnet/core-setup - 4421cfb105df112492038e5c5a70c24bce48e72f + 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/core-setup - 4421cfb105df112492038e5c5a70c24bce48e72f + 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/core-setup - 4421cfb105df112492038e5c5a70c24bce48e72f + 7d57652f33493fa022125b7f63aad0d70c52d810 + + + https://github.com/dotnet/core-setup + 7d57652f33493fa022125b7f63aad0d70c52d810 + + + https://github.com/dotnet/core-setup + 7d57652f33493fa022125b7f63aad0d70c52d810 + + + https://github.com/dotnet/core-setup + 7d57652f33493fa022125b7f63aad0d70c52d810 + + + https://github.com/dotnet/core-setup + 7d57652f33493fa022125b7f63aad0d70c52d810 + + + https://github.com/dotnet/core-setup + 7d57652f33493fa022125b7f63aad0d70c52d810 + + + + https://github.com/dotnet/corefx + 4ac4c0367003fe3973a3648eb0715ddb0e3bbcea https://github.com/aspnet/AspNetCore @@ -55,13 +80,13 @@ d3d8e6b6c9ad11fb8b0f821e1b27a20485ca7b0f - + https://github.com/dotnet/winforms - dc6297c0fb269c3a78ce36333012753c6555aeb9 + 1a89b41114eb292f835ed7038fd3cba3a02896f7 - + https://github.com/dotnet/wpf - 14e10bf45f490943b79e3fbca0141d9ecc4f85ed + 3e99215204ccf7ae18e7c654ebdd77c91b7140e2 diff --git a/eng/Versions.props b/eng/Versions.props index fd9ac77d3..8a665e94e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,11 +16,11 @@ - 4.8.0-rc1.19453.3 + 4.8.0-rc2.19462.10 - 3.0.0-rc2.19459.11 + 3.0.0 @@ -44,19 +44,22 @@ $(MicrosoftNETSdkPackageVersion) - 3.0.0-rc2-19460-02 + 3.0.0 + 3.0.0-rc2-19463-05 $(MicrosoftNETCoreAppPackageVersion) - $(MicrosoftNETCoreAppPackageVersion) - $(MicrosoftNETCoreAppPackageVersion) - $(MicrosoftNETCoreAppPackageVersion) - $(MicrosoftNETCoreAppPackageVersion) - $(MicrosoftNETCoreAppPackageVersion) - $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-rc2-19460-02 - $(MicrosoftNETCoreAppPackageVersion) + 3.0.0 + 3.0.0 + $(MicrosoftNETCoreDotNetHostResolverPackageVersion) + $(MicrosoftNETCoreDotNetAppHostPackageVersion) + 3.0.0 + $(MicrosoftNETCoreAppRefPackageVersion) + $(MicrosoftNETCoreDotNetAppHostPackageVersion) + 2.1.0 + $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-rc2-19460-02 + 3.0.0 + 3.0.0-rc2-19463-05 $(MicrosoftWindowsDesktopAppPackageVersion) diff --git a/src/redist/targets/Branding.targets b/src/redist/targets/Branding.targets index e70d058c2..6045307e6 100644 --- a/src/redist/targets/Branding.targets +++ b/src/redist/targets/Branding.targets @@ -4,12 +4,12 @@ cli Microsoft .NET Core SDK $(CliBrandingVersion) .NET Standard Support for Visual Studio 2015 - Microsoft .NET Core Runtime $(MicrosoftNETCoreAppPackageVersion) - Microsoft .NET Core Targeting Pack $(MicrosoftNETCoreAppPackageVersion) - Microsoft .NET Standard 2.1 Targeting Pack $(MicrosoftNETCoreAppPackageVersion) - Microsoft .NET AppHost Pack $(MicrosoftNETCoreAppPackageVersion) - Microsoft .NET Core Host $(MicrosoftNETCoreAppPackageVersion) - Microsoft .NET Core Host FX Resolver $(MicrosoftNETCoreAppPackageVersion) + Microsoft .NET Core Runtime $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) + Microsoft .NET Core Targeting Pack $(MicrosoftNETCoreAppRefPackageVersion) + Microsoft .NET Standard 2.1 Targeting Pack $(NETStandardLibraryRefPackageVersion) + Microsoft .NET AppHost Pack $(MicrosoftNETCoreDotNetAppHostPackageVersion) + Microsoft .NET Core Host $(MicrosoftNETCoreDotNetAppHostPackageVersion) + Microsoft .NET Core Host FX Resolver $(MicrosoftNETCoreDotNetAppHostPackageVersion) Microsoft.NETCore.App $(SharedFrameworkName) Microsoft .NET Core 3.0 Templates diff --git a/src/redist/targets/Crossgen.targets b/src/redist/targets/Crossgen.targets index 428e3c261..3f9abbe7b 100644 --- a/src/redist/targets/Crossgen.targets +++ b/src/redist/targets/Crossgen.targets @@ -14,7 +14,7 @@ x86_arm x64_arm $(NuGetPackageRoot)/$(RuntimeNETCoreAppPackageName)/$(MicrosoftNETCoreAppPackageVersion)/runtimes/$(LibCLRJitRid)/native/$(DynamicLibPrefix)clrjit$(DynamicLibExtension) - $(RedistLayoutPath)shared/$(SharedFrameworkName)/$(MicrosoftNETCoreAppPackageVersion) + $(RedistLayoutPath)shared/$(SharedFrameworkName)/$(MicrosoftNETCoreAppRuntimewinx64PackageVersion) * x86 diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index b92727fc0..f20f4975d 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -26,7 +26,7 @@ Text="Failed to determine the Microsoft.NETCore.Platforms version pulled in Microsoft.NETCore.App" /> - <_NETCoreAppPackageVersion>$(MicrosoftNETCoreAppPackageVersion) + <_NETCoreAppPackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion) <_NETStandardLibraryPackageVersion>@(_NETStandardLibraryPackageVersions->Distinct()) <_NETCorePlatformsPackageVersion>@(_NETCorePlatformsPackageVersions->Distinct()) @@ -193,8 +193,8 @@ Copyright (c) .NET Foundation. All rights reserved. dotnet-host$(InstallerStartSuffix)-$(SharedHostVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) dotnet-hostfxr$(InstallerStartSuffix)-$(HostFxrVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) - dotnet-runtime$(InstallerStartSuffix)-$(MicrosoftNETCoreAppPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) + dotnet-runtime$(InstallerStartSuffix)-$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) dotnet-runtime-deps-$(SharedHostVersion)-$(RuntimeDepsInstallerFileRid)$(InstallerExtension) - windowsdesktop-runtime-$(MicrosoftWindowsDesktopPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) + windowsdesktop-runtime-$(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) dotnet-targeting-pack-$(NetCoreAppTargetingPackVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) dotnet-apphost-pack-$(NetCoreAppHostPackVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) windowsdesktop-targeting-pack-$(WindowsDesktopTargetingPackVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) @@ -46,7 +46,7 @@ $(CoreSetupRid) $(ProductMonikerRid) linux-$(Architecture) - dotnet-runtime-$(MicrosoftNETCoreAppPackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) + dotnet-runtime-$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) $(SharedFrameworkRid) linux-x64 @@ -60,7 +60,7 @@ aspnetcore-targeting-pack-$(AspNetTargetingPackVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension) aspnetcore-targeting-pack-$(AspNetCoreVersion)$(ArchiveExtension) aspnetcore-runtime-internal-$(AspNetCoreVersion)-$(AspNetCoreSharedFxArchiveRid)$(ArchiveExtension) - windowsdesktop-runtime-$(MicrosoftWindowsDesktopPackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) + windowsdesktop-runtime-$(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) aspnetcore_base_runtime.version @@ -70,7 +70,7 @@ $(CoreSetupBlobRootUrl)Runtime/ $(CoreSetupBlobRootUrl)aspnetcore/Runtime/ $(CoreSetupRootUrl) - $(IntermediateDirectory)/coreSetupDownload/$(MicrosoftNETCoreAppPackageVersion) + $(IntermediateDirectory)/coreSetupDownload/$(MicrosoftNETCoreAppRuntimewinx64PackageVersion) $(CoreSetupDownloadDirectory)/combinedSharedHostAndFrameworkArchive$(ArchiveExtension) @@ -81,7 +81,7 @@ - $(CoreSetupRootUrl)$(MicrosoftNETCoreAppPackageVersion) + $(CoreSetupRootUrl)$(MicrosoftNETCoreAppRuntimewinx64PackageVersion) $(CombinedFrameworkHostCompressedFileName) $(CoreSetupBlobAccessTokenParam) @@ -124,14 +124,14 @@ - $(CoreSetupRootUrl)$(MicrosoftNETCoreAppPackageVersion) + $(CoreSetupRootUrl)$(MicrosoftNETCoreAppRuntimewinx64PackageVersion) $(DownloadedRuntimeDepsInstallerFileName) $(CoreSetupBlobAccessTokenParam) - $(CoreSetupRootUrl)$(MicrosoftNETCoreAppPackageVersion) + $(CoreSetupRootUrl)$(MicrosoftNETCoreAppRuntimewinx64PackageVersion) $(DownloadedSharedFrameworkInstallerFileName) $(CoreSetupBlobAccessTokenParam) @@ -159,14 +159,14 @@ - $(CoreSetupRootUrl)$(MicrosoftNETCoreAppPackageVersion) + $(CoreSetupRootUrl)$(MicrosoftNETCoreAppRuntimewinx64PackageVersion) $(DownloadedNetStandardTargetingPackInstallerFileName) $(CoreSetupBlobAccessTokenParam) - $(CoreSetupRootUrl)$(MicrosoftNETCoreAppPackageVersion) + $(CoreSetupRootUrl)$(MicrosoftNETCoreAppRuntimewinx64PackageVersion) $(DownloadedNetCoreAppHostPackInstallerFileName) $(CoreSetupBlobAccessTokenParam) @@ -241,14 +241,14 @@ - $(WinFormsAndWpfSharedFxRootUrl)$(MicrosoftWindowsDesktopPackageVersion) + $(WinFormsAndWpfSharedFxRootUrl)$(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion) $(WinFormsAndWpfSharedFxArchiveFileName) $(CoreSetupBlobAccessTokenParam) - $(WinFormsAndWpfSharedFxRootUrl)$(MicrosoftWindowsDesktopPackageVersion) + $(WinFormsAndWpfSharedFxRootUrl)$(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion) $(DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName) $(CoreSetupBlobAccessTokenParam) @@ -340,7 +340,7 @@ "version": ".*" - "version": "$(MicrosoftNETCoreAppPackageVersion)" + "version": "$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)" From f716ad2d7f8162041b0ef580534fb2252b530a3d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 14 Sep 2019 03:37:14 +0000 Subject: [PATCH 252/420] [release/3.0.1xx] Update dependencies from dotnet/toolset (#4819) * Update dependencies from https://github.com/dotnet/toolset build 20190913.19 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19463.19 * Update dependencies from https://github.com/dotnet/toolset build 20190913.20 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19463.20 --- NuGet.config | 2 +- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1838fae07..546ec5316 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,8 +8,8 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 733d2be36..7977ebe6c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -67,9 +67,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - e079875d3c6b0b802ff60dd19d09c714c897ea06 + 466b15ef4d692ad5d254bd0cf20ca63f60ee917a https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 8a665e94e..a24122dcc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc2.19463.17 + 3.0.100-rc2.19463.20 From 1a7ecd0cc12bcd6908e644b5fe5536529ba12133 Mon Sep 17 00:00:00 2001 From: Livar Date: Fri, 13 Sep 2019 22:47:37 -0700 Subject: [PATCH 253/420] Updating dotnet/sdk version (#4820) * Updating dotnet/sdk version * Updating dotnet/sdk on version.props --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7977ebe6c..a2e019a9a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,9 +71,9 @@ https://github.com/dotnet/toolset 466b15ef4d692ad5d254bd0cf20ca63f60ee917a - + https://github.com/dotnet/sdk - b88161ed99ded0dd598779ad1afe044818422a6f + 1b90fa144c9c49d2f133a7a8e3fb19522ff72e83 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index a24122dcc..2ae826b5b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 3.0.100-rc2.19455.7 + 3.0.100-rc2.19463.5 $(MicrosoftNETSdkPackageVersion) From 5629ed250f9d016ca50e1f5bd1e89baace3491cb Mon Sep 17 00:00:00 2001 From: Livar Date: Fri, 13 Sep 2019 22:51:09 -0700 Subject: [PATCH 254/420] Updating dotnet/cli (#4821) * Updating dotnet/cli on version.details.xml * Updating dotnet/cli on versions.props --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a2e019a9a..686f04ecd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,9 +75,9 @@ https://github.com/dotnet/sdk 1b90fa144c9c49d2f133a7a8e3fb19522ff72e83 - + https://github.com/dotnet/cli - d3d8e6b6c9ad11fb8b0f821e1b27a20485ca7b0f + f7d1998e78088c8f7061a303a42685121b377b49 diff --git a/eng/Versions.props b/eng/Versions.props index 2ae826b5b..edf6bc418 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 3.0.100-rc2.19462.5 + 3.0.100-rc2.19463.15 0.2.0 From 30cd361781d2a3c0dc88c585d183392a8c2a3bb5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 14 Sep 2019 06:15:12 +0000 Subject: [PATCH 255/420] Update dependencies from https://github.com/dotnet/toolset build 20190913.22 (#4822) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19463.22 Dependency coherency updates - Microsoft.NET.Sdk - 3.0.100-rc2.19463.5 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 686f04ecd..bff4536e3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -67,9 +67,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 466b15ef4d692ad5d254bd0cf20ca63f60ee917a + 180252516c5146fc3b553689542af036d0a36be8 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index edf6bc418..680da853e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc2.19463.20 + 3.0.100-rc2.19463.22 From d43be6db8b4dfef149f76a95fb38d2e801404bcf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 14 Sep 2019 06:45:56 +0000 Subject: [PATCH 256/420] Update dependencies from https://github.com/dotnet/toolset build 20190913.23 (#4823) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19463.23 Dependency coherency updates - Microsoft.DotNet.Common.ItemTemplates - 3.0.0-rc1.19463.2 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bff4536e3..8f61170ce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -63,13 +63,13 @@ https://github.com/aspnet/AspNetCore 04705ee4f1ae72c839c63af2e281ad9526602b5e - + https://github.com/dotnet/templating - e8d6da33000a416b2b36b4f04b1756dcc99f671d + e50a0698b5211eb99e9eda7aae6db38559435114 - + https://github.com/dotnet/toolset - 180252516c5146fc3b553689542af036d0a36be8 + c84d43efd5ba5a51cc046acd1e741121d6a81e30 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 680da853e..59437eb1e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc2.19463.22 + 3.0.100-rc2.19463.23 From 0801786e338616d39728fd47df7cf8ff9a335f0e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 14 Sep 2019 15:00:46 +0000 Subject: [PATCH 257/420] Update dependencies from https://github.com/dotnet/toolset build 20190914.6 (#4832) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19464.6 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8f61170ce..05f500c7b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -67,9 +67,9 @@ https://github.com/dotnet/templating e50a0698b5211eb99e9eda7aae6db38559435114 - + https://github.com/dotnet/toolset - c84d43efd5ba5a51cc046acd1e741121d6a81e30 + a7c7eef7b808d83ccfe025555ef57ea6508e2bdf https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 59437eb1e..dd7065354 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc2.19463.23 + 3.0.100-rc2.19464.6 From 22fca6d5afac4b4cf1dba5b22f4e22d35c8520ae Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 14 Sep 2019 20:25:50 +0000 Subject: [PATCH 258/420] Update dependencies from https://github.com/dotnet/toolset build 20190914.7 (#4836) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19464.7 Dependency coherency updates - Microsoft.DotNet.Common.ItemTemplates - 3.0.0 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc2.19464.4 (parent: Microsoft.Dotnet.Toolset.Internal) --- NuGet.config | 1 + eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/NuGet.config b/NuGet.config index 546ec5316..45c5db109 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 05f500c7b..111ba900c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -63,21 +63,21 @@ https://github.com/aspnet/AspNetCore 04705ee4f1ae72c839c63af2e281ad9526602b5e - + https://github.com/dotnet/templating - e50a0698b5211eb99e9eda7aae6db38559435114 + b2663fb07294f5d6cf3caa927d58f7cbebf7d626 - + https://github.com/dotnet/toolset - a7c7eef7b808d83ccfe025555ef57ea6508e2bdf + 45f55cbe9364ff7fcf8516b384dfaf579ad95adf https://github.com/dotnet/sdk 1b90fa144c9c49d2f133a7a8e3fb19522ff72e83 - + https://github.com/dotnet/cli - f7d1998e78088c8f7061a303a42685121b377b49 + f159b76b711aecbf790cbcd28c73da77650bb40b diff --git a/eng/Versions.props b/eng/Versions.props index dd7065354..76ebb20e3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc2.19464.6 + 3.0.100-rc2.19464.7 @@ -33,7 +33,7 @@ - 3.0.100-rc2.19463.15 + 3.0.100-rc2.19464.4 0.2.0 From 7532188c47583fa0256044740e31c8e5955cb1b5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 15 Sep 2019 01:57:40 +0000 Subject: [PATCH 259/420] [release/3.0.1xx] Update dependencies from dotnet/toolset (#4837) * Update dependencies from https://github.com/dotnet/toolset build 20190914.8 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19464.8 * Update dependencies from https://github.com/dotnet/toolset build 20190914.9 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19464.9 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc2.19464.5 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 111ba900c..2486acd8b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -67,17 +67,17 @@ https://github.com/dotnet/templating b2663fb07294f5d6cf3caa927d58f7cbebf7d626 - + https://github.com/dotnet/toolset - 45f55cbe9364ff7fcf8516b384dfaf579ad95adf + 8aed43de2ce59f24271f94b9dee3762f46cf8aa3 https://github.com/dotnet/sdk 1b90fa144c9c49d2f133a7a8e3fb19522ff72e83 - + https://github.com/dotnet/cli - f159b76b711aecbf790cbcd28c73da77650bb40b + 78dd5c129f5a54083fd0dbed4f6479756dad34d1 diff --git a/eng/Versions.props b/eng/Versions.props index 76ebb20e3..a597cdfbf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc2.19464.7 + 3.0.100-rc2.19464.9 @@ -33,7 +33,7 @@ - 3.0.100-rc2.19464.4 + 3.0.100-rc2.19464.5 0.2.0 From 4ac1073f5f74664e558cc3e036502c547a4a831a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 15 Sep 2019 03:57:51 +0000 Subject: [PATCH 260/420] [release/3.0.1xx] Update dependencies from aspnet/AspNetCore (#4838) * Update dependencies from https://github.com/aspnet/AspNetCore build 20190914.3 - dotnet-user-secrets - 3.0.0-rc2.19464.3 - dotnet-watch - 3.0.0-rc2.19464.3 - Microsoft.AspNetCore.App.Ref - 3.0.0-rc2.19464.3 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-rc2.19464.3 - dotnet-dev-certs - 3.0.0-rc2.19464.3 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-rc2.19464.3 * Update dependencies from https://github.com/aspnet/AspNetCore build 20190914.5 - dotnet-user-secrets - 3.0.0-rc2.19464.5 - dotnet-watch - 3.0.0-rc2.19464.5 - Microsoft.AspNetCore.App.Ref - 3.0.0-rc2.19464.5 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-rc2.19464.5 - dotnet-dev-certs - 3.0.0-rc2.19464.5 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-rc2.19464.5 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2486acd8b..62fcc5765 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -39,29 +39,29 @@ https://github.com/dotnet/corefx 4ac4c0367003fe3973a3648eb0715ddb0e3bbcea - + https://github.com/aspnet/AspNetCore - 04705ee4f1ae72c839c63af2e281ad9526602b5e + adc28fdb422cd9306b65c9f67ced13aaecce8f76 - + https://github.com/aspnet/AspNetCore - 04705ee4f1ae72c839c63af2e281ad9526602b5e + adc28fdb422cd9306b65c9f67ced13aaecce8f76 - + https://github.com/aspnet/AspNetCore - 04705ee4f1ae72c839c63af2e281ad9526602b5e + adc28fdb422cd9306b65c9f67ced13aaecce8f76 - + https://github.com/aspnet/AspNetCore - 04705ee4f1ae72c839c63af2e281ad9526602b5e + adc28fdb422cd9306b65c9f67ced13aaecce8f76 - + https://github.com/aspnet/AspNetCore - 04705ee4f1ae72c839c63af2e281ad9526602b5e + adc28fdb422cd9306b65c9f67ced13aaecce8f76 - + https://github.com/aspnet/AspNetCore - 04705ee4f1ae72c839c63af2e281ad9526602b5e + adc28fdb422cd9306b65c9f67ced13aaecce8f76 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index a597cdfbf..87e1d023b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-rc2.19460.8 - 3.0.0-rc2.19460.8 - 3.0.0-rc2.19460.8 - 3.0.0-rc2.19460.8 - 3.0.0-rc2.19460.8 - 3.0.0-rc2.19460.8 + 3.0.0-rc2.19464.5 + 3.0.0-rc2.19464.5 + 3.0.0-rc2.19464.5 + 3.0.0-rc2.19464.5 + 3.0.0-rc2.19464.5 + 3.0.0-rc2.19464.5 From 968532c3a581e46d399f41c89223d6fd89fecb8b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 15 Sep 2019 05:10:15 +0000 Subject: [PATCH 261/420] Update dependencies from https://github.com/dotnet/toolset build 20190914.11 (#4839) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19464.11 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 62fcc5765..1431f16be 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -67,9 +67,9 @@ https://github.com/dotnet/templating b2663fb07294f5d6cf3caa927d58f7cbebf7d626 - + https://github.com/dotnet/toolset - 8aed43de2ce59f24271f94b9dee3762f46cf8aa3 + 190c875afd81cfef173eb24d27eb0b0539e7f283 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 87e1d023b..34585d8c5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc2.19464.9 + 3.0.100-rc2.19464.11 From 969693d5f7f27267d50e6e1ec5f7e0f46d4bd70b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 15 Sep 2019 05:46:02 +0000 Subject: [PATCH 262/420] Update dependencies from https://github.com/dotnet/toolset build 20190914.12 (#4840) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19464.12 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc2.19464.6 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1431f16be..2481234e3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -67,17 +67,17 @@ https://github.com/dotnet/templating b2663fb07294f5d6cf3caa927d58f7cbebf7d626 - + https://github.com/dotnet/toolset - 190c875afd81cfef173eb24d27eb0b0539e7f283 + 101b4dcd298a6280c59ffcffaccbdad7ba769a27 https://github.com/dotnet/sdk 1b90fa144c9c49d2f133a7a8e3fb19522ff72e83 - + https://github.com/dotnet/cli - 78dd5c129f5a54083fd0dbed4f6479756dad34d1 + ba4692dcf8bfa7b377695a667bd201265d3ebbc0 diff --git a/eng/Versions.props b/eng/Versions.props index 34585d8c5..548aa8369 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc2.19464.11 + 3.0.100-rc2.19464.12 @@ -33,7 +33,7 @@ - 3.0.100-rc2.19464.5 + 3.0.100-rc2.19464.6 0.2.0 From b6037e6820a44b9fbf1497f1d6b90a565488d235 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 15 Sep 2019 17:27:29 -0700 Subject: [PATCH 263/420] [release/3.0.1xx] Update dependencies from aspnet/AspNetCore (#4851) * Update dependencies from https://github.com/aspnet/AspNetCore build 20190915.2 - dotnet-user-secrets - 3.0.0-rc2.19465.2 - dotnet-watch - 3.0.0-rc2.19465.2 - Microsoft.AspNetCore.App.Ref - 3.0.0 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0 - dotnet-dev-certs - 3.0.0-rc2.19465.2 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-rc2.19465.2 * Correctly identify aspnetcore blob subdir --- NuGet.config | 1 + eng/Version.Details.xml | 24 +++++++++++------------ eng/Versions.props | 12 ++++++------ src/redist/targets/GenerateLayout.targets | 17 +++++++++++----- 4 files changed, 31 insertions(+), 23 deletions(-) diff --git a/NuGet.config b/NuGet.config index 45c5db109..614cc2ca1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,6 +11,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2481234e3..53f6e55a5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -39,29 +39,29 @@ https://github.com/dotnet/corefx 4ac4c0367003fe3973a3648eb0715ddb0e3bbcea - + https://github.com/aspnet/AspNetCore - adc28fdb422cd9306b65c9f67ced13aaecce8f76 + aee5e4080331553ea9dfb7fb388b6d72f715bf6a - + https://github.com/aspnet/AspNetCore - adc28fdb422cd9306b65c9f67ced13aaecce8f76 + aee5e4080331553ea9dfb7fb388b6d72f715bf6a - + https://github.com/aspnet/AspNetCore - adc28fdb422cd9306b65c9f67ced13aaecce8f76 + aee5e4080331553ea9dfb7fb388b6d72f715bf6a - + https://github.com/aspnet/AspNetCore - adc28fdb422cd9306b65c9f67ced13aaecce8f76 + aee5e4080331553ea9dfb7fb388b6d72f715bf6a - + https://github.com/aspnet/AspNetCore - adc28fdb422cd9306b65c9f67ced13aaecce8f76 + aee5e4080331553ea9dfb7fb388b6d72f715bf6a - + https://github.com/aspnet/AspNetCore - adc28fdb422cd9306b65c9f67ced13aaecce8f76 + aee5e4080331553ea9dfb7fb388b6d72f715bf6a https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 548aa8369..291236f94 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-rc2.19464.5 - 3.0.0-rc2.19464.5 - 3.0.0-rc2.19464.5 - 3.0.0-rc2.19464.5 - 3.0.0-rc2.19464.5 - 3.0.0-rc2.19464.5 + 3.0.0 + 3.0.0 + 3.0.0-rc2.19465.2 + 3.0.0-rc2.19465.2 + 3.0.0-rc2.19465.2 + 3.0.0-rc2.19465.2 diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index ce0cfe239..812329f22 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -7,6 +7,13 @@ $(BaseOutputPath)$(Configuration)\templates-2.1\ $(IntermediateOutputPath)downloads\ + + + + $(MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion) + @@ -188,7 +195,7 @@ - $(AspNetCoreSharedFxRootUrl)$(AspNetCoreVersion) + $(AspNetCoreSharedFxRootUrl)$(AspNetCoreBlobDirectory) $(AspNetCoreSharedFxArchiveFileName) $(CoreSetupBlobAccessTokenParam) @@ -198,7 +205,7 @@ https://github.com/aspnet/AspNetCore/issues/8806 --> - $(AspNetCoreSharedFxRootUrl)$(AspNetCoreVersion) + $(AspNetCoreSharedFxRootUrl)$(AspNetCoreBlobDirectory) $(AspNetTargetingPackArchiveFileName) $(CoreSetupBlobAccessTokenParam) @@ -206,21 +213,21 @@ - $(AspNetCoreSharedFxRootUrl)$(AspNetTargetingPackVersion) + $(AspNetCoreSharedFxRootUrl)$(AspNetCoreBlobDirectory) $(DownloadedAspNetTargetingPackInstallerFileName) $(CoreSetupBlobAccessTokenParam) - $(AspNetCoreSharedFxRootUrl)$(AspNetCoreVersion) + $(AspNetCoreSharedFxRootUrl)$(AspNetCoreBlobDirectory) $(DownloadedAspNetCoreSharedFxInstallerFileName) $(CoreSetupBlobAccessTokenParam) - $(AspNetCoreSharedFxRootUrl)$(AspNetCoreVersion) + $(AspNetCoreSharedFxRootUrl)$(AspNetCoreBlobDirectory) $(AspNetCoreSharedFxBaseRuntimeVersionFileName) $(CoreSetupBlobAccessTokenParam) From 06dd6a37ff0ffde010fa1586aaceadf349095ac4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 15 Sep 2019 17:41:40 -0700 Subject: [PATCH 264/420] Update dependencies from https://github.com/dotnet/toolset build 20190915.6 (#4852) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19465.6 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc2.19465.3 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 53f6e55a5..5de7724d5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -67,17 +67,17 @@ https://github.com/dotnet/templating b2663fb07294f5d6cf3caa927d58f7cbebf7d626 - + https://github.com/dotnet/toolset - 101b4dcd298a6280c59ffcffaccbdad7ba769a27 + 4e1936a575cdeddf29fd1662a77216f2ea05800b https://github.com/dotnet/sdk 1b90fa144c9c49d2f133a7a8e3fb19522ff72e83 - + https://github.com/dotnet/cli - ba4692dcf8bfa7b377695a667bd201265d3ebbc0 + 2e8e081e586a2fba649f4639085ee5a389193244 diff --git a/eng/Versions.props b/eng/Versions.props index 291236f94..8baac0098 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc2.19464.12 + 3.0.100-rc2.19465.6 @@ -33,7 +33,7 @@ - 3.0.100-rc2.19464.6 + 3.0.100-rc2.19465.3 0.2.0 From 2834b772788e1a88108778ce595f80c991eb33b8 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Sun, 15 Sep 2019 17:41:50 -0700 Subject: [PATCH 265/420] Stabilize package versions (#4833) --- src/redist/targets/Versions.targets | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/redist/targets/Versions.targets b/src/redist/targets/Versions.targets index ee1a41dc0..5bace50b7 100644 --- a/src/redist/targets/Versions.targets +++ b/src/redist/targets/Versions.targets @@ -5,6 +5,10 @@ 1 00 rc2 + + true From d71c243ebf48891a83a1e55e0612db4d41ac0488 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Sun, 15 Sep 2019 19:49:11 -0700 Subject: [PATCH 266/420] Empty commit to update commit height From 02df19ceac5d194d71b04c2823b9b02ced542c44 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Sun, 15 Sep 2019 22:25:54 -0700 Subject: [PATCH 267/420] Remove unneeded package sources (#4853) * Remove unneeded package sources Remove many packages sources that are no longer needed. We think this may be increasing restore time and thus parallel builds of test projects are timing out while accessing the feeds. --- NuGet.config | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 614cc2ca1..64f186fd2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,12 +18,8 @@ - - - - - - + + From 88949b55f559022b66b37f075fe967a3dfa64e8d Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Mon, 16 Sep 2019 10:47:04 -0700 Subject: [PATCH 268/420] Fix "you are using a preview version" message (#4860) The property in the bundled version props file installed with the SDK is _NETCoreSdkIsPreview. We use the same property name to define this value when creating the props file. We build with a preview version of the SDK. Because this is set by the preview SDK, and already has a value, we will not reset it when DropSuffix=true. It will simply remain 'true'. Thus we will simply propagate that existing value into the new props file. To fix, change the property name. --- src/redist/targets/GenerateBundledVersions.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index f20f4975d..b440f78e1 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -34,7 +34,7 @@ <_NETCoreAppTargetFrameworkVersion>$(_NETCoreAppPackageVersion.Split('.')[0]).$(_NETCoreAppPackageVersion.Split('.')[1]) <_NETStandardTargetFrameworkVersion>$(_NETStandardLibraryPackageVersion.Split('.')[0]).$(_NETStandardLibraryPackageVersion.Split('.')[1]) - <_NETCoreSdkIsPreview Condition=" '$(DropSuffix)' != 'true' ">true + true From 8dbe4ac1bc0ee7b6fd34d8093a1788021b21eaee Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Mon, 16 Sep 2019 15:39:36 -0700 Subject: [PATCH 271/420] Remove generate graph files (#4867) Takes too long and output isn't quite as useful as it once was (BARViz does most of the work) --- .vsts-ci.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 32cf436a2..6b1c79247 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -291,16 +291,6 @@ stages: pool: vmImage: vs2017-win2016 - - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - template: /eng/common/templates/job/generate-graph-files.yml - parameters: - continueOnError: true - includeToolset: false - dependsOn: - - Asset_Registry_Publish - pool: - vmImage: vs2017-win2016 - - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - template: eng\common\templates\post-build\post-build.yml parameters: From 88e6663236edcc7800593f1f6187f6791ca6ca66 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Tue, 17 Sep 2019 13:58:14 -0700 Subject: [PATCH 272/420] Turn off stable builds (#4874) --- src/redist/targets/Versions.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/Versions.targets b/src/redist/targets/Versions.targets index 5bace50b7..a9afc2717 100644 --- a/src/redist/targets/Versions.targets +++ b/src/redist/targets/Versions.targets @@ -8,7 +8,7 @@ - true + false From 81c33ddf1d68a3fdf4d555773d2d0eb58946dc9b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 18 Sep 2019 00:00:50 +0000 Subject: [PATCH 273/420] Update dependencies from https://github.com/dotnet/toolset build 20190917.6 (#4878) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19467.6 Dependency coherency updates - Microsoft.NET.Sdk - 3.0.100-rc2.19467.1 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7b52fb52c..1fe58e929 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -67,13 +67,13 @@ https://github.com/dotnet/templating b2663fb07294f5d6cf3caa927d58f7cbebf7d626 - + https://github.com/dotnet/toolset - 68b9cea1b6b466761700ab77171192e418a00085 + e4873c5e59a37c9d761781f7cf305f69fa953430 - + https://github.com/dotnet/sdk - 1b90fa144c9c49d2f133a7a8e3fb19522ff72e83 + c63dfd832a0545b99672738d4f48544a09f4faf9 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index 9c69227f9..22fc9f4d3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc2.19466.4 + 3.0.100-rc2.19467.6 @@ -40,7 +40,7 @@ - 3.0.100-rc2.19463.5 + 3.0.100-rc2.19467.1 $(MicrosoftNETSdkPackageVersion) From 609951461547c91595b62988260257e156d71f3d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 18 Sep 2019 00:40:22 +0000 Subject: [PATCH 274/420] Update dependencies from https://github.com/dotnet/toolset build 20190917.7 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19467.7 --- NuGet.config | 2 +- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/NuGet.config b/NuGet.config index 64f186fd2..273a388d4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1fe58e929..ea154d6e2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -67,9 +67,9 @@ https://github.com/dotnet/templating b2663fb07294f5d6cf3caa927d58f7cbebf7d626 - + https://github.com/dotnet/toolset - e4873c5e59a37c9d761781f7cf305f69fa953430 + dcd2644789c1f8e574d7346629a2d5bf85d53023 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 22fc9f4d3..d04fa8f43 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc2.19467.6 + 3.0.100-rc2.19467.7 From 956e75fb5a84d3832a9b9f9f9c764f20f738acb8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 18 Sep 2019 02:45:24 +0000 Subject: [PATCH 275/420] Update dependencies from https://github.com/dotnet/toolset build 20190917.8 (#4881) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19467.8 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc2.19467.3 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ea154d6e2..adebf5139 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -67,17 +67,17 @@ https://github.com/dotnet/templating b2663fb07294f5d6cf3caa927d58f7cbebf7d626 - + https://github.com/dotnet/toolset - dcd2644789c1f8e574d7346629a2d5bf85d53023 + 681dcd086570617623a7a7e35245815a26575c5f https://github.com/dotnet/sdk c63dfd832a0545b99672738d4f48544a09f4faf9 - + https://github.com/dotnet/cli - 2e8e081e586a2fba649f4639085ee5a389193244 + 7d2f2d425983b868e6381b8b033567d69d977760 diff --git a/eng/Versions.props b/eng/Versions.props index d04fa8f43..71abc9e4f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc2.19467.7 + 3.0.100-rc2.19467.8 @@ -33,7 +33,7 @@ - 3.0.100-rc2.19465.3 + 3.0.100-rc2.19467.3 0.2.0 From d323b63a304c09742b93278fe20b2a402dd15224 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 18 Sep 2019 03:30:44 +0000 Subject: [PATCH 276/420] Update dependencies from https://github.com/dotnet/core-setup build 20190917.7 (#4883) - Microsoft.NETCore.App - 3.1.0-preview1.19467.7 - NETStandard.Library.Ref - 2.1.0-preview1.19467.7 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19467.7 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 66b40b6b6..d1c59455a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 1e35b022cbc45bd8185cfa3f3151451298bf6de4 + 1e19b8c0d63fe23da7bdd9625ca51c6bd2d1bab2 - + https://github.com/dotnet/core-setup - 1e35b022cbc45bd8185cfa3f3151451298bf6de4 + 1e19b8c0d63fe23da7bdd9625ca51c6bd2d1bab2 - + https://github.com/dotnet/core-setup - 1e35b022cbc45bd8185cfa3f3151451298bf6de4 + 1e19b8c0d63fe23da7bdd9625ca51c6bd2d1bab2 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index b4adc8cb5..3a2abe765 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview1.19463.3 + 3.1.0-preview1.19467.7 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -52,11 +52,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview1.19463.3 + 2.1.0-preview1.19467.7 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview1.19463.3 + 3.1.0-preview1.19467.7 $(MicrosoftWindowsDesktopAppPackageVersion) From ebe9fb2b5700cb43c943cbc35008b5faf020341e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 18 Sep 2019 03:41:26 +0000 Subject: [PATCH 277/420] Update dependencies from https://github.com/dotnet/toolset build 20190917.9 (#4882) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19467.9 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc2.19467.4 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index adebf5139..dc40eeb30 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -67,17 +67,17 @@ https://github.com/dotnet/templating b2663fb07294f5d6cf3caa927d58f7cbebf7d626 - + https://github.com/dotnet/toolset - 681dcd086570617623a7a7e35245815a26575c5f + b397684d9314d3ccf26a39d773c5dae8d9bf5339 https://github.com/dotnet/sdk c63dfd832a0545b99672738d4f48544a09f4faf9 - + https://github.com/dotnet/cli - 7d2f2d425983b868e6381b8b033567d69d977760 + aebc0cf37959e6cccd7e5a701020d8144c4ddb2e diff --git a/eng/Versions.props b/eng/Versions.props index 71abc9e4f..2e2ce9f5f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc2.19467.8 + 3.0.100-rc2.19467.9 @@ -33,7 +33,7 @@ - 3.0.100-rc2.19467.3 + 3.0.100-rc2.19467.4 0.2.0 From 5f6a012764d93352ed2408149b579a5d3d122a1b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 18 Sep 2019 00:20:16 -0700 Subject: [PATCH 278/420] [release/3.0.1xx] Update dependencies from dotnet/toolset (#4886) * Update dependencies from https://github.com/dotnet/toolset build 20190917.12 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19467.12 Dependency coherency updates - Microsoft.NET.Sdk - 3.0.100-rc2.19467.3 (parent: Microsoft.Dotnet.Toolset.Internal) * Set to stable build --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- src/redist/targets/Versions.targets | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dc40eeb30..f6921863c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -67,13 +67,13 @@ https://github.com/dotnet/templating b2663fb07294f5d6cf3caa927d58f7cbebf7d626 - + https://github.com/dotnet/toolset - b397684d9314d3ccf26a39d773c5dae8d9bf5339 + f8714efdf2c11421ef408dc28393c470c82ff05c - + https://github.com/dotnet/sdk - c63dfd832a0545b99672738d4f48544a09f4faf9 + b3a343bf8ed65f5208c5bb86c632856c5d107b1d https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index 2e2ce9f5f..d4a7d513b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc2.19467.9 + 3.0.100-rc2.19467.12 @@ -40,7 +40,7 @@ - 3.0.100-rc2.19467.1 + 3.0.100-rc2.19467.3 $(MicrosoftNETSdkPackageVersion) diff --git a/src/redist/targets/Versions.targets b/src/redist/targets/Versions.targets index a9afc2717..5bace50b7 100644 --- a/src/redist/targets/Versions.targets +++ b/src/redist/targets/Versions.targets @@ -8,7 +8,7 @@ - false + true From 3e3ba458e97bb7150c7772c452323e0efdaf43c7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 18 Sep 2019 07:22:47 +0000 Subject: [PATCH 279/420] Update dependencies from https://github.com/dotnet/toolset build 20190918.2 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19468.2 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc2.19467.7 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f6921863c..250b619c0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -67,17 +67,17 @@ https://github.com/dotnet/templating b2663fb07294f5d6cf3caa927d58f7cbebf7d626 - + https://github.com/dotnet/toolset - f8714efdf2c11421ef408dc28393c470c82ff05c + df937bdaee686eeda9fefcb5aea3c855d760b4ab https://github.com/dotnet/sdk b3a343bf8ed65f5208c5bb86c632856c5d107b1d - + https://github.com/dotnet/cli - aebc0cf37959e6cccd7e5a701020d8144c4ddb2e + e72d84f73adcbfa0054df27fbb21505295a55dcb diff --git a/eng/Versions.props b/eng/Versions.props index d4a7d513b..5d5a98666 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc2.19467.12 + 3.0.100-rc2.19468.2 @@ -33,7 +33,7 @@ - 3.0.100-rc2.19467.4 + 3.0.100-rc2.19467.7 0.2.0 From 1f6f745127087bff134824c4e32dd6f0c0067cda Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Wed, 18 Sep 2019 01:01:51 -0700 Subject: [PATCH 280/420] Fix core-setup nuget feed (#4890) --- NuGet.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NuGet.config b/NuGet.config index 273a388d4..64f186fd2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + From 974858568a2ed8ec7ec50f0a0cf2d1cb10be7137 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 18 Sep 2019 08:05:22 +0000 Subject: [PATCH 281/420] Update dependencies from https://github.com/dotnet/toolset build 20190918.3 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19468.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 250b619c0..41edc80c3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -67,9 +67,9 @@ https://github.com/dotnet/templating b2663fb07294f5d6cf3caa927d58f7cbebf7d626 - + https://github.com/dotnet/toolset - df937bdaee686eeda9fefcb5aea3c855d760b4ab + 33026f95de81116aefd79b4ec4c8071090a02480 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 5d5a98666..85124445e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc2.19468.2 + 3.0.100-rc2.19468.3 From ba461bc51b85fd4a68ea7d0b87883bc3195b15b4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 20 Sep 2019 21:55:44 +0000 Subject: [PATCH 282/420] Update dependencies from https://github.com/dotnet/core-setup build 20190920.5 (#4911) - Microsoft.NETCore.App - 3.1.0-preview1.19470.5 - NETStandard.Library.Ref - 2.1.0-preview1.19470.5 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19470.5 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d1c59455a..0216c135f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 1e19b8c0d63fe23da7bdd9625ca51c6bd2d1bab2 + b0ea03ec3af2a9c388f718fbb4978984ab339953 - + https://github.com/dotnet/core-setup - 1e19b8c0d63fe23da7bdd9625ca51c6bd2d1bab2 + b0ea03ec3af2a9c388f718fbb4978984ab339953 - + https://github.com/dotnet/core-setup - 1e19b8c0d63fe23da7bdd9625ca51c6bd2d1bab2 + b0ea03ec3af2a9c388f718fbb4978984ab339953 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 3a2abe765..462ede6a2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview1.19467.7 + 3.1.0-preview1.19470.5 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -52,11 +52,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview1.19467.7 + 2.1.0-preview1.19470.5 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview1.19467.7 + 3.1.0-preview1.19470.5 $(MicrosoftWindowsDesktopAppPackageVersion) From 04113007941632374b0a7288092db55815612c89 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 16 Sep 2019 07:30:21 +0000 Subject: [PATCH 283/420] Update dependencies from https://github.com/aspnet/AspNetCore build 20190920.3 - dotnet-user-secrets - 3.1.0-preview1.19470.3 - dotnet-watch - 3.1.0-preview1.19470.3 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19470.3 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19470.3 - dotnet-dev-certs - 3.1.0-preview1.19470.3 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19470.3 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0216c135f..51f4c9ed5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup b0ea03ec3af2a9c388f718fbb4978984ab339953 - + https://github.com/aspnet/AspNetCore - db1aca12a532e4b37a91d8037b50a22d1ef21239 + 2e9484b44ef24d53e1bec7ea473c12b6eef44501 - + https://github.com/aspnet/AspNetCore - db1aca12a532e4b37a91d8037b50a22d1ef21239 + 2e9484b44ef24d53e1bec7ea473c12b6eef44501 - + https://github.com/aspnet/AspNetCore - db1aca12a532e4b37a91d8037b50a22d1ef21239 + 2e9484b44ef24d53e1bec7ea473c12b6eef44501 - + https://github.com/aspnet/AspNetCore - db1aca12a532e4b37a91d8037b50a22d1ef21239 + 2e9484b44ef24d53e1bec7ea473c12b6eef44501 - + https://github.com/aspnet/AspNetCore - db1aca12a532e4b37a91d8037b50a22d1ef21239 + 2e9484b44ef24d53e1bec7ea473c12b6eef44501 - + https://github.com/aspnet/AspNetCore - db1aca12a532e4b37a91d8037b50a22d1ef21239 + 2e9484b44ef24d53e1bec7ea473c12b6eef44501 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 462ede6a2..ffae7b6e8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.0.0-rc2.19462.2 - 3.0.0-rc2.19462.2 - 3.0.0-rc2.19462.2 - 3.0.0-rc2.19462.2 - 3.0.0-rc2.19462.2 - 3.0.0-rc2.19462.2 + 3.1.0-preview1.19470.3 + 3.1.0-preview1.19470.3 + 3.1.0-preview1.19470.3 + 3.1.0-preview1.19470.3 + 3.1.0-preview1.19470.3 + 3.1.0-preview1.19470.3 From 0386ae221dd0d35924e84c6797529365d5e7fc85 Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Fri, 20 Sep 2019 15:23:59 -0700 Subject: [PATCH 284/420] React to msi rename --- src/redist/targets/GenerateLayout.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index 4c64d613c..e9d68c9c2 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -59,7 +59,7 @@ aspnetcore-runtime-internal-$(AspNetCoreVersion)-$(AspNetCoreSharedFxInstallerRid).wixlib aspnetcore-targeting-pack-$(AspNetTargetingPackVersion)$(InstallerExtension) aspnetcore-targeting-pack-$(AspNetTargetingPackVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension) - aspnetcoremodule_$(Architecture)_en_v2$(InstallerExtension) + aspnetcoremodule_$(Architecture)_en_v2_$(AspNetCoreVersion)$(InstallerExtension) aspnetcore-targeting-pack-$(AspNetCoreVersion)$(ArchiveExtension) aspnetcore-runtime-internal-$(AspNetCoreVersion)-$(AspNetCoreSharedFxArchiveRid)$(ArchiveExtension) From a3bb2201852519621f4fde16e90ab80bdafc216c Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Fri, 20 Sep 2019 15:20:01 -0700 Subject: [PATCH 285/420] Add 3.1 templates --- eng/Versions.props | 17 ++++++-- src/redist/targets/BundledTemplates.targets | 45 ++++++++++++++++++--- src/redist/targets/GenerateLayout.targets | 1 + 3 files changed, 55 insertions(+), 8 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index ffae7b6e8..eb6fa3f4d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -60,20 +60,31 @@ $(MicrosoftWindowsDesktopAppPackageVersion) + + $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) + $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) + 1.6.3 + 2.0.0-preview8.19373.1 + $(MicrosoftDotNetCommonItemTemplates31PackageVersion) + 1.0.2-beta4.19354.2 + $(AspNetCoreVersion) + - $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) - $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) + 4.8.0-rc2.19462.10 + 3.0.0-rc2.19459.11 1.6.3 2.0.0-preview8.19373.1 $(MicrosoftDotNetCommonItemTemplates30PackageVersion) 1.0.2-beta4.19354.2 - $(AspNetCoreVersion) + 3.0.0-rc2.19461.12 + 1.6.0 1.0.2-beta4 $(MicrosoftDotNetCommonItemTemplates22PackageVersion) 1.0.2-beta4.19155.2 2.2.6 + 1.5.3 1.0.2-beta3 diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index 5c3b0a824..495d1d453 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -2,6 +2,16 @@ + $(AspNetCorePackageVersionFor31Templates.IndexOf('-')) + $(AspNetCorePackageVersionFor31Templates) + $(AspNetCorePackageVersionFor31Templates.Substring(0, $(AspNetCore31VersionPreReleaseSeparator))) + $(AspNetCore31VersionMajorMinorPatchVersion).$(GitCommitCount) + $(AspNetCore31VersionMajorMinorPatchVersion) + $(BundledTemplates31InstallPath)-$(VersionSuffix) + $([MSBuild]::Add($(AspNetCore31VersionMajorMinorPatchVersion.IndexOf('.')), 1)) + $(AspNetCore31VersionMajorMinorPatchVersion.IndexOf('.', $(Templates31VersionPatchSeparatorIndex))) + $(AspNetCore31VersionMajorMinorPatchVersion.Substring(0, $(Templates31VersionPatchSeparatorIndex))) + $(AspNetCorePackageVersionFor30Templates.IndexOf('-')) $(AspNetCorePackageVersionFor30Templates) $(AspNetCorePackageVersionFor30Templates.Substring(0, $(AspNetCore30VersionPreReleaseSeparator))) @@ -34,6 +44,17 @@ + + + + + + + + + + + @@ -64,6 +85,13 @@ + + + %(Identity)/%(PackageVersion)/%(Identity).%(PackageVersion).nupkg + $(NuGetPackageRoot)$([MSBuild]::ValueOrDefault('%(NupkgPathRelativeToPackageRoot)', '').ToLower()) + [%(PackageVersion)] + + %(Identity)/%(PackageVersion)/%(Identity).%(PackageVersion).nupkg @@ -87,16 +115,16 @@ - + - + + DependsOnTargets="LayoutTemplatesForSDK;LayoutTemplatesFor31MSI;LayoutTemplatesFor30MSI;LayoutTemplatesFor22MSI;LayoutTemplatesFor21MSI" /> @@ -104,8 +132,15 @@ - + + + + + $(BaseOutputPath)$(Configuration)\dotnet\ $(BaseOutputPath)$(Configuration)\dotnet-internal\ + $(BaseOutputPath)$(Configuration)\templates-3.1\ $(BaseOutputPath)$(Configuration)\templates-3.0\ $(BaseOutputPath)$(Configuration)\templates-2.2\ $(BaseOutputPath)$(Configuration)\templates-2.1\ From 5c361b66bbf6a7684b048dcc07c61f8f82ad70af Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Fri, 20 Sep 2019 16:19:37 -0700 Subject: [PATCH 286/420] Fix 3.1 tests --- .../targets/GenerateBundledVersions.targets | 20 ++++++++++++++++--- test/EndToEnd/GivenFrameworkDependentApps.cs | 4 ++-- .../GivenSelfContainedAppsRollForward.cs | 4 ++-- test/EndToEnd/SupportedNetCoreAppVersions.cs | 3 ++- 4 files changed, 23 insertions(+), 8 deletions(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index a77fc9160..278a1250c 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -35,6 +35,9 @@ <_MicrosoftWindowsDesktop30PackageVersion>$(_NETCoreApp30PackageVersion) <_MicrosoftWindowsDesktop30TargetingPackVersion>$(_NETCoreApp30TargetingPackVersion) + <_MicrosoftAspNetCoreApp30PackageVersion>3.0.0-rc2.19461.12 + <_AspNet30TargetingPackVersion>$(_MicrosoftAspNetCoreApp30PackageVersion) + <_NETCoreAppTargetFrameworkVersion>$(_NETCoreAppPackageVersion.Split('.')[0]).$(_NETCoreAppPackageVersion.Split('.')[1]) <_NETStandardTargetFrameworkVersion>$(_NETStandardLibraryPackageVersion.Split('.')[0]).$(_NETStandardLibraryPackageVersion.Split('.')[1]) @@ -238,6 +241,17 @@ Copyright (c) .NET Foundation. All rights reserved. Profile="WindowsForms" /> + + diff --git a/test/EndToEnd/GivenFrameworkDependentApps.cs b/test/EndToEnd/GivenFrameworkDependentApps.cs index 8b809382a..bfc399813 100644 --- a/test/EndToEnd/GivenFrameworkDependentApps.cs +++ b/test/EndToEnd/GivenFrameworkDependentApps.cs @@ -19,7 +19,7 @@ namespace EndToEnd [ClassData(typeof(SupportedNetCoreAppVersions))] public void ItDoesNotRollForwardToTheLatestVersionOfNetCore(string minorVersion) { - if (minorVersion == "3.0") + if (minorVersion == "3.0" || minorVersion == "3.1") { // https://github.com/dotnet/core-sdk/issues/621 return; @@ -31,7 +31,7 @@ namespace EndToEnd [ClassData(typeof(SupportedAspNetCoreVersions))] public void ItDoesNotRollForwardToTheLatestVersionOfAspNetCoreApp(string minorVersion) { - if (minorVersion == "3.0") + if (minorVersion == "3.0" || minorVersion == "3.1") { // https://github.com/dotnet/core-sdk/issues/621 return; diff --git a/test/EndToEnd/GivenSelfContainedAppsRollForward.cs b/test/EndToEnd/GivenSelfContainedAppsRollForward.cs index 7cf1512bd..9dda617fa 100644 --- a/test/EndToEnd/GivenSelfContainedAppsRollForward.cs +++ b/test/EndToEnd/GivenSelfContainedAppsRollForward.cs @@ -23,7 +23,7 @@ namespace EndToEnd [ClassData(typeof(SupportedNetCoreAppVersions))] public void ItRollsForwardToTheLatestNetCoreVersion(string minorVersion) { - if (minorVersion == "3.0") + if (minorVersion == "3.0" || minorVersion == "3.1") { // https://github.com/dotnet/core-sdk/issues/621 return; @@ -35,7 +35,7 @@ namespace EndToEnd [ClassData(typeof(SupportedAspNetCoreVersions))] public void ItRollsForwardToTheLatestAspNetCoreAppVersion(string minorVersion) { - if (minorVersion == "3.0") + if (minorVersion == "3.0" || minorVersion == "3.1") { // https://github.com/dotnet/core-sdk/issues/621 return; diff --git a/test/EndToEnd/SupportedNetCoreAppVersions.cs b/test/EndToEnd/SupportedNetCoreAppVersions.cs index 6c9adff95..ee70c9548 100644 --- a/test/EndToEnd/SupportedNetCoreAppVersions.cs +++ b/test/EndToEnd/SupportedNetCoreAppVersions.cs @@ -21,7 +21,8 @@ namespace EndToEnd "2.0", "2.1", "2.2", - "3.0" + "3.0", + "3.1", }; } } From abd1e70d5fb3f8ef82f41d308f089c68e072ff4d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 21 Sep 2019 00:10:44 +0000 Subject: [PATCH 287/420] Update dependencies from https://github.com/dotnet/core-setup build 20190920.9 (#4915) - Microsoft.NETCore.App - 3.1.0-preview1.19470.9 - NETStandard.Library.Ref - 2.1.0-preview1.19470.9 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19470.9 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0216c135f..35091467c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - b0ea03ec3af2a9c388f718fbb4978984ab339953 + 72b39b0473993b932a08c8fc24a8988d45b416a5 - + https://github.com/dotnet/core-setup - b0ea03ec3af2a9c388f718fbb4978984ab339953 + 72b39b0473993b932a08c8fc24a8988d45b416a5 - + https://github.com/dotnet/core-setup - b0ea03ec3af2a9c388f718fbb4978984ab339953 + 72b39b0473993b932a08c8fc24a8988d45b416a5 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 462ede6a2..5c272f58b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview1.19470.5 + 3.1.0-preview1.19470.9 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -52,11 +52,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview1.19470.5 + 2.1.0-preview1.19470.9 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview1.19470.5 + 3.1.0-preview1.19470.9 $(MicrosoftWindowsDesktopAppPackageVersion) From 7b3d6dd8bfc02041c7c3ce22db4cf7c322b0667c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 21 Sep 2019 01:00:26 +0000 Subject: [PATCH 288/420] Update dependencies from https://github.com/aspnet/AspNetCore build 20190920.14 - dotnet-user-secrets - 3.1.0-preview1.19470.14 - dotnet-watch - 3.1.0-preview1.19470.14 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19470.14 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19470.14 - dotnet-dev-certs - 3.1.0-preview1.19470.14 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19470.14 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 15 ++++++--------- 2 files changed, 18 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 51f4c9ed5..5dd228b35 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup b0ea03ec3af2a9c388f718fbb4978984ab339953 - + https://github.com/aspnet/AspNetCore - 2e9484b44ef24d53e1bec7ea473c12b6eef44501 + f21b00aa458b843619cfc7c47a42803ffd33ea73 - + https://github.com/aspnet/AspNetCore - 2e9484b44ef24d53e1bec7ea473c12b6eef44501 + f21b00aa458b843619cfc7c47a42803ffd33ea73 - + https://github.com/aspnet/AspNetCore - 2e9484b44ef24d53e1bec7ea473c12b6eef44501 + f21b00aa458b843619cfc7c47a42803ffd33ea73 - + https://github.com/aspnet/AspNetCore - 2e9484b44ef24d53e1bec7ea473c12b6eef44501 + f21b00aa458b843619cfc7c47a42803ffd33ea73 - + https://github.com/aspnet/AspNetCore - 2e9484b44ef24d53e1bec7ea473c12b6eef44501 + f21b00aa458b843619cfc7c47a42803ffd33ea73 - + https://github.com/aspnet/AspNetCore - 2e9484b44ef24d53e1bec7ea473c12b6eef44501 + f21b00aa458b843619cfc7c47a42803ffd33ea73 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index eb6fa3f4d..34f3bc060 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.1.0-preview1.19470.3 - 3.1.0-preview1.19470.3 - 3.1.0-preview1.19470.3 - 3.1.0-preview1.19470.3 - 3.1.0-preview1.19470.3 - 3.1.0-preview1.19470.3 + 3.1.0-preview1.19470.14 + 3.1.0-preview1.19470.14 + 3.1.0-preview1.19470.14 + 3.1.0-preview1.19470.14 + 3.1.0-preview1.19470.14 + 3.1.0-preview1.19470.14 @@ -68,7 +68,6 @@ $(MicrosoftDotNetCommonItemTemplates31PackageVersion) 1.0.2-beta4.19354.2 $(AspNetCoreVersion) - 4.8.0-rc2.19462.10 3.0.0-rc2.19459.11 @@ -77,14 +76,12 @@ $(MicrosoftDotNetCommonItemTemplates30PackageVersion) 1.0.2-beta4.19354.2 3.0.0-rc2.19461.12 - 1.6.0 1.0.2-beta4 $(MicrosoftDotNetCommonItemTemplates22PackageVersion) 1.0.2-beta4.19155.2 2.2.6 - 1.5.3 1.0.2-beta3 From 8974206ca7c8910034f917f96a7d4f0de8d283a9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 21 Sep 2019 11:30:24 +0000 Subject: [PATCH 289/420] Update dependencies from https://github.com/aspnet/AspNetCore build 20190921.1 - dotnet-user-secrets - 3.1.0-preview1.19471.1 - dotnet-watch - 3.1.0-preview1.19471.1 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19471.1 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19471.1 - dotnet-dev-certs - 3.1.0-preview1.19471.1 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19471.1 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5dd228b35..a622aae5d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup b0ea03ec3af2a9c388f718fbb4978984ab339953 - + https://github.com/aspnet/AspNetCore - f21b00aa458b843619cfc7c47a42803ffd33ea73 + ace9e7c4fe6cf866212125dd465ab8d7051e757c - + https://github.com/aspnet/AspNetCore - f21b00aa458b843619cfc7c47a42803ffd33ea73 + ace9e7c4fe6cf866212125dd465ab8d7051e757c - + https://github.com/aspnet/AspNetCore - f21b00aa458b843619cfc7c47a42803ffd33ea73 + ace9e7c4fe6cf866212125dd465ab8d7051e757c - + https://github.com/aspnet/AspNetCore - f21b00aa458b843619cfc7c47a42803ffd33ea73 + ace9e7c4fe6cf866212125dd465ab8d7051e757c - + https://github.com/aspnet/AspNetCore - f21b00aa458b843619cfc7c47a42803ffd33ea73 + ace9e7c4fe6cf866212125dd465ab8d7051e757c - + https://github.com/aspnet/AspNetCore - f21b00aa458b843619cfc7c47a42803ffd33ea73 + ace9e7c4fe6cf866212125dd465ab8d7051e757c https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 34f3bc060..1978215e8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.1.0-preview1.19470.14 - 3.1.0-preview1.19470.14 - 3.1.0-preview1.19470.14 - 3.1.0-preview1.19470.14 - 3.1.0-preview1.19470.14 - 3.1.0-preview1.19470.14 + 3.1.0-preview1.19471.1 + 3.1.0-preview1.19471.1 + 3.1.0-preview1.19471.1 + 3.1.0-preview1.19471.1 + 3.1.0-preview1.19471.1 + 3.1.0-preview1.19471.1 From 1ecb4f37d958e4569ee4ee9b5d17ea3681049431 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 21 Sep 2019 20:20:23 +0000 Subject: [PATCH 290/420] Update dependencies from https://github.com/aspnet/AspNetCore build 20190921.2 - dotnet-user-secrets - 3.1.0-preview1.19471.2 - dotnet-watch - 3.1.0-preview1.19471.2 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19471.2 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19471.2 - dotnet-dev-certs - 3.1.0-preview1.19471.2 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19471.2 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a622aae5d..b9c755bb3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup b0ea03ec3af2a9c388f718fbb4978984ab339953 - + https://github.com/aspnet/AspNetCore - ace9e7c4fe6cf866212125dd465ab8d7051e757c + 57002759fd6c700487e863806fb82042d9f278b4 - + https://github.com/aspnet/AspNetCore - ace9e7c4fe6cf866212125dd465ab8d7051e757c + 57002759fd6c700487e863806fb82042d9f278b4 - + https://github.com/aspnet/AspNetCore - ace9e7c4fe6cf866212125dd465ab8d7051e757c + 57002759fd6c700487e863806fb82042d9f278b4 - + https://github.com/aspnet/AspNetCore - ace9e7c4fe6cf866212125dd465ab8d7051e757c + 57002759fd6c700487e863806fb82042d9f278b4 - + https://github.com/aspnet/AspNetCore - ace9e7c4fe6cf866212125dd465ab8d7051e757c + 57002759fd6c700487e863806fb82042d9f278b4 - + https://github.com/aspnet/AspNetCore - ace9e7c4fe6cf866212125dd465ab8d7051e757c + 57002759fd6c700487e863806fb82042d9f278b4 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 1978215e8..b3b0c920c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.1.0-preview1.19471.1 - 3.1.0-preview1.19471.1 - 3.1.0-preview1.19471.1 - 3.1.0-preview1.19471.1 - 3.1.0-preview1.19471.1 - 3.1.0-preview1.19471.1 + 3.1.0-preview1.19471.2 + 3.1.0-preview1.19471.2 + 3.1.0-preview1.19471.2 + 3.1.0-preview1.19471.2 + 3.1.0-preview1.19471.2 + 3.1.0-preview1.19471.2 From 27da986c91990d5407cdd882075615d84b44a08b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 22 Sep 2019 00:40:23 +0000 Subject: [PATCH 291/420] Update dependencies from https://github.com/aspnet/AspNetCore build 20190921.3 - dotnet-user-secrets - 3.1.0-preview1.19471.3 - dotnet-watch - 3.1.0-preview1.19471.3 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19471.3 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19471.3 - dotnet-dev-certs - 3.1.0-preview1.19471.3 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19471.3 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b9c755bb3..ec5ca5e06 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup b0ea03ec3af2a9c388f718fbb4978984ab339953 - + https://github.com/aspnet/AspNetCore - 57002759fd6c700487e863806fb82042d9f278b4 + e1e8068f6813bf12220e29a30dab8c393d5bc746 - + https://github.com/aspnet/AspNetCore - 57002759fd6c700487e863806fb82042d9f278b4 + e1e8068f6813bf12220e29a30dab8c393d5bc746 - + https://github.com/aspnet/AspNetCore - 57002759fd6c700487e863806fb82042d9f278b4 + e1e8068f6813bf12220e29a30dab8c393d5bc746 - + https://github.com/aspnet/AspNetCore - 57002759fd6c700487e863806fb82042d9f278b4 + e1e8068f6813bf12220e29a30dab8c393d5bc746 - + https://github.com/aspnet/AspNetCore - 57002759fd6c700487e863806fb82042d9f278b4 + e1e8068f6813bf12220e29a30dab8c393d5bc746 - + https://github.com/aspnet/AspNetCore - 57002759fd6c700487e863806fb82042d9f278b4 + e1e8068f6813bf12220e29a30dab8c393d5bc746 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index b3b0c920c..a2e61778b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.1.0-preview1.19471.2 - 3.1.0-preview1.19471.2 - 3.1.0-preview1.19471.2 - 3.1.0-preview1.19471.2 - 3.1.0-preview1.19471.2 - 3.1.0-preview1.19471.2 + 3.1.0-preview1.19471.3 + 3.1.0-preview1.19471.3 + 3.1.0-preview1.19471.3 + 3.1.0-preview1.19471.3 + 3.1.0-preview1.19471.3 + 3.1.0-preview1.19471.3 From c1a7dd13aaecafc4e667540ef67e06847c25a413 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 22 Sep 2019 03:20:24 +0000 Subject: [PATCH 292/420] Update dependencies from https://github.com/aspnet/AspNetCore build 20190921.4 - dotnet-user-secrets - 3.1.0-preview1.19471.4 - dotnet-watch - 3.1.0-preview1.19471.4 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19471.4 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19471.4 - dotnet-dev-certs - 3.1.0-preview1.19471.4 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19471.4 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ec5ca5e06..6143623fc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup b0ea03ec3af2a9c388f718fbb4978984ab339953 - + https://github.com/aspnet/AspNetCore - e1e8068f6813bf12220e29a30dab8c393d5bc746 + 309adfa57e03cf28344526acfcb6f8135ac9bc81 - + https://github.com/aspnet/AspNetCore - e1e8068f6813bf12220e29a30dab8c393d5bc746 + 309adfa57e03cf28344526acfcb6f8135ac9bc81 - + https://github.com/aspnet/AspNetCore - e1e8068f6813bf12220e29a30dab8c393d5bc746 + 309adfa57e03cf28344526acfcb6f8135ac9bc81 - + https://github.com/aspnet/AspNetCore - e1e8068f6813bf12220e29a30dab8c393d5bc746 + 309adfa57e03cf28344526acfcb6f8135ac9bc81 - + https://github.com/aspnet/AspNetCore - e1e8068f6813bf12220e29a30dab8c393d5bc746 + 309adfa57e03cf28344526acfcb6f8135ac9bc81 - + https://github.com/aspnet/AspNetCore - e1e8068f6813bf12220e29a30dab8c393d5bc746 + 309adfa57e03cf28344526acfcb6f8135ac9bc81 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index a2e61778b..7573e47d5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.1.0-preview1.19471.3 - 3.1.0-preview1.19471.3 - 3.1.0-preview1.19471.3 - 3.1.0-preview1.19471.3 - 3.1.0-preview1.19471.3 - 3.1.0-preview1.19471.3 + 3.1.0-preview1.19471.4 + 3.1.0-preview1.19471.4 + 3.1.0-preview1.19471.4 + 3.1.0-preview1.19471.4 + 3.1.0-preview1.19471.4 + 3.1.0-preview1.19471.4 From ac84ff0bdc08c789a966b04dd04d140bd5b93276 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 22 Sep 2019 06:15:23 +0000 Subject: [PATCH 293/420] Update dependencies from https://github.com/aspnet/AspNetCore build 20190921.5 - dotnet-user-secrets - 3.1.0-preview1.19471.5 - dotnet-watch - 3.1.0-preview1.19471.5 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19471.5 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19471.5 - dotnet-dev-certs - 3.1.0-preview1.19471.5 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19471.5 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6143623fc..bcdf73227 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup b0ea03ec3af2a9c388f718fbb4978984ab339953 - + https://github.com/aspnet/AspNetCore - 309adfa57e03cf28344526acfcb6f8135ac9bc81 + 69d1f1ddbaf3badd99c4d9c9c063d9f172828338 - + https://github.com/aspnet/AspNetCore - 309adfa57e03cf28344526acfcb6f8135ac9bc81 + 69d1f1ddbaf3badd99c4d9c9c063d9f172828338 - + https://github.com/aspnet/AspNetCore - 309adfa57e03cf28344526acfcb6f8135ac9bc81 + 69d1f1ddbaf3badd99c4d9c9c063d9f172828338 - + https://github.com/aspnet/AspNetCore - 309adfa57e03cf28344526acfcb6f8135ac9bc81 + 69d1f1ddbaf3badd99c4d9c9c063d9f172828338 - + https://github.com/aspnet/AspNetCore - 309adfa57e03cf28344526acfcb6f8135ac9bc81 + 69d1f1ddbaf3badd99c4d9c9c063d9f172828338 - + https://github.com/aspnet/AspNetCore - 309adfa57e03cf28344526acfcb6f8135ac9bc81 + 69d1f1ddbaf3badd99c4d9c9c063d9f172828338 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 7573e47d5..28c13dea9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.1.0-preview1.19471.4 - 3.1.0-preview1.19471.4 - 3.1.0-preview1.19471.4 - 3.1.0-preview1.19471.4 - 3.1.0-preview1.19471.4 - 3.1.0-preview1.19471.4 + 3.1.0-preview1.19471.5 + 3.1.0-preview1.19471.5 + 3.1.0-preview1.19471.5 + 3.1.0-preview1.19471.5 + 3.1.0-preview1.19471.5 + 3.1.0-preview1.19471.5 From 39f74f36db4b9f4be69f77d69af7b76fd014af49 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 22 Sep 2019 08:25:23 +0000 Subject: [PATCH 294/420] Update dependencies from https://github.com/aspnet/AspNetCore build 20190921.7 - dotnet-user-secrets - 3.1.0-preview1.19471.7 - dotnet-watch - 3.1.0-preview1.19471.7 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19471.7 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19471.7 - dotnet-dev-certs - 3.1.0-preview1.19471.7 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19471.7 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bcdf73227..c775fcb3f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup b0ea03ec3af2a9c388f718fbb4978984ab339953 - + https://github.com/aspnet/AspNetCore - 69d1f1ddbaf3badd99c4d9c9c063d9f172828338 + 2980e8a283e53caa211b29783201f8c4d489e5d3 - + https://github.com/aspnet/AspNetCore - 69d1f1ddbaf3badd99c4d9c9c063d9f172828338 + 2980e8a283e53caa211b29783201f8c4d489e5d3 - + https://github.com/aspnet/AspNetCore - 69d1f1ddbaf3badd99c4d9c9c063d9f172828338 + 2980e8a283e53caa211b29783201f8c4d489e5d3 - + https://github.com/aspnet/AspNetCore - 69d1f1ddbaf3badd99c4d9c9c063d9f172828338 + 2980e8a283e53caa211b29783201f8c4d489e5d3 - + https://github.com/aspnet/AspNetCore - 69d1f1ddbaf3badd99c4d9c9c063d9f172828338 + 2980e8a283e53caa211b29783201f8c4d489e5d3 - + https://github.com/aspnet/AspNetCore - 69d1f1ddbaf3badd99c4d9c9c063d9f172828338 + 2980e8a283e53caa211b29783201f8c4d489e5d3 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 28c13dea9..d4e462f02 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.1.0-preview1.19471.5 - 3.1.0-preview1.19471.5 - 3.1.0-preview1.19471.5 - 3.1.0-preview1.19471.5 - 3.1.0-preview1.19471.5 - 3.1.0-preview1.19471.5 + 3.1.0-preview1.19471.7 + 3.1.0-preview1.19471.7 + 3.1.0-preview1.19471.7 + 3.1.0-preview1.19471.7 + 3.1.0-preview1.19471.7 + 3.1.0-preview1.19471.7 From 93fea43d47dd56cfa3a9cc834273e6b40a77f00b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 23 Sep 2019 01:15:23 +0000 Subject: [PATCH 295/420] Update dependencies from https://github.com/aspnet/AspNetCore build 20190922.1 - dotnet-user-secrets - 3.1.0-preview1.19472.1 - dotnet-watch - 3.1.0-preview1.19472.1 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19472.1 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19472.1 - dotnet-dev-certs - 3.1.0-preview1.19472.1 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19472.1 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c775fcb3f..6048e7621 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup b0ea03ec3af2a9c388f718fbb4978984ab339953 - + https://github.com/aspnet/AspNetCore - 2980e8a283e53caa211b29783201f8c4d489e5d3 + dfc7dcd8d812ae0b68d41786065858389bb9b9fe - + https://github.com/aspnet/AspNetCore - 2980e8a283e53caa211b29783201f8c4d489e5d3 + dfc7dcd8d812ae0b68d41786065858389bb9b9fe - + https://github.com/aspnet/AspNetCore - 2980e8a283e53caa211b29783201f8c4d489e5d3 + dfc7dcd8d812ae0b68d41786065858389bb9b9fe - + https://github.com/aspnet/AspNetCore - 2980e8a283e53caa211b29783201f8c4d489e5d3 + dfc7dcd8d812ae0b68d41786065858389bb9b9fe - + https://github.com/aspnet/AspNetCore - 2980e8a283e53caa211b29783201f8c4d489e5d3 + dfc7dcd8d812ae0b68d41786065858389bb9b9fe - + https://github.com/aspnet/AspNetCore - 2980e8a283e53caa211b29783201f8c4d489e5d3 + dfc7dcd8d812ae0b68d41786065858389bb9b9fe https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index d4e462f02..14539a0f7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.1.0-preview1.19471.7 - 3.1.0-preview1.19471.7 - 3.1.0-preview1.19471.7 - 3.1.0-preview1.19471.7 - 3.1.0-preview1.19471.7 - 3.1.0-preview1.19471.7 + 3.1.0-preview1.19472.1 + 3.1.0-preview1.19472.1 + 3.1.0-preview1.19472.1 + 3.1.0-preview1.19472.1 + 3.1.0-preview1.19472.1 + 3.1.0-preview1.19472.1 From c16fbce6a86a94a0e0155a7f3d5d702328560905 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 23 Sep 2019 04:35:23 +0000 Subject: [PATCH 296/420] Update dependencies from https://github.com/aspnet/AspNetCore build 20190922.3 - dotnet-user-secrets - 3.1.0-preview1.19472.3 - dotnet-watch - 3.1.0-preview1.19472.3 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19472.3 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19472.3 - dotnet-dev-certs - 3.1.0-preview1.19472.3 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19472.3 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6048e7621..cbde52a2b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup b0ea03ec3af2a9c388f718fbb4978984ab339953 - + https://github.com/aspnet/AspNetCore - dfc7dcd8d812ae0b68d41786065858389bb9b9fe + bd6e863383863fb06a4a097e809bb4b79fb62253 - + https://github.com/aspnet/AspNetCore - dfc7dcd8d812ae0b68d41786065858389bb9b9fe + bd6e863383863fb06a4a097e809bb4b79fb62253 - + https://github.com/aspnet/AspNetCore - dfc7dcd8d812ae0b68d41786065858389bb9b9fe + bd6e863383863fb06a4a097e809bb4b79fb62253 - + https://github.com/aspnet/AspNetCore - dfc7dcd8d812ae0b68d41786065858389bb9b9fe + bd6e863383863fb06a4a097e809bb4b79fb62253 - + https://github.com/aspnet/AspNetCore - dfc7dcd8d812ae0b68d41786065858389bb9b9fe + bd6e863383863fb06a4a097e809bb4b79fb62253 - + https://github.com/aspnet/AspNetCore - dfc7dcd8d812ae0b68d41786065858389bb9b9fe + bd6e863383863fb06a4a097e809bb4b79fb62253 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 14539a0f7..37c9344a4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.1.0-preview1.19472.1 - 3.1.0-preview1.19472.1 - 3.1.0-preview1.19472.1 - 3.1.0-preview1.19472.1 - 3.1.0-preview1.19472.1 - 3.1.0-preview1.19472.1 + 3.1.0-preview1.19472.3 + 3.1.0-preview1.19472.3 + 3.1.0-preview1.19472.3 + 3.1.0-preview1.19472.3 + 3.1.0-preview1.19472.3 + 3.1.0-preview1.19472.3 From 48861bc8bd72a8df7e4606d6c6b4aef02ed10432 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 23 Sep 2019 10:05:26 +0000 Subject: [PATCH 297/420] Update dependencies from https://github.com/aspnet/AspNetCore build 20190923.1 - dotnet-user-secrets - 3.1.0-preview1.19473.1 - dotnet-watch - 3.1.0-preview1.19473.1 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19473.1 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19473.1 - dotnet-dev-certs - 3.1.0-preview1.19473.1 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19473.1 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cbde52a2b..b1222ee74 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup b0ea03ec3af2a9c388f718fbb4978984ab339953 - + https://github.com/aspnet/AspNetCore - bd6e863383863fb06a4a097e809bb4b79fb62253 + ad97f8ab85a596f3deed551964058fd2536165a6 - + https://github.com/aspnet/AspNetCore - bd6e863383863fb06a4a097e809bb4b79fb62253 + ad97f8ab85a596f3deed551964058fd2536165a6 - + https://github.com/aspnet/AspNetCore - bd6e863383863fb06a4a097e809bb4b79fb62253 + ad97f8ab85a596f3deed551964058fd2536165a6 - + https://github.com/aspnet/AspNetCore - bd6e863383863fb06a4a097e809bb4b79fb62253 + ad97f8ab85a596f3deed551964058fd2536165a6 - + https://github.com/aspnet/AspNetCore - bd6e863383863fb06a4a097e809bb4b79fb62253 + ad97f8ab85a596f3deed551964058fd2536165a6 - + https://github.com/aspnet/AspNetCore - bd6e863383863fb06a4a097e809bb4b79fb62253 + ad97f8ab85a596f3deed551964058fd2536165a6 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 37c9344a4..b4e57fced 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.1.0-preview1.19472.3 - 3.1.0-preview1.19472.3 - 3.1.0-preview1.19472.3 - 3.1.0-preview1.19472.3 - 3.1.0-preview1.19472.3 - 3.1.0-preview1.19472.3 + 3.1.0-preview1.19473.1 + 3.1.0-preview1.19473.1 + 3.1.0-preview1.19473.1 + 3.1.0-preview1.19473.1 + 3.1.0-preview1.19473.1 + 3.1.0-preview1.19473.1 From 4ed5158c76da7218d2d90080ac8ec78a3b91af12 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 23 Sep 2019 20:55:24 +0000 Subject: [PATCH 298/420] Update dependencies from https://github.com/aspnet/AspNetCore build 20190923.3 - dotnet-user-secrets - 3.1.0-preview1.19473.3 - dotnet-watch - 3.1.0-preview1.19473.3 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19473.3 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19473.3 - dotnet-dev-certs - 3.1.0-preview1.19473.3 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19473.3 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b1222ee74..b99fbfba9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup b0ea03ec3af2a9c388f718fbb4978984ab339953 - + https://github.com/aspnet/AspNetCore - ad97f8ab85a596f3deed551964058fd2536165a6 + 3c05f3a8af2c4a72b351b0bfe09329ef3ffe23f4 - + https://github.com/aspnet/AspNetCore - ad97f8ab85a596f3deed551964058fd2536165a6 + 3c05f3a8af2c4a72b351b0bfe09329ef3ffe23f4 - + https://github.com/aspnet/AspNetCore - ad97f8ab85a596f3deed551964058fd2536165a6 + 3c05f3a8af2c4a72b351b0bfe09329ef3ffe23f4 - + https://github.com/aspnet/AspNetCore - ad97f8ab85a596f3deed551964058fd2536165a6 + 3c05f3a8af2c4a72b351b0bfe09329ef3ffe23f4 - + https://github.com/aspnet/AspNetCore - ad97f8ab85a596f3deed551964058fd2536165a6 + 3c05f3a8af2c4a72b351b0bfe09329ef3ffe23f4 - + https://github.com/aspnet/AspNetCore - ad97f8ab85a596f3deed551964058fd2536165a6 + 3c05f3a8af2c4a72b351b0bfe09329ef3ffe23f4 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index b4e57fced..e10b93c27 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.1.0-preview1.19473.1 - 3.1.0-preview1.19473.1 - 3.1.0-preview1.19473.1 - 3.1.0-preview1.19473.1 - 3.1.0-preview1.19473.1 - 3.1.0-preview1.19473.1 + 3.1.0-preview1.19473.3 + 3.1.0-preview1.19473.3 + 3.1.0-preview1.19473.3 + 3.1.0-preview1.19473.3 + 3.1.0-preview1.19473.3 + 3.1.0-preview1.19473.3 From 8683689d7bcf5d05adb3cedadff1f57fa22ca81d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 23 Sep 2019 23:55:22 +0000 Subject: [PATCH 299/420] Update dependencies from https://github.com/aspnet/AspNetCore build 20190923.5 - dotnet-user-secrets - 3.1.0-preview1.19473.5 - dotnet-watch - 3.1.0-preview1.19473.5 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19473.5 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19473.5 - dotnet-dev-certs - 3.1.0-preview1.19473.5 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19473.5 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b99fbfba9..771773837 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup b0ea03ec3af2a9c388f718fbb4978984ab339953 - + https://github.com/aspnet/AspNetCore - 3c05f3a8af2c4a72b351b0bfe09329ef3ffe23f4 + 26f160d1649350083fad67f45741ceb1c798b110 - + https://github.com/aspnet/AspNetCore - 3c05f3a8af2c4a72b351b0bfe09329ef3ffe23f4 + 26f160d1649350083fad67f45741ceb1c798b110 - + https://github.com/aspnet/AspNetCore - 3c05f3a8af2c4a72b351b0bfe09329ef3ffe23f4 + 26f160d1649350083fad67f45741ceb1c798b110 - + https://github.com/aspnet/AspNetCore - 3c05f3a8af2c4a72b351b0bfe09329ef3ffe23f4 + 26f160d1649350083fad67f45741ceb1c798b110 - + https://github.com/aspnet/AspNetCore - 3c05f3a8af2c4a72b351b0bfe09329ef3ffe23f4 + 26f160d1649350083fad67f45741ceb1c798b110 - + https://github.com/aspnet/AspNetCore - 3c05f3a8af2c4a72b351b0bfe09329ef3ffe23f4 + 26f160d1649350083fad67f45741ceb1c798b110 https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index e10b93c27..00af10e1c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.1.0-preview1.19473.3 - 3.1.0-preview1.19473.3 - 3.1.0-preview1.19473.3 - 3.1.0-preview1.19473.3 - 3.1.0-preview1.19473.3 - 3.1.0-preview1.19473.3 + 3.1.0-preview1.19473.5 + 3.1.0-preview1.19473.5 + 3.1.0-preview1.19473.5 + 3.1.0-preview1.19473.5 + 3.1.0-preview1.19473.5 + 3.1.0-preview1.19473.5 From 76a361bbf84e62d746f1d0a5a27e7c7d4d6f1209 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Tue, 24 Sep 2019 10:36:04 -0700 Subject: [PATCH 300/420] Add CrossPlatform AppHost Packs; release/3.1.1xx (#4916) * Add CrossPlatform AppHost Packs for arm & arm64. --- src/redist/targets/GenerateLayout.targets | 47 +++++++++++++++++-- src/redist/targets/GenerateMSIs.targets | 3 ++ .../packaging/windows/clisdk/bundle.wxs | 9 ++++ .../windows/clisdk/generatebundle.ps1 | 8 +++- 4 files changed, 63 insertions(+), 4 deletions(-) diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index 766a42b6d..b1cc71780 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -32,6 +32,8 @@ $(CoreSetupRid) x64 + x64 + x86 dotnet-host$(InstallerStartSuffix)-$(SharedHostVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) dotnet-hostfxr$(InstallerStartSuffix)-$(HostFxrVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) dotnet-runtime$(InstallerStartSuffix)-$(MicrosoftNETCoreAppPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) @@ -39,6 +41,9 @@ windowsdesktop-runtime-$(MicrosoftWindowsDesktopPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) dotnet-targeting-pack-$(NetCoreAppTargetingPackVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) dotnet-apphost-pack-$(NetCoreAppHostPackVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) + dotnet-apphost-pack-$(NetCoreAppHostPackVersion)-$(SharedFrameworkInstallerFileRid)_$(AlternateArchitecture)$(InstallerExtension) + dotnet-apphost-pack-$(NetCoreAppHostPackVersion)-$(SharedFrameworkInstallerFileRid)_arm$(InstallerExtension) + dotnet-apphost-pack-$(NetCoreAppHostPackVersion)-$(SharedFrameworkInstallerFileRid)_arm64$(InstallerExtension) windowsdesktop-targeting-pack-$(WindowsDesktopTargetingPackVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) netstandard-targeting-pack-$(NETStandardLibraryRefPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) netstandard$(NETStandardLibraryRefPackageVersion.Split('.')[0])$(NETStandardLibraryRefPackageVersion.Split('.')[1]) @@ -76,9 +81,10 @@ $(CoreSetupDownloadDirectory)/combinedSharedHostAndFrameworkArchive$(ArchiveExtension) - - win-x64 - win-x86 + + win-$(AlternateArchitecture) + win-arm + win-arm64 @@ -124,6 +130,20 @@ packs/%(PackageName)/%(PackageVersion) + + Microsoft.NETCore.App.Host.$(ArmAppHostRid) + $(NetCoreAppHostPackVersion) + $(TargetFramework) + packs/%(PackageName)/%(PackageVersion) + + + + Microsoft.NETCore.App.Host.$(Arm64AppHostRid) + $(NetCoreAppHostPackVersion) + $(TargetFramework) + packs/%(PackageName)/%(PackageVersion) + + $(CoreSetupRootUrl)$(MicrosoftNETCoreAppPackageVersion) @@ -173,6 +193,27 @@ $(CoreSetupBlobAccessTokenParam) + + $(CoreSetupRootUrl)$(MicrosoftNETCoreAppPackageVersion) + $(DownloadedAlternateNetCoreAppHostPackInstallerFileName) + $(CoreSetupBlobAccessTokenParam) + + + + $(CoreSetupRootUrl)$(MicrosoftNETCoreAppPackageVersion) + $(DownloadedArmNetCoreAppHostPackInstallerFileName) + $(CoreSetupBlobAccessTokenParam) + + + + $(CoreSetupRootUrl)$(MicrosoftNETCoreAppPackageVersion) + $(DownloadedArm64NetCoreAppHostPackInstallerFileName) + $(CoreSetupBlobAccessTokenParam) + + $(CoreSetupRootUrl)$(WindowsDesktopTargetingPackVersion) diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index 82d619de0..b523ad822 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -239,6 +239,9 @@ '$(DownloadsFolder)$(DownloadedNetCoreAppTargetingPackInstallerFileName)' ^ '$(DownloadsFolder)$(DownloadedNetStandardTargetingPackInstallerFileName)' ^ '$(DownloadsFolder)$(DownloadedNetCoreAppHostPackInstallerFileName)' ^ + '$(DownloadsFolder)$(DownloadedAlternateNetCoreAppHostPackInstallerFileName)' ^ + '$(DownloadsFolder)$(DownloadedArmNetCoreAppHostPackInstallerFileName)' ^ + '$(DownloadsFolder)$(DownloadedArm64NetCoreAppHostPackInstallerFileName)' ^ '$(DownloadsFolder)$(DownloadedAspNetTargetingPackInstallerFileName)' ^ '$(DownloadsFolder)$(DownloadedWindowsDesktopTargetingPackInstallerFileName)' ^ '$(Templates30MSIInstallerFile)' ^ diff --git a/src/redist/targets/packaging/windows/clisdk/bundle.wxs b/src/redist/targets/packaging/windows/clisdk/bundle.wxs index 27d2f03ba..2d3c31dd9 100644 --- a/src/redist/targets/packaging/windows/clisdk/bundle.wxs +++ b/src/redist/targets/packaging/windows/clisdk/bundle.wxs @@ -133,6 +133,15 @@ + + + + + + + + + diff --git a/src/redist/targets/packaging/windows/clisdk/generatebundle.ps1 b/src/redist/targets/packaging/windows/clisdk/generatebundle.ps1 index 649fbdd5d..d4eb57dfa 100644 --- a/src/redist/targets/packaging/windows/clisdk/generatebundle.ps1 +++ b/src/redist/targets/packaging/windows/clisdk/generatebundle.ps1 @@ -9,8 +9,11 @@ param( [Parameter(Mandatory=$true)][string]$SharedHostMSIFile, [Parameter(Mandatory=$true)][string]$WinFormsAndWpfMSIFile, [Parameter(Mandatory=$true)][string]$NetCoreAppTargetingPackMSIFile, - [Parameter(Mandatory=$true)][string]$NetCoreAppHostPackMSIFile, [Parameter(Mandatory=$true)][string]$NetStandardTargetingPackMSIFile, + [Parameter(Mandatory=$true)][string]$NetCoreAppHostPackMSIFile, + [Parameter(Mandatory=$true)][string]$AlternateNetCoreAppHostPackMSIFile, + [Parameter(Mandatory=$true)][string]$ArmNetCoreAppHostPackMSIFile, + [Parameter(Mandatory=$true)][string]$Arm64NetCoreAppHostPackMSIFile, [Parameter(Mandatory=$true)][string]$AspNetTargetingPackMSIFile, [Parameter(Mandatory=$true)][string]$WindowsDesktopTargetingPackMSIFile, [Parameter(Mandatory=$true)][string]$TemplatesMSIFile, @@ -53,6 +56,9 @@ function RunCandleForBundle -dWinFormsAndWpfMsiSourcePath="$WinFormsAndWpfMSIFile" ` -dNetCoreAppTargetingPackMsiSourcePath="$NetCoreAppTargetingPackMSIFile" ` -dNetCoreAppHostPackMsiSourcePath="$NetCoreAppHostPackMSIFile" ` + -dAlternateNetCoreAppHostPackMsiSourcePath="$AlternateNetCoreAppHostPackMSIFile" ` + -dArmNetCoreAppHostPackMsiSourcePath="$ArmNetCoreAppHostPackMSIFile" ` + -dArm64NetCoreAppHostPackMsiSourcePath="$Arm64NetCoreAppHostPackMSIFile" ` -dNetStandardTargetingPackMsiSourcePath="$NetStandardTargetingPackMSIFile" ` -dAspNetTargetingPackMsiSourcePath="$AspNetTargetingPackMSIFile" ` -dWindowsDesktopTargetingPackMsiSourcePath="$WindowsDesktopTargetingPackMSIFile" ` From ee070dc387de1bef03ff2f1d51803ebc5765fc92 Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Tue, 24 Sep 2019 12:35:59 -0700 Subject: [PATCH 301/420] Fix typos in merge conflict resolution --- eng/Versions.props | 2 +- src/redist/targets/GenerateLayout.targets | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 2ca8c8819..e6e912add 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -59,7 +59,7 @@ $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) 3.1.0-preview1.19470.9 - 3.1.0-preview1.19470.9/MicrosoftWindowsDesktopAppPackageVersion> + 3.1.0-preview1.19470.9 $(MicrosoftWindowsDesktopAppPackageVersion) diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index af581bf2f..92b0f5a73 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -54,7 +54,7 @@ $(CoreSetupRid) $(ProductMonikerRid) linux-$(Architecture) - otnet-runtime-$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) + dotnet-runtime-$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) windowsdesktop-runtime-$(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) $(SharedFrameworkRid) From 2ca44ceace662b0ec9746fd7356d7da606d7506f Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Tue, 24 Sep 2019 12:48:28 -0700 Subject: [PATCH 302/420] Use stable 3.0.0/2.1.0 versions where appropriate --- eng/Version.Details.xml | 3 ++- eng/Versions.props | 4 ++-- src/redist/targets/GenerateBundledVersions.targets | 10 ++++++---- src/redist/targets/GenerateLayout.targets | 3 ++- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5cc1eaa1a..d9cd559f0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -30,7 +30,8 @@ https://github.com/dotnet/core-setup 72b39b0473993b932a08c8fc24a8988d45b416a5 - + + https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 diff --git a/eng/Versions.props b/eng/Versions.props index e6e912add..de992e493 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -73,12 +73,12 @@ $(AspNetCoreVersion) 4.8.0-rc2.19462.10 - 3.0.0-rc2.19459.11 + 3.0.0 1.6.3 2.0.0-preview8.19373.1 $(MicrosoftDotNetCommonItemTemplates30PackageVersion) 1.0.2-beta4.19354.2 - 3.0.0-rc2.19461.12 + 3.0.0 1.6.0 1.0.2-beta4 diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 115e59186..e6966995c 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -30,12 +30,12 @@ <_NETStandardLibraryPackageVersion>@(_NETStandardLibraryPackageVersions->Distinct()) <_NETCorePlatformsPackageVersion>@(_NETCorePlatformsPackageVersions->Distinct()) - <_NETCoreApp30PackageVersion>3.0.0-rc1-19456-20 + <_NETCoreApp30PackageVersion>3.0.0 <_NETCoreApp30TargetingPackVersion>$(_NETCoreApp30PackageVersion) <_MicrosoftWindowsDesktop30PackageVersion>$(_NETCoreApp30PackageVersion) <_MicrosoftWindowsDesktop30TargetingPackVersion>$(_NETCoreApp30TargetingPackVersion) - <_MicrosoftAspNetCoreApp30PackageVersion>3.0.0-rc2.19461.12 + <_MicrosoftAspNetCoreApp30PackageVersion>3.0.0 <_AspNet30TargetingPackVersion>$(_MicrosoftAspNetCoreApp30PackageVersion) @@ -77,7 +77,7 @@ - + + @@ -319,7 +321,7 @@ Copyright (c) .NET Foundation. All rights reserved. TargetingPackName="Microsoft.AspNetCore.App.Ref" TargetingPackVersion="$(_AspNet30TargetingPackVersion)" RuntimePackNamePatterns="Microsoft.AspNetCore.App.Runtime.**RID**" - RuntimePackRuntimeIdentifiers="@(AspNetCoreRuntimePackRids, '%3B')" + RuntimePackRuntimeIdentifiers="@(AspNetCore30RuntimePackRids, '%3B')" /> - $(CoreSetupRootUrl)$(MicrosoftNETCoreAppRuntimewinx64PackageVersion) + + $(CoreSetupRootUrl)3.0.0 $(DownloadedNetStandardTargetingPackInstallerFileName) $(CoreSetupBlobAccessTokenParam) From 5158bd0d7f89a872acfd9ee6e3b080c19f767fe1 Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Tue, 24 Sep 2019 13:03:32 -0700 Subject: [PATCH 303/420] Fix errors in README.md merege --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 83af31f6c..e2ef7b5a5 100644 --- a/README.md +++ b/README.md @@ -51,10 +51,10 @@ With development builds, internal NuGet feeds are necessary for some scenarios ( ``` -| Platform | Master
(5.0.x Runtime) | Release/3.1.1XX
(3.1.x Runtime) | Release/2.2.3XX
(2.2.x Runtime) | Release/2.2.2XX
(2.2.x Runtime) | Release/2.2.1XX
(2.2.x Runtime) | Release/2.1.7XX
(2.1.7 Runtime) | Release/2.1.6XX
(2.1.6 Runtime) | Release/2.1.5XX
(2.1.5 Runtime) | -|---------|:----------:|:----------:|:----------:|:----------:|:----------:|:----------:|:----------:|:----------:|:----------:| +| Platform | Master
(5.0.x Runtime) | Release/3.1.1XX
(3.1.x Runtime) | Release/3.0.1xx
(3.0.x Runtime) | Release/2.2.3XX
(2.2.x Runtime) | Release/2.2.2XX
(2.2.x Runtime) | Release/2.2.1XX
(2.2.x Runtime) | Release/2.1.7XX
(2.1.7 Runtime) | Release/2.1.6XX
(2.1.6 Runtime) | Release/2.1.5XX
(2.1.5 Runtime) | +|:---------|:----------:|:----------:|:----------:|:----------:|:----------:|:----------:|:----------:|:----------:|:----------:| | **Windows x64** | [![][win-x64-badge-master]][win-x64-version-master]
[Installer][win-x64-installer-master] - [Checksum][win-x64-installer-checksum-master]
[zip][win-x64-zip-master] - [Checksum][win-x64-zip-checksum-master] | [![][win-x64-badge-3.1.1xx]][win-x64-version-3.1.1xx]
[Installer][win-x64-installer-3.1.1xx] - [Checksum][win-x64-installer-checksum-3.1.1xx]
[zip][win-x64-zip-3.1.1xx] - [Checksum][win-x64-zip-checksum-3.1.1xx] | [![][win-x64-badge-3.0.1xx]][win-x64-version-3.0.1xx]
[Installer][win-x64-installer-3.0.1xx] - [Checksum][win-x64-installer-checksum-3.0.1xx]
[zip][win-x64-zip-3.0.1xx] - [Checksum][win-x64-zip-checksum-3.0.1xx] | [![][win-x64-badge-2.2.3XX]][win-x64-version-2.2.3XX]
[Installer][win-x64-installer-2.2.3XX] - [Checksum][win-x64-installer-checksum-2.2.3XX]
[zip][win-x64-zip-2.2.3XX] - [Checksum][win-x64-zip-checksum-2.2.3XX] |[![][win-x64-badge-2.2.2XX]][win-x64-version-2.2.2XX]
[Installer][win-x64-installer-2.2.2XX] - [Checksum][win-x64-installer-checksum-2.2.2XX]
[zip][win-x64-zip-2.2.2XX] - [Checksum][win-x64-zip-checksum-2.2.2XX] |[![][win-x64-badge-2.2.1XX]][win-x64-version-2.2.1XX]
[Installer][win-x64-installer-2.2.1XX] - [Checksum][win-x64-installer-checksum-2.2.1XX]
[zip][win-x64-zip-2.2.1XX] - [Checksum][win-x64-zip-checksum-2.2.1XX] |[![][win-x64-badge-2.1.7XX]][win-x64-version-2.1.7XX]
[Installer][win-x64-installer-2.1.7XX] - [Checksum][win-x64-installer-checksum-2.1.7XX]
[zip][win-x64-zip-2.1.7XX] - [Checksum][win-x64-zip-checksum-2.1.7XX] | [![][win-x64-badge-2.1.6XX]][win-x64-version-2.1.6XX]
[Installer][win-x64-installer-2.1.6XX] - [Checksum][win-x64-installer-checksum-2.1.6XX]
[zip][win-x64-zip-2.1.6XX] - [Checksum][win-x64-zip-checksum-2.1.6XX] | [![][win-x64-badge-2.1.5XX]][win-x64-version-2.1.5XX]
[Installer][win-x64-installer-2.1.5XX] - [Checksum][win-x64-installer-checksum-2.1.5XX]
[zip][win-x64-zip-2.1.5XX] - [Checksum][win-x64-zip-checksum-2.1.5XX] | -| **Windows x86** | [![][win-x86-badge-master]][win-x86-version-master]
[Installer][win-x86-installer-master] - [Checksum][win-x86-installer-checksum-master]
[zip][win-x86-zip-master] - [Checksum][win-x86-zip-checksum-master] | [![][win-x86-badge-3.1.1xx]][win-x86-version-3.1.1xx]
[Installer][win-x86-installer-3.1.1xx] - [Checksum][win-x86-installer-checksum-3.1.1xx]
[zip][win-x86-zip-3.1.1xx] - [Checksum][win-x86-zip-checksum-3.1.1xx] | [![][win-x86-badge-2.2.3XX]][win-x86-version-2.2.3XX]
[Installer][win-x86-installer-2.2.3XX] - [Checksum][win-x86-installer-checksum-2.2.3XX]
[zip][win-x86-zip-2.2.3XX] - [Checksum][win-x86-zip-checksum-2.2.3XX] |[![][win-x86-badge-2.2.2XX]][win-x86-version-2.2.2XX]
[Installer][win-x86-installer-2.2.2XX] - [Checksum][win-x86-installer-checksum-2.2.2XX]
[zip][win-x86-zip-2.2.2XX] - [Checksum][win-x86-zip-checksum-2.2.2XX] |[![][win-x86-badge-2.2.1XX]][win-x86-version-2.2.1XX]
[Installer][win-x86-installer-2.2.1XX] - [Checksum][win-x86-installer-checksum-2.2.1XX]
[zip][win-x86-zip-2.2.1XX] - [Checksum][win-x86-zip-checksum-2.2.1XX] |[![][win-x86-badge-2.1.7XX]][win-x86-version-2.1.7XX]
[Installer][win-x86-installer-2.1.7XX] - [Checksum][win-x86-installer-checksum-2.1.7XX]
[zip][win-x86-zip-2.1.7XX] - [Checksum][win-x86-zip-checksum-2.1.7XX] | [![][win-x86-badge-2.1.6XX]][win-x86-version-2.1.6XX]
[Installer][win-x86-installer-2.1.6XX] - [Checksum][win-x86-installer-checksum-2.1.6XX]
[zip][win-x86-zip-2.1.6XX] - [Checksum][win-x86-zip-checksum-2.1.6XX] | [![][win-x86-badge-2.1.5XX]][win-x86-version-2.1.5XX]
[Installer][win-x86-installer-2.1.5XX] - [Checksum][win-x86-installer-checksum-2.1.5XX]
[zip][win-x86-zip-2.1.5XX] - [Checksum][win-x86-zip-checksum-2.1.5XX] | +| **Windows x86** | [![][win-x86-badge-master]][win-x86-version-master]
[Installer][win-x86-installer-master] - [Checksum][win-x86-installer-checksum-master]
[zip][win-x86-zip-master] - [Checksum][win-x86-zip-checksum-master] | [![][win-x86-badge-3.1.1xx]][win-x86-version-3.1.1xx]
[Installer][win-x86-installer-3.1.1xx] - [Checksum][win-x86-installer-checksum-3.1.1xx]
[zip][win-x86-zip-3.1.1xx] - [Checksum][win-x86-zip-checksum-3.1.1xx] | [![][win-x86-badge-3.0.1xx]][win-x86-version-3.0.1xx]
[Installer][win-x86-installer-3.0.1xx] - [Checksum][win-x86-installer-checksum-3.0.1xx]
[zip][win-x86-zip-3.0.1xx] - [Checksum][win-x86-zip-checksum-3.0.1xx] | [![][win-x86-badge-2.2.3XX]][win-x86-version-2.2.3XX]
[Installer][win-x86-installer-2.2.3XX] - [Checksum][win-x86-installer-checksum-2.2.3XX]
[zip][win-x86-zip-2.2.3XX] - [Checksum][win-x86-zip-checksum-2.2.3XX] |[![][win-x86-badge-2.2.2XX]][win-x86-version-2.2.2XX]
[Installer][win-x86-installer-2.2.2XX] - [Checksum][win-x86-installer-checksum-2.2.2XX]
[zip][win-x86-zip-2.2.2XX] - [Checksum][win-x86-zip-checksum-2.2.2XX] |[![][win-x86-badge-2.2.1XX]][win-x86-version-2.2.1XX]
[Installer][win-x86-installer-2.2.1XX] - [Checksum][win-x86-installer-checksum-2.2.1XX]
[zip][win-x86-zip-2.2.1XX] - [Checksum][win-x86-zip-checksum-2.2.1XX] |[![][win-x86-badge-2.1.7XX]][win-x86-version-2.1.7XX]
[Installer][win-x86-installer-2.1.7XX] - [Checksum][win-x86-installer-checksum-2.1.7XX]
[zip][win-x86-zip-2.1.7XX] - [Checksum][win-x86-zip-checksum-2.1.7XX] | [![][win-x86-badge-2.1.6XX]][win-x86-version-2.1.6XX]
[Installer][win-x86-installer-2.1.6XX] - [Checksum][win-x86-installer-checksum-2.1.6XX]
[zip][win-x86-zip-2.1.6XX] - [Checksum][win-x86-zip-checksum-2.1.6XX] | [![][win-x86-badge-2.1.5XX]][win-x86-version-2.1.5XX]
[Installer][win-x86-installer-2.1.5XX] - [Checksum][win-x86-installer-checksum-2.1.5XX]
[zip][win-x86-zip-2.1.5XX] - [Checksum][win-x86-zip-checksum-2.1.5XX] | | **macOS** | [![][osx-badge-master]][osx-version-master]
[Installer][osx-installer-master] - [Checksum][osx-installer-checksum-master]
[tar.gz][osx-targz-master] - [Checksum][osx-targz-checksum-master] | [![][osx-badge-3.1.1xx]][osx-version-3.1.1xx]
[Installer][osx-installer-3.1.1xx] - [Checksum][osx-installer-checksum-3.1.1xx]
[tar.gz][osx-targz-3.1.1xx] - [Checksum][osx-targz-checksum-3.1.1xx] | [![][osx-badge-3.0.1xx]][osx-version-3.0.1xx]
[Installer][osx-installer-3.0.1xx] - [Checksum][osx-installer-checksum-3.0.1xx]
[tar.gz][osx-targz-3.0.1xx] - [Checksum][osx-targz-checksum-3.0.1xx] | [![][osx-badge-2.2.3XX]][osx-version-2.2.3XX]
[Installer][osx-installer-2.2.3XX] - [Checksum][osx-installer-checksum-2.2.3XX]
[tar.gz][osx-targz-2.2.3XX] - [Checksum][osx-targz-checksum-2.2.3XX] |[![][osx-badge-2.2.2XX]][osx-version-2.2.2XX]
[Installer][osx-installer-2.2.2XX] - [Checksum][osx-installer-checksum-2.2.2XX]
[tar.gz][osx-targz-2.2.2XX] - [Checksum][osx-targz-checksum-2.2.2XX] |[![][osx-badge-2.2.1XX]][osx-version-2.2.1XX]
[Installer][osx-installer-2.2.1XX] - [Checksum][osx-installer-checksum-2.2.1XX]
[tar.gz][osx-targz-2.2.1XX] - [Checksum][osx-targz-checksum-2.2.1XX] |[![][osx-badge-2.1.7XX]][osx-version-2.1.7XX]
[Installer][osx-installer-2.1.7XX] - [Checksum][osx-installer-checksum-2.1.7XX]
[tar.gz][osx-targz-2.1.7XX] - [Checksum][osx-targz-checksum-2.1.7XX] | [![][osx-badge-2.1.6XX]][osx-version-2.1.6XX]
[Installer][osx-installer-2.1.6XX] - [Checksum][osx-installer-checksum-2.1.6XX]
[tar.gz][osx-targz-2.1.6XX] - [Checksum][osx-targz-checksum-2.1.6XX] | [![][osx-badge-2.1.5XX]][osx-version-2.1.5XX]
[Installer][osx-installer-2.1.5XX] - [Checksum][osx-installer-checksum-2.1.5XX]
[tar.gz][osx-targz-2.1.5XX] - [Checksum][osx-targz-checksum-2.1.5XX] | | **Linux x64** | [![][linux-badge-master]][linux-version-master]
[DEB Installer][linux-DEB-installer-master] - [Checksum][linux-DEB-installer-checksum-master]
[RPM Installer][linux-RPM-installer-master] - [Checksum][linux-RPM-installer-checksum-master]
_see installer note below_1
[tar.gz][linux-targz-master] - [Checksum][linux-targz-checksum-master] | [![][linux-badge-3.1.1xx]][linux-version-3.1.1xx]
[DEB Installer][linux-DEB-installer-3.1.1xx] - [Checksum][linux-DEB-installer-checksum-3.1.1xx]
[RPM Installer][linux-RPM-installer-3.1.1xx] - [Checksum][linux-RPM-installer-checksum-3.1.1xx]
_see installer note below_1
[tar.gz][linux-targz-3.1.1xx] - [Checksum][linux-targz-checksum-3.1.1xx] | [![][linux-badge-3.0.1xx]][linux-version-3.0.1xx]
[DEB Installer][linux-DEB-installer-3.0.1xx] - [Checksum][linux-DEB-installer-checksum-3.0.1xx]
[RPM Installer][linux-RPM-installer-3.0.1xx] - [Checksum][linux-RPM-installer-checksum-3.0.1xx]
_see installer note below_1
[tar.gz][linux-targz-3.0.1xx] - [Checksum][linux-targz-checksum-3.0.1xx] | [![][linux-badge-2.2.3xx]][linux-version-2.2.3xx]
[DEB Installer][linux-DEB-installer-2.2.3XX] - [Checksum][linux-DEB-installer-checksum-2.2.3XX]
[RPM Installer][linux-RPM-installer-2.2.3XX] - [Checksum][linux-RPM-installer-checksum-2.2.3XX]
_see installer note below_1
[tar.gz][linux-targz-2.2.3XX] - [Checksum][linux-targz-checksum-2.2.3XX] |[![][linux-badge-2.2.2xx]][linux-version-2.2.2xx]
[DEB Installer][linux-DEB-installer-2.2.2XX] - [Checksum][linux-DEB-installer-checksum-2.2.2XX]
[RPM Installer][linux-RPM-installer-2.2.2XX] - [Checksum][linux-RPM-installer-checksum-2.2.2XX]
_see installer note below_1
[tar.gz][linux-targz-2.2.2XX] - [Checksum][linux-targz-checksum-2.2.2XX] |[![][linux-badge-2.2.1xx]][linux-version-2.2.1xx]
[DEB Installer][linux-DEB-installer-2.2.1XX] - [Checksum][linux-DEB-installer-checksum-2.2.1XX]
[RPM Installer][linux-RPM-installer-2.2.1XX] - [Checksum][linux-RPM-installer-checksum-2.2.1XX]
_see installer note below_1
[tar.gz][linux-targz-2.2.1XX] - [Checksum][linux-targz-checksum-2.2.1XX] |[![][linux-badge-2.1.7XX]][linux-version-2.1.7XX]
[DEB Installer][linux-DEB-installer-2.1.7XX] - [Checksum][linux-DEB-installer-checksum-2.1.7XX]
[RPM Installer][linux-RPM-installer-2.1.7XX] - [Checksum][linux-RPM-installer-checksum-2.1.7XX]
_see installer note below_1
[tar.gz][linux-targz-2.1.7XX] - [Checksum][linux-targz-checksum-2.1.7XX] | [![][linux-badge-2.1.6XX]][linux-version-2.1.6XX]
[DEB Installer][linux-DEB-installer-2.1.6XX] - [Checksum][linux-DEB-installer-checksum-2.1.6XX]
[RPM Installer][linux-RPM-installer-2.1.6XX] - [Checksum][linux-RPM-installer-checksum-2.1.6XX]
_see installer note below_1
[tar.gz][linux-targz-2.1.6XX] - [Checksum][linux-targz-checksum-2.1.6XX] | [![][linux-badge-2.1.5XX]][linux-version-2.1.5XX]
[DEB Installer][linux-DEB-installer-2.1.5XX] - [Checksum][linux-DEB-installer-checksum-2.1.5XX]
[RPM Installer][linux-RPM-installer-2.1.5XX] - [Checksum][linux-RPM-installer-checksum-2.1.5XX]
_see installer note below_1
[tar.gz][linux-targz-2.1.5XX] - [Checksum][linux-targz-checksum-2.1.5XX] | | **Linux arm** | [![][linux-arm-badge-master]][linux-arm-version-master]
[tar.gz][linux-arm-targz-master] - [Checksum][linux-arm-targz-checksum-master] | [![][linux-arm-badge-3.1.1xx]][linux-arm-version-3.1.1xx]
[tar.gz][linux-arm-targz-3.1.1xx] - [Checksum][linux-arm-targz-checksum-3.1.1xx] | [![][linux-arm-badge-3.0.1xx]][linux-arm-version-3.0.1xx]
[tar.gz][linux-arm-targz-3.0.1xx] - [Checksum][linux-arm-targz-checksum-3.0.1xx] | [![][linux-arm-badge-2.2.3XX]][linux-arm-version-2.2.3XX]
[tar.gz][linux-arm-targz-2.2.3XX] - [Checksum][linux-arm-targz-checksum-2.2.3XX] | [![][linux-arm-badge-2.2.2XX]][linux-arm-version-2.2.2XX]
[tar.gz][linux-arm-targz-2.2.2XX] - [Checksum][linux-arm-targz-checksum-2.2.2XX] | [![][linux-arm-badge-2.2.1XX]][linux-arm-version-2.2.1XX]
[tar.gz][linux-arm-targz-2.2.1XX] - [Checksum][linux-arm-targz-checksum-2.2.1XX] | [![][linux-arm-badge-2.1.7XX]][linux-arm-version-2.1.7XX]
[tar.gz][linux-arm-targz-2.1.7XX] - [Checksum][linux-arm-targz-checksum-2.1.7XX] | [![][linux-arm-badge-2.1.6XX]][linux-arm-version-2.1.6XX]
[tar.gz][linux-arm-targz-2.1.6XX] - [Checksum][linux-arm-targz-checksum-2.1.6XX] | [![][linux-arm-badge-2.1.5XX]][linux-arm-version-2.1.5XX]
[tar.gz][linux-arm-targz-2.1.5XX] - [Checksum][linux-arm-targz-checksum-2.1.5XX] | From 0cc95ac36cbaa1d7cf5b18a5d0fa4879e2d14bca Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 24 Sep 2019 13:59:39 -0700 Subject: [PATCH 304/420] [release/3.1.1xx] Update dependencies from dotnet/toolset (#4797) * Update dependencies from https://github.com/dotnet/toolset build 20190924.3 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19474.3 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview1.19463.2 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19474.2 (parent: Microsoft.Dotnet.Toolset.Internal) * Override PATH to let razor find stage2 dotnet --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- test/EndToEnd/ProjectBuildTests.cs | 8 +++++--- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 37ef3fe87..cd395021b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,17 +42,17 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - a8d3527fb2816d377ffabda05fb43b34bb1635db + ab601116c06e74e7183920e69bc5251fe2b18d10 - + https://github.com/dotnet/sdk - b88161ed99ded0dd598779ad1afe044818422a6f + a19b734139ab62de631c31897b0ffc35f8462f3f - + https://github.com/dotnet/cli - 25e58e48c0f49360bb5a9c804ca3b2ebeae01246 + 4a9e195d7123e1c3d774cf8e6881d3ff93f47c44 diff --git a/eng/Versions.props b/eng/Versions.props index 89cfeca07..2fc6ae042 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19462.27 + 3.1.100-preview1.19474.3 @@ -33,14 +33,14 @@ - 3.1.100-preview1.19462.8 + 3.1.100-preview1.19474.2 0.2.0 - 3.0.100-rc2.19455.7 + 3.1.100-preview1.19463.2 $(MicrosoftNETSdkPackageVersion) diff --git a/test/EndToEnd/ProjectBuildTests.cs b/test/EndToEnd/ProjectBuildTests.cs index 5770d6f3a..be7f7132d 100644 --- a/test/EndToEnd/ProjectBuildTests.cs +++ b/test/EndToEnd/ProjectBuildTests.cs @@ -143,10 +143,12 @@ namespace EndToEnd.Tests .Execute(restoreArgs) .Should().Pass(); + var dotnetRoot = Path.GetDirectoryName(RepoDirectoriesProvider.DotnetUnderTest); new BuildCommand() - .WithWorkingDirectory(projectDirectory) - .Execute() - .Should().Pass(); + .WithEnvironmentVariable("PATH", dotnetRoot) // override PATH since razor rely on PATH to find dotnet + .WithWorkingDirectory(projectDirectory) + .Execute() + .Should().Pass(); } } } From 067a78fb703621c8aa1e42c7c774895a1dfe1b10 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 24 Sep 2019 21:18:14 +0000 Subject: [PATCH 305/420] [release/3.1.1xx] Update dependencies from aspnet/AspNetCore (#4925) * Update dependencies from https://github.com/aspnet/AspNetCore build 20190924.2 - dotnet-user-secrets - 3.1.0-preview1.19474.2 - dotnet-watch - 3.1.0-preview1.19474.2 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19474.2 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19474.2 - dotnet-dev-certs - 3.1.0-preview1.19474.2 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19474.2 * Update dependencies from https://github.com/aspnet/AspNetCore build 20190924.4 - dotnet-user-secrets - 3.1.0-preview1.19474.4 - dotnet-watch - 3.1.0-preview1.19474.4 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19474.4 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19474.4 - dotnet-dev-certs - 3.1.0-preview1.19474.4 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19474.4 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cd395021b..f1dd11981 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup 72b39b0473993b932a08c8fc24a8988d45b416a5 - + https://github.com/aspnet/AspNetCore - 26f160d1649350083fad67f45741ceb1c798b110 + ab1347ef20745187440a8bf0f857362b5089056c - + https://github.com/aspnet/AspNetCore - 26f160d1649350083fad67f45741ceb1c798b110 + ab1347ef20745187440a8bf0f857362b5089056c - + https://github.com/aspnet/AspNetCore - 26f160d1649350083fad67f45741ceb1c798b110 + ab1347ef20745187440a8bf0f857362b5089056c - + https://github.com/aspnet/AspNetCore - 26f160d1649350083fad67f45741ceb1c798b110 + ab1347ef20745187440a8bf0f857362b5089056c - + https://github.com/aspnet/AspNetCore - 26f160d1649350083fad67f45741ceb1c798b110 + ab1347ef20745187440a8bf0f857362b5089056c - + https://github.com/aspnet/AspNetCore - 26f160d1649350083fad67f45741ceb1c798b110 + ab1347ef20745187440a8bf0f857362b5089056c https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index 2fc6ae042..d2f070f5b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.1.0-preview1.19473.5 - 3.1.0-preview1.19473.5 - 3.1.0-preview1.19473.5 - 3.1.0-preview1.19473.5 - 3.1.0-preview1.19473.5 - 3.1.0-preview1.19473.5 + 3.1.0-preview1.19474.4 + 3.1.0-preview1.19474.4 + 3.1.0-preview1.19474.4 + 3.1.0-preview1.19474.4 + 3.1.0-preview1.19474.4 + 3.1.0-preview1.19474.4 From ca0986c0ffae609bcafe6e47889a9e372ca47e26 Mon Sep 17 00:00:00 2001 From: Livar Date: Tue, 24 Sep 2019 16:09:49 -0700 Subject: [PATCH 306/420] Updating branding to 3.0.1-servicing (#4924) * Updating branding to 3.0.1-servicing Also removed the DropSuffix so that we stop producing final branded builds for now. * Address code review comments Set DropSuffix to false instead of removing it. --- src/redist/targets/Versions.targets | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/redist/targets/Versions.targets b/src/redist/targets/Versions.targets index 5bace50b7..fb880e60d 100644 --- a/src/redist/targets/Versions.targets +++ b/src/redist/targets/Versions.targets @@ -3,12 +3,12 @@ 3 0 1 - 00 - rc2 + 01 + servicing - true + false From de5d189275a1695c5d4a8a53727315a76a13f6da Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 24 Sep 2019 23:30:36 +0000 Subject: [PATCH 307/420] Update dependencies from https://github.com/dotnet/toolset build 20190924.5 (#4929) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19474.5 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview1.19469.1 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f1dd11981..a2fe28519 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,13 +42,13 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - ab601116c06e74e7183920e69bc5251fe2b18d10 + 1cb9d48ea26f274afc89c185b640386fe4dc1d38 - + https://github.com/dotnet/sdk - a19b734139ab62de631c31897b0ffc35f8462f3f + 902380600200731914d936fca50b60e3e06dcb16 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index d2f070f5b..a55d6bfc2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19474.3 + 3.1.100-preview1.19474.5 @@ -40,7 +40,7 @@ - 3.1.100-preview1.19463.2 + 3.1.100-preview1.19469.1 $(MicrosoftNETSdkPackageVersion) From 91519346e4bdcbde9c779f4a0881627706262442 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 25 Sep 2019 00:05:42 +0000 Subject: [PATCH 308/420] Update dependencies from https://github.com/dotnet/toolset build 20190924.6 (#4930) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19474.6 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a2fe28519..89d76c890 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,9 +42,9 @@ https://github.com/dotnet/templating e8d6da33000a416b2b36b4f04b1756dcc99f671d - + https://github.com/dotnet/toolset - 1cb9d48ea26f274afc89c185b640386fe4dc1d38 + 256b3e07a94d90a0585b1f8da8d3b99526272637 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index a55d6bfc2..c3f960438 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19474.5 + 3.1.100-preview1.19474.6 From 156f17d8825fe7585392d8f0df7a1eadbd80ea2d Mon Sep 17 00:00:00 2001 From: John Beisner Date: Wed, 25 Sep 2019 11:28:12 -0700 Subject: [PATCH 309/420] Add 3.1 Templates MSIs (#4931) * Adding 3.1 Templates MSI --- eng/Versions.props | 6 +++--- src/redist/targets/Branding.targets | 1 + src/redist/targets/BundledTemplates.targets | 4 ++-- src/redist/targets/GenerateMSIs.targets | 23 +++++++++++++++++++-- 4 files changed, 27 insertions(+), 7 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index c3f960438..a92042274 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,9 +64,9 @@ $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) 1.6.3 - 2.0.0-preview8.19373.1 + 3.1.0-preview1.19475.1 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) - 1.0.2-beta4.19354.2 + 1.0.2-beta4.19465.1 $(AspNetCoreVersion) 4.8.0-rc2.19462.10 @@ -75,7 +75,7 @@ 2.0.0-preview8.19373.1 $(MicrosoftDotNetCommonItemTemplates30PackageVersion) 1.0.2-beta4.19354.2 - 3.0.0-rc2.19461.12 + 3.0.0 1.6.0 1.0.2-beta4 diff --git a/src/redist/targets/Branding.targets b/src/redist/targets/Branding.targets index 4a6c57f77..a9acebcfd 100644 --- a/src/redist/targets/Branding.targets +++ b/src/redist/targets/Branding.targets @@ -13,6 +13,7 @@ Microsoft .NET Core Host FX Resolver $(MicrosoftNETCoreAppPackageVersion) Microsoft.NETCore.App $(SharedFrameworkName) + Microsoft .NET Core 3.1 Templates $(CliBrandingVersion) Microsoft .NET Core 3.0 Templates $(CliBrandingVersion) Microsoft .NET Core 2.2 Templates $(CliBrandingVersion) Microsoft .NET Core 2.1 Templates $(CliBrandingVersion) diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index 495d1d453..5c5c545ca 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -46,8 +46,8 @@ - - + + diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index b523ad822..e7ba57667 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -39,6 +39,7 @@ $(ArtifactsShippingPackagesDir)$(ArtifactNameWithVersionSdk)$(InstallerExtension) Dotnet_CLI + $(ArtifactsShippingPackagesDir)dotnet-31templates-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension) $(ArtifactsShippingPackagesDir)dotnet-30templates-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension) $(ArtifactsShippingPackagesDir)dotnet-22templates-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension) $(ArtifactsShippingPackagesDir)dotnet-21templates-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension) @@ -59,7 +60,7 @@ DependsOnTargets="GenerateLayout;SetupWixProperties;GetCoreSdkGitCommitInfo"> - + + + + + @@ -192,6 +198,14 @@ + + $(Templates31LayoutPath.TrimEnd('\')) + $(Templates31MSIInstallerFile) + $(BundledTemplates31BrandName) + $(BundledTemplates31MsiVersion) + $(Templates31InstallerUpgradeCode) + NetCore_Templates_3.1 + $(Templates30LayoutPath.TrimEnd('\')) $(Templates30MSIInstallerFile) @@ -244,7 +258,7 @@ '$(DownloadsFolder)$(DownloadedArm64NetCoreAppHostPackInstallerFileName)' ^ '$(DownloadsFolder)$(DownloadedAspNetTargetingPackInstallerFileName)' ^ '$(DownloadsFolder)$(DownloadedWindowsDesktopTargetingPackInstallerFileName)' ^ - '$(Templates30MSIInstallerFile)' ^ + '$(Templates31MSIInstallerFile)' ^ '$(CombinedFrameworkSdkHostMSIInstallerFile)' ^ '$(WixRoot)' ^ '$(SdkBrandName)' ^ @@ -321,6 +335,11 @@ + + $(Templates31MSIInstallerFile) + $(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Templates.$(BundledTemplates31MajorMinorVersion).$(FullNugetVersion).nupkg + $(BundledTemplates31MajorMinorVersion) + $(Templates30MSIInstallerFile) $(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Templates.$(BundledTemplates30MajorMinorVersion).$(FullNugetVersion).nupkg From 7a13384a0d7c779810e9d8eb35caddffd9d62fec Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 26 Sep 2019 18:35:41 +0000 Subject: [PATCH 310/420] Update dependencies from https://github.com/dotnet/toolset build 20190926.5 (#4953) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19476.5 Dependency coherency updates - Microsoft.DotNet.Common.ItemTemplates - 3.0.1-servicing.19476.1 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc2.19476.4 (parent: Microsoft.Dotnet.Toolset.Internal) --- NuGet.config | 1 - eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index 64f186fd2..93a0744f8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,7 +8,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 41edc80c3..d71369319 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -63,21 +63,21 @@ https://github.com/aspnet/AspNetCore aee5e4080331553ea9dfb7fb388b6d72f715bf6a - + https://github.com/dotnet/templating - b2663fb07294f5d6cf3caa927d58f7cbebf7d626 + a776e417c83c52908298b3767e462feae8b18b98 - + https://github.com/dotnet/toolset - 33026f95de81116aefd79b4ec4c8071090a02480 + f0bb60ab509dc37bf9bc92c658c7b117b5e3d995 https://github.com/dotnet/sdk b3a343bf8ed65f5208c5bb86c632856c5d107b1d - + https://github.com/dotnet/cli - e72d84f73adcbfa0054df27fbb21505295a55dcb + 6f7e6742e09ec89b2901e3d899bfcd8effc582f9 diff --git a/eng/Versions.props b/eng/Versions.props index 85124445e..fb6d6bf78 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc2.19468.3 + 3.0.100-rc2.19476.5 @@ -33,7 +33,7 @@ - 3.0.100-rc2.19467.7 + 3.0.100-rc2.19476.4 0.2.0 From 59212cdc431c7c644446dc3c88d3a304cf58cfb4 Mon Sep 17 00:00:00 2001 From: William Li Date: Thu, 26 Sep 2019 14:15:25 -0700 Subject: [PATCH 311/420] Remove opensuse (#4960) --- .vsts-ci.yml | 7 ------- eng/dockerrun.sh | 6 ------ netci.groovy | 3 +-- src/redist/targets/GetRuntimeInformation.targets | 6 ++---- src/redist/targets/SetBuildDefaults.targets | 2 -- 5 files changed, 3 insertions(+), 21 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 31dff1c60..c80b375e9 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -120,13 +120,6 @@ jobs: _RuntimeIdentifier: '' _BuildArchitecture: 'x64' _DropSuffix: '' - Build_OpenSUSE_42_3_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker opensuse.42.3' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _DropSuffix: '' Build_CentOS_7_1_Debug_x64: _BuildConfig: Debug _DockerParameter: '--docker centos' diff --git a/eng/dockerrun.sh b/eng/dockerrun.sh index 15ecbffe3..1d5cb4618 100755 --- a/eng/dockerrun.sh +++ b/eng/dockerrun.sh @@ -79,12 +79,6 @@ if [ -z "$DOCKERFILE" ]; then echo "using 'fedora.23' image" export DOCKERFILE=eng/docker/fedora.23 fi - elif [ "$(cat /etc/*-release | grep -cim1 opensuse)" -eq 1 ]; then - echo "Detected current OS as openSUSE, determining openSUSE version to use..." - if [ "$(cat /etc/*-release | grep -cim1 13.2)" -eq 1 ]; then - echo "using 'openSUSE.13.2' image" - export DOCKERFILE=eng/docker/opensuse.13.2 - fi else echo "Unknown Linux Distro. Using 'ubuntu' image" export DOCKERFILE=eng/docker/ubuntu diff --git a/netci.groovy b/netci.groovy index 31d73f078..e964e99bb 100644 --- a/netci.groovy +++ b/netci.groovy @@ -21,7 +21,6 @@ def platformList = [ 'Linux:x64:Release', 'Linux_NoSuffix:arm:Release', 'Linux_NoSuffix:x64:Release', - 'opensuse.42.3:x64:Debug', 'OSX10.12:x64:Release', 'RHEL6:x64:Debug', 'RHEL7.2:x64:Release', @@ -95,7 +94,7 @@ ${buildCommand} osUsedForMachineAffinity = 'Ubuntu16.04'; buildCommand = "${baseShellBuildCommand} --runtime-id rhel.6-x64 --docker rhel.6" } - else if (os == 'ubuntu.18.04' || os == 'fedora.27' || os == 'opensuse.42.3') { + else if (os == 'ubuntu.18.04' || os == 'fedora.27') { osUsedForMachineAffinity = 'Ubuntu16.04' osVersionUsedForMachineAffinity = 'latest-docker' buildCommand = "${baseShellBuildCommand} --docker ${os} --linux-portable" diff --git a/src/redist/targets/GetRuntimeInformation.targets b/src/redist/targets/GetRuntimeInformation.targets index ff9ee1781..9248c46c8 100644 --- a/src/redist/targets/GetRuntimeInformation.targets +++ b/src/redist/targets/GetRuntimeInformation.targets @@ -28,15 +28,13 @@ $(Rid) + '$(Rid)' == 'linux-musl-x64' ">$(Rid) $(OSName)-$(Architecture) $(HostRid) + '$(HostRid)' == 'linux-musl-x64' ">$(HostRid) $(HostOSName)-$(Architecture) $(HostMonikerRid) $(Architecture) diff --git a/src/redist/targets/SetBuildDefaults.targets b/src/redist/targets/SetBuildDefaults.targets index 8d035b09f..b31e5350d 100644 --- a/src/redist/targets/SetBuildDefaults.targets +++ b/src/redist/targets/SetBuildDefaults.targets @@ -10,7 +10,6 @@ OR $(Rid.StartsWith('freebsd')) OR $(Rid.StartsWith('linux-musl')) OR $(Rid.StartsWith('fedora.27')) - OR $(Rid.StartsWith('opensuse.42.3')) OR $(Rid.StartsWith('ubuntu.18.04')))">true false @@ -20,7 +19,6 @@ AND '$(Rid)' != 'rhel.6-x64' AND '$(Rid)' != 'linux-musl-x64' AND '$(Rid)' != 'fedora.27-x64' - AND '$(Rid)' != 'opensuse.42.3-x64' AND '$(Rid)' != 'ubuntu.18.04-x64'">true--> true From 61327a9bcb718231c4afa98d7526bb3b2f6e91e5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 26 Sep 2019 21:15:58 +0000 Subject: [PATCH 312/420] [release/3.0.1xx] Update dependencies from dotnet/arcade (#4933) * Update dependencies from https://github.com/dotnet/arcade build 20190924.3 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19474.3 * Update NuGet.config * React to NuGet design change for PackageDownload with multiple versions A single item must be used with semicolon-delimited versions. --- NuGet.config | 8 +- eng/Version.Details.xml | 4 +- eng/common/enable-cross-org-publishing.ps1 | 6 ++ eng/common/sdl/extract-artifact-packages.ps1 | 7 ++ .../channels/netcore-3-tools-validation.yml | 95 +++++++++++++++++++ ...netcore-dev-30.yml => netcore-3-tools.yml} | 44 +++++---- .../post-build/channels/netcore-dev-31.yml | 8 +- .../post-build/channels/netcore-dev-5.yml | 8 +- .../channels/netcore-internal-30.yml | 8 +- .../channels/netcore-release-30.yml | 8 +- .../channels/netcore-release-31.yml | 8 +- .../channels/netcore-tools-latest.yml | 8 +- ...lease.yml => netcore-tools-validation.yml} | 12 ++- .../templates/post-build/common-variables.yml | 14 ++- .../templates/post-build/post-build.yml | 19 ++-- global.json | 4 +- src/redist/targets/BundledTemplates.targets | 20 +++- 17 files changed, 221 insertions(+), 60 deletions(-) create mode 100644 eng/common/enable-cross-org-publishing.ps1 create mode 100644 eng/common/templates/post-build/channels/netcore-3-tools-validation.yml rename eng/common/templates/post-build/channels/{netcore-dev-30.yml => netcore-3-tools.yml} (82%) rename eng/common/templates/post-build/channels/{public-validation-release.yml => netcore-tools-validation.yml} (90%) diff --git a/NuGet.config b/NuGet.config index 93a0744f8..175941859 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,17 +6,11 @@ - - - - - - + - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d71369319..3901e0eb1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,9 +90,9 @@ - + https://github.com/dotnet/arcade - 372f44450f51552a8cf725acf705dc477bd8391f + 0e9ffd6464aff37aef2dc41dc2162d258f266e32 diff --git a/eng/common/enable-cross-org-publishing.ps1 b/eng/common/enable-cross-org-publishing.ps1 new file mode 100644 index 000000000..eccbf9f1b --- /dev/null +++ b/eng/common/enable-cross-org-publishing.ps1 @@ -0,0 +1,6 @@ +param( + [string] $token +) + +Write-Host "##vso[task.setvariable variable=VSS_NUGET_ACCESSTOKEN]$token" +Write-Host "##vso[task.setvariable variable=VSS_NUGET_URI_PREFIXES]https://dnceng.pkgs.visualstudio.com/;https://pkgs.dev.azure.com/dnceng/;https://devdiv.pkgs.visualstudio.com/;https://pkgs.dev.azure.com/devdiv/" diff --git a/eng/common/sdl/extract-artifact-packages.ps1 b/eng/common/sdl/extract-artifact-packages.ps1 index 1fdbb1432..6e6825013 100644 --- a/eng/common/sdl/extract-artifact-packages.ps1 +++ b/eng/common/sdl/extract-artifact-packages.ps1 @@ -5,6 +5,13 @@ param( $ErrorActionPreference = "Stop" Set-StrictMode -Version 2.0 + +# `tools.ps1` checks $ci to perform some actions. Since the post-build +# scripts don't necessarily execute in the same agent that run the +# build.ps1/sh script this variable isn't automatically set. +$ci = $true +. $PSScriptRoot\..\tools.ps1 + $ExtractPackage = { param( [string] $PackagePath # Full path to a NuGet package diff --git a/eng/common/templates/post-build/channels/netcore-3-tools-validation.yml b/eng/common/templates/post-build/channels/netcore-3-tools-validation.yml new file mode 100644 index 000000000..cdb74031f --- /dev/null +++ b/eng/common/templates/post-build/channels/netcore-3-tools-validation.yml @@ -0,0 +1,95 @@ +parameters: + artifactsPublishingAdditionalParameters: '' + publishInstallersAndChecksums: false + +stages: +- stage: NetCore_3_Tools_Validation_Publish + dependsOn: validate + variables: + - template: ../common-variables.yml + displayName: .NET 3 Tools - Validation Publishing + jobs: + - template: ../setup-maestro-vars.yml + + - job: publish_assets + displayName: Publish Assets + dependsOn: setupMaestroVars + variables: + - group: DotNet-Blob-Feed + - group: AzureDevOps-Artifact-Feeds-Pats + - name: BARBuildId + value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] + - name: IsStableBuild + value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NETCore_3_Tools_Validation_Channel_Id)) + pool: + vmImage: 'windows-2019' + steps: + - task: DownloadBuildArtifacts@0 + displayName: Download Package Artifacts + inputs: + buildType: current + artifactName: PackageArtifacts + + - task: DownloadBuildArtifacts@0 + displayName: Download Blob Artifacts + inputs: + buildType: current + artifactName: BlobArtifacts + + - task: DownloadBuildArtifacts@0 + displayName: Download Asset Manifests + inputs: + buildType: current + artifactName: AssetManifests + + - task: NuGetToolInstaller@1 + displayName: 'Install NuGet.exe' + + # This is necessary whenever we want to publish/restore to an AzDO private feed + - task: NuGetAuthenticate@0 + displayName: 'Authenticate to AzDO Feeds' + + - task: PowerShell@2 + displayName: Enable cross-org publishing + inputs: + filePath: eng\common\enable-cross-org-publishing.ps1 + arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) + + - task: PowerShell@2 + displayName: Publish Assets + inputs: + filePath: eng\common\sdk-task.ps1 + arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet + /p:ArtifactsCategory=$(_DotNetValidationArtifactsCategory) + /p:IsStableBuild=$(IsStableBuild) + /p:IsInternalBuild=$(IsInternalBuild) + /p:RepositoryName=$(Build.Repository.Name) + /p:CommitSha=$(Build.SourceVersion) + /p:NugetPath=$(NuGetExeToolPath) + /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' + /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' + /p:BARBuildId=$(BARBuildId) + /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' + /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' + /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' + /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' + /p:Configuration=Release + /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} + /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) + /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) + /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) + /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) + /p:PublishToAzureDevOpsNuGetFeeds=true + /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' + /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + ${{ parameters.artifactsPublishingAdditionalParameters }} + + - template: ../../steps/promote-build.yml + parameters: + ChannelId: ${{ variables.NETCore_3_Tools_Validation_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-dev-30.yml b/eng/common/templates/post-build/channels/netcore-3-tools.yml similarity index 82% rename from eng/common/templates/post-build/channels/netcore-dev-30.yml rename to eng/common/templates/post-build/channels/netcore-3-tools.yml index 69f1a9013..70eec773e 100644 --- a/eng/common/templates/post-build/channels/netcore-dev-30.yml +++ b/eng/common/templates/post-build/channels/netcore-3-tools.yml @@ -4,18 +4,18 @@ parameters: publishInstallersAndChecksums: false stages: -- stage: NetCore_Dev30_Publish +- stage: NetCore_3_Tools_Publish dependsOn: validate variables: - template: ../common-variables.yml - displayName: .NET Core 3.0 Dev Publishing + displayName: .NET 3 Tools Publishing jobs: - template: ../setup-maestro-vars.yml - job: displayName: Symbol Publishing dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicDevRelease_30_Channel_Id)) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_3_Tools_Channel_Id)) variables: - group: DotNet-Symbol-Server-Pats pool: @@ -56,7 +56,7 @@ stages: value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - name: IsStableBuild value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicDevRelease_30_Channel_Id)) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_3_Tools_Channel_Id)) pool: vmImage: 'windows-2019' steps: @@ -85,42 +85,46 @@ stages: - task: NuGetAuthenticate@0 displayName: 'Authenticate to AzDO Feeds' + - task: PowerShell@2 + displayName: Enable cross-org publishing + inputs: + filePath: eng\common\enable-cross-org-publishing.ps1 + arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) + - task: PowerShell@2 displayName: Publish Assets - env: - AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw) inputs: filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet + arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet /p:ArtifactsCategory=$(_DotNetArtifactsCategory) /p:IsStableBuild=$(IsStableBuild) /p:IsInternalBuild=$(IsInternalBuild) /p:RepositoryName=$(Build.Repository.Name) /p:CommitSha=$(Build.SourceVersion) /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release + /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' + /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' + /p:BARBuildId=$(BARBuildId) + /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' + /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' + /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' + /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' + /p:Configuration=Release /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json' + /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json' + /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-symbols/nuget/v3/index.json' + /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' ${{ parameters.artifactsPublishingAdditionalParameters }} - template: ../../steps/promote-build.yml parameters: - ChannelId: ${{ variables.PublicDevRelease_30_Channel_Id }} + ChannelId: ${{ variables.NetCore_3_Tools_Channel_Id }} \ No newline at end of file diff --git a/eng/common/templates/post-build/channels/netcore-dev-31.yml b/eng/common/templates/post-build/channels/netcore-dev-31.yml index 720a0ab08..db2125418 100644 --- a/eng/common/templates/post-build/channels/netcore-dev-31.yml +++ b/eng/common/templates/post-build/channels/netcore-dev-31.yml @@ -85,10 +85,14 @@ stages: - task: NuGetAuthenticate@0 displayName: 'Authenticate to AzDO Feeds' + - task: PowerShell@2 + displayName: Enable cross-org publishing + inputs: + filePath: eng\common\enable-cross-org-publishing.ps1 + arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) + - task: PowerShell@2 displayName: Publish Assets - env: - AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw) inputs: filePath: eng\common\sdk-task.ps1 arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet diff --git a/eng/common/templates/post-build/channels/netcore-dev-5.yml b/eng/common/templates/post-build/channels/netcore-dev-5.yml index 9c81e39e9..c4f5a16ac 100644 --- a/eng/common/templates/post-build/channels/netcore-dev-5.yml +++ b/eng/common/templates/post-build/channels/netcore-dev-5.yml @@ -85,10 +85,14 @@ stages: - task: NuGetAuthenticate@0 displayName: 'Authenticate to AzDO Feeds' + - task: PowerShell@2 + displayName: Enable cross-org publishing + inputs: + filePath: eng\common\enable-cross-org-publishing.ps1 + arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) + - task: PowerShell@2 displayName: Publish Assets - env: - AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw) inputs: filePath: eng\common\sdk-task.ps1 arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet diff --git a/eng/common/templates/post-build/channels/netcore-internal-30.yml b/eng/common/templates/post-build/channels/netcore-internal-30.yml index 053163cf6..177b38df3 100644 --- a/eng/common/templates/post-build/channels/netcore-internal-30.yml +++ b/eng/common/templates/post-build/channels/netcore-internal-30.yml @@ -84,10 +84,14 @@ stages: - task: NuGetAuthenticate@0 displayName: 'Authenticate to AzDO Feeds' + - task: PowerShell@2 + displayName: Enable cross-org publishing + inputs: + filePath: eng\common\enable-cross-org-publishing.ps1 + arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) + - task: PowerShell@2 displayName: Publish Assets - env: - AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw) inputs: filePath: eng\common\sdk-task.ps1 arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet diff --git a/eng/common/templates/post-build/channels/netcore-release-30.yml b/eng/common/templates/post-build/channels/netcore-release-30.yml index 8ba9237ff..16ade0db2 100644 --- a/eng/common/templates/post-build/channels/netcore-release-30.yml +++ b/eng/common/templates/post-build/channels/netcore-release-30.yml @@ -85,10 +85,14 @@ stages: - task: NuGetAuthenticate@0 displayName: 'Authenticate to AzDO Feeds' + - task: PowerShell@2 + displayName: Enable cross-org publishing + inputs: + filePath: eng\common\enable-cross-org-publishing.ps1 + arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) + - task: PowerShell@2 displayName: Publish Assets - env: - AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw) inputs: filePath: eng\common\sdk-task.ps1 arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet diff --git a/eng/common/templates/post-build/channels/netcore-release-31.yml b/eng/common/templates/post-build/channels/netcore-release-31.yml index d8270eada..01d56410c 100644 --- a/eng/common/templates/post-build/channels/netcore-release-31.yml +++ b/eng/common/templates/post-build/channels/netcore-release-31.yml @@ -85,10 +85,14 @@ stages: - task: NuGetAuthenticate@0 displayName: 'Authenticate to AzDO Feeds' + - task: PowerShell@2 + displayName: Enable cross-org publishing + inputs: + filePath: eng\common\enable-cross-org-publishing.ps1 + arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) + - task: PowerShell@2 displayName: Publish Assets - env: - AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw) inputs: filePath: eng\common\sdk-task.ps1 arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet diff --git a/eng/common/templates/post-build/channels/netcore-tools-latest.yml b/eng/common/templates/post-build/channels/netcore-tools-latest.yml index c75d18673..157d2d4b9 100644 --- a/eng/common/templates/post-build/channels/netcore-tools-latest.yml +++ b/eng/common/templates/post-build/channels/netcore-tools-latest.yml @@ -85,10 +85,14 @@ stages: - task: NuGetAuthenticate@0 displayName: 'Authenticate to AzDO Feeds' + - task: PowerShell@2 + displayName: Enable cross-org publishing + inputs: + filePath: eng\common\enable-cross-org-publishing.ps1 + arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) + - task: PowerShell@2 displayName: Publish Assets - env: - AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw) inputs: filePath: eng\common\sdk-task.ps1 arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet diff --git a/eng/common/templates/post-build/channels/public-validation-release.yml b/eng/common/templates/post-build/channels/netcore-tools-validation.yml similarity index 90% rename from eng/common/templates/post-build/channels/public-validation-release.yml rename to eng/common/templates/post-build/channels/netcore-tools-validation.yml index fb2c23d0f..d8447e49a 100644 --- a/eng/common/templates/post-build/channels/public-validation-release.yml +++ b/eng/common/templates/post-build/channels/netcore-tools-validation.yml @@ -21,7 +21,7 @@ stages: value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - name: IsStableBuild value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicValidationRelease_30_Channel_Id)) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_Tools_Validation_Channel_Id)) pool: vmImage: 'windows-2019' steps: @@ -50,10 +50,14 @@ stages: - task: NuGetAuthenticate@0 displayName: 'Authenticate to AzDO Feeds' + - task: PowerShell@2 + displayName: Enable cross-org publishing + inputs: + filePath: eng\common\enable-cross-org-publishing.ps1 + arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) + - task: PowerShell@2 displayName: Publish Assets - env: - AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw) inputs: filePath: eng\common\sdk-task.ps1 arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet @@ -88,4 +92,4 @@ stages: - template: ../../steps/promote-build.yml parameters: - ChannelId: ${{ variables.PublicValidationRelease_30_Channel_Id }} + ChannelId: ${{ variables.NetCore_Tools_Validation_Channel_Id }} diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index adb2a854f..b4eed6f18 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -3,10 +3,6 @@ variables: - group: DotNet-DotNetCli-Storage - group: DotNet-MSRC-Storage - # .NET Core 3 Dev - - name: PublicDevRelease_30_Channel_Id - value: 3 - # .NET Core 3.1 Dev - name: PublicDevRelease_31_Channel_Id value: 128 @@ -16,13 +12,21 @@ variables: value: 131 # .NET Tools - Validation - - name: PublicValidationRelease_30_Channel_Id + - name: NetCore_Tools_Validation_Channel_Id value: 9 # .NET Tools - Latest - name: NetCore_Tools_Latest_Channel_Id value: 2 + # .NET 3 Tools - Validation + - name: NETCore_3_Tools_Validation_Channel_Id + value: 390 + + # .NET 3 Tools - Latest + - name: NetCore_3_Tools_Channel_Id + value: 344 + # .NET Core 3.0 Internal Servicing - name: InternalServicing_30_Channel_Id value: 184 diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 5b9d0a5d9..7ee82d9ff 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -101,12 +101,6 @@ stages: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} -- template: \eng\common\templates\post-build\channels\netcore-dev-30.yml - parameters: - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - - template: \eng\common\templates\post-build\channels\netcore-dev-31.yml parameters: symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} @@ -119,11 +113,22 @@ stages: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} -- template: \eng\common\templates\post-build\channels\public-validation-release.yml +- template: \eng\common\templates\post-build\channels\netcore-tools-validation.yml parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} +- template: \eng\common\templates\post-build\channels\netcore-3-tools-validation.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + +- template: \eng\common\templates\post-build\channels\netcore-3-tools.yml + parameters: + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + - template: \eng\common\templates\post-build\channels\netcore-release-30.yml parameters: symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} diff --git a/global.json b/global.json index 320d8b25a..0ae3965f1 100644 --- a/global.json +++ b/global.json @@ -1,8 +1,8 @@ { "tools": { - "dotnet": "3.0.100-preview6-012264" + "dotnet": "3.0.100" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19463.1" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19474.3" } } diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index 5c3b0a824..1407022c5 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -87,7 +87,25 @@ - + + + + + + + + + + From f5b03134526b9bd7b1c7536e49507f748ddeada8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 26 Sep 2019 21:46:06 +0000 Subject: [PATCH 313/420] Update dependencies from https://github.com/aspnet/AspNetCore build 20190925.24 (#4942) - dotnet-user-secrets - 3.1.0-preview1.19475.24 - dotnet-watch - 3.1.0-preview1.19475.24 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19475.24 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19475.24 - dotnet-dev-certs - 3.1.0-preview1.19475.24 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19475.24 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 89d76c890..424c47a58 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,29 +14,29 @@ https://github.com/dotnet/core-setup 72b39b0473993b932a08c8fc24a8988d45b416a5 - + https://github.com/aspnet/AspNetCore - ab1347ef20745187440a8bf0f857362b5089056c + 1937c804fa83ee3adddc7e648c610f880c24188e - + https://github.com/aspnet/AspNetCore - ab1347ef20745187440a8bf0f857362b5089056c + 1937c804fa83ee3adddc7e648c610f880c24188e - + https://github.com/aspnet/AspNetCore - ab1347ef20745187440a8bf0f857362b5089056c + 1937c804fa83ee3adddc7e648c610f880c24188e - + https://github.com/aspnet/AspNetCore - ab1347ef20745187440a8bf0f857362b5089056c + 1937c804fa83ee3adddc7e648c610f880c24188e - + https://github.com/aspnet/AspNetCore - ab1347ef20745187440a8bf0f857362b5089056c + 1937c804fa83ee3adddc7e648c610f880c24188e - + https://github.com/aspnet/AspNetCore - ab1347ef20745187440a8bf0f857362b5089056c + 1937c804fa83ee3adddc7e648c610f880c24188e https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index a92042274..aaa077b37 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ - 3.1.0-preview1.19474.4 - 3.1.0-preview1.19474.4 - 3.1.0-preview1.19474.4 - 3.1.0-preview1.19474.4 - 3.1.0-preview1.19474.4 - 3.1.0-preview1.19474.4 + 3.1.0-preview1.19475.24 + 3.1.0-preview1.19475.24 + 3.1.0-preview1.19475.24 + 3.1.0-preview1.19475.24 + 3.1.0-preview1.19475.24 + 3.1.0-preview1.19475.24 From 67e623e6d24e8d9068836936ab40c876ee0a2e76 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 26 Sep 2019 21:51:12 +0000 Subject: [PATCH 314/420] Update dependencies from https://github.com/dotnet/core-setup build 20190925.6 (#4943) - Microsoft.NETCore.App - 3.1.0-preview1.19475.6 - NETStandard.Library.Ref - 2.1.0-preview1.19475.6 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19475.6 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.1-preview1.19474.4 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.0-preview1.19475.5 (parent: Microsoft.WindowsDesktop.App) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 424c47a58..0f49bbee6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 72b39b0473993b932a08c8fc24a8988d45b416a5 + 5fa4772596a1c18d62a179f39704160c7f6dc223 - + https://github.com/dotnet/core-setup - 72b39b0473993b932a08c8fc24a8988d45b416a5 + 5fa4772596a1c18d62a179f39704160c7f6dc223 - + https://github.com/dotnet/core-setup - 72b39b0473993b932a08c8fc24a8988d45b416a5 + 5fa4772596a1c18d62a179f39704160c7f6dc223 https://github.com/aspnet/AspNetCore @@ -55,13 +55,13 @@ 4a9e195d7123e1c3d774cf8e6881d3ff93f47c44 - + https://github.com/dotnet/winforms - 93ae5ab5d366dc65495de6abb938f6d647eaf291 + 066b5db8f092c09d8e2d46c27d355e29d1d28d69 - + https://github.com/dotnet/wpf - acd0da083a426b222a54201c9f37860da50a906a + 4d424cad44e237f1607c2a61485aa6ee2df5ce43 diff --git a/eng/Versions.props b/eng/Versions.props index aaa077b37..daede0299 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,11 +16,11 @@ - 4.8.1-preview1.19462.8 + 4.8.1-preview1.19474.4 - 3.1.0-preview1.19462.15 + 3.1.0-preview1.19475.5 @@ -44,7 +44,7 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview1.19470.9 + 3.1.0-preview1.19475.6 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -52,11 +52,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview1.19470.9 + 2.1.0-preview1.19475.6 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview1.19470.9 + 3.1.0-preview1.19475.6 $(MicrosoftWindowsDesktopAppPackageVersion) From 6d6273bc944b57a252dbb0ea75be3533cac10559 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Thu, 26 Sep 2019 15:30:56 -0700 Subject: [PATCH 315/420] Sign the 3.1 Templates MSI (#4956) --- src/redist/targets/Signing.targets | 1 + 1 file changed, 1 insertion(+) diff --git a/src/redist/targets/Signing.targets b/src/redist/targets/Signing.targets index 38b397e21..c6f771010 100644 --- a/src/redist/targets/Signing.targets +++ b/src/redist/targets/Signing.targets @@ -175,6 +175,7 @@ DependsOnTargets="SetSignProps"> + From 72ea0149b61dbc388a1715c2f7642a6f08e06078 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 26 Sep 2019 23:35:41 +0000 Subject: [PATCH 316/420] Update dependencies from https://github.com/dotnet/toolset build 20190926.7 (#4961) - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19476.7 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.101-servicing.19476.7 (parent: Microsoft.Dotnet.Toolset.Internal) --- NuGet.config | 6 ++++++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 175941859..a4c1bdf0e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,6 +6,12 @@ + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3901e0eb1..9c628402b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -67,17 +67,17 @@ https://github.com/dotnet/templating a776e417c83c52908298b3767e462feae8b18b98 - + https://github.com/dotnet/toolset - f0bb60ab509dc37bf9bc92c658c7b117b5e3d995 + f1d3057f6e0966a2d0b1115a2fe1bc4cdc00d15c https://github.com/dotnet/sdk b3a343bf8ed65f5208c5bb86c632856c5d107b1d - + https://github.com/dotnet/cli - 6f7e6742e09ec89b2901e3d899bfcd8effc582f9 + d6f8ca086a10326386fb5e5be024a616bfb22b02 diff --git a/eng/Versions.props b/eng/Versions.props index fb6d6bf78..c74ef41e7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc2.19476.5 + 3.0.100-rc2.19476.7 @@ -33,7 +33,7 @@ - 3.0.100-rc2.19476.4 + 3.0.101-servicing.19476.7 0.2.0 From 9f5eff9c0bbf228d672352338645dbe316116c5a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 27 Sep 2019 01:00:59 +0000 Subject: [PATCH 317/420] [release/3.0.1xx] Update dependencies from dotnet/toolset (#4962) * Update dependencies from https://github.com/dotnet/toolset build 20190926.8 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19476.8 Dependency coherency updates - Microsoft.NET.Sdk - 3.0.101-servicing.19476.1 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190926.9 - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19476.9 Dependency coherency updates - Microsoft.NET.Sdk - 3.0.101-servicing.19476.2 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20190926.10 - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19476.10 Dependency coherency updates - Microsoft.NET.Sdk - 3.0.101-servicing.19476.2 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9c628402b..48a4c082f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -67,13 +67,13 @@ https://github.com/dotnet/templating a776e417c83c52908298b3767e462feae8b18b98 - + https://github.com/dotnet/toolset - f1d3057f6e0966a2d0b1115a2fe1bc4cdc00d15c + dc416e62dd43cf023da93d34906bc5fee1b7ab50 - + https://github.com/dotnet/sdk - b3a343bf8ed65f5208c5bb86c632856c5d107b1d + 9cd501f50f426f24d98065d1617ee67cd4ce0d2d https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index c74ef41e7..54476d6d6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.100-rc2.19476.7 + 3.0.101-servicing.19476.10 @@ -40,7 +40,7 @@ - 3.0.100-rc2.19467.3 + 3.0.101-servicing.19476.2 $(MicrosoftNETSdkPackageVersion) From 7fea870c9adf1526efba5ce0bd02277192a10478 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 27 Sep 2019 02:10:38 +0000 Subject: [PATCH 318/420] Update dependencies from https://github.com/dotnet/toolset build 20190926.11 (#4963) - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19476.11 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.101-servicing.19476.8 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 48a4c082f..31c96c611 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -67,17 +67,17 @@ https://github.com/dotnet/templating a776e417c83c52908298b3767e462feae8b18b98 - + https://github.com/dotnet/toolset - dc416e62dd43cf023da93d34906bc5fee1b7ab50 + 0bbc0764bf4d0685ae23fb1d33b6c935e1ea0efa https://github.com/dotnet/sdk 9cd501f50f426f24d98065d1617ee67cd4ce0d2d - + https://github.com/dotnet/cli - d6f8ca086a10326386fb5e5be024a616bfb22b02 + 34a3f7cf50555642d799c7ebefe1fae1a3ef98ec diff --git a/eng/Versions.props b/eng/Versions.props index 54476d6d6..7d947a978 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.101-servicing.19476.10 + 3.0.101-servicing.19476.11 @@ -33,7 +33,7 @@ - 3.0.101-servicing.19476.7 + 3.0.101-servicing.19476.8 0.2.0 From 82996658ea12a40de2c36fbbc3bf46c95fe44830 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 27 Sep 2019 08:01:09 +0000 Subject: [PATCH 319/420] Update dependencies from https://github.com/dotnet/core-setup build 20190926.43 (#4968) - Microsoft.NETCore.App - 3.1.0-preview1.19476.43 - NETStandard.Library.Ref - 2.1.0-preview1.19476.43 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19476.43 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.1-preview1.19476.2 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.0-preview1.19476.4 (parent: Microsoft.WindowsDesktop.App) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0f49bbee6..f4c684a76 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 5fa4772596a1c18d62a179f39704160c7f6dc223 + 008e3cc5cd407d769e71a56a657ec0271bb0ffc5 - + https://github.com/dotnet/core-setup - 5fa4772596a1c18d62a179f39704160c7f6dc223 + 008e3cc5cd407d769e71a56a657ec0271bb0ffc5 - + https://github.com/dotnet/core-setup - 5fa4772596a1c18d62a179f39704160c7f6dc223 + 008e3cc5cd407d769e71a56a657ec0271bb0ffc5 https://github.com/aspnet/AspNetCore @@ -55,13 +55,13 @@ 4a9e195d7123e1c3d774cf8e6881d3ff93f47c44 - + https://github.com/dotnet/winforms - 066b5db8f092c09d8e2d46c27d355e29d1d28d69 + 3e3e5cde020a9084e8eab4c4f1a278b9d7e63566 - + https://github.com/dotnet/wpf - 4d424cad44e237f1607c2a61485aa6ee2df5ce43 + a0912c73f4a4069f28aa0483ad7b0ed30d745018 diff --git a/eng/Versions.props b/eng/Versions.props index daede0299..9a3494767 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,11 +16,11 @@ - 4.8.1-preview1.19474.4 + 4.8.1-preview1.19476.2 - 3.1.0-preview1.19475.5 + 3.1.0-preview1.19476.4 @@ -44,7 +44,7 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview1.19475.6 + 3.1.0-preview1.19476.43 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -52,11 +52,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview1.19475.6 + 2.1.0-preview1.19476.43 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview1.19475.6 + 3.1.0-preview1.19476.43 $(MicrosoftWindowsDesktopAppPackageVersion) From 2fec1840205c3e7808c1d5616b8f79842f50d7fe Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 27 Sep 2019 17:38:01 +0000 Subject: [PATCH 320/420] [release/3.0.1xx] Update dependencies from dotnet/toolset (#4965) * Update dependencies from https://github.com/dotnet/toolset build 20190926.12 - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19476.12 * Update dependencies from https://github.com/dotnet/toolset build 20190926.13 - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19476.13 * Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.101-servicing.19476.9 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 31c96c611..62ab189d6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -67,17 +67,17 @@ https://github.com/dotnet/templating a776e417c83c52908298b3767e462feae8b18b98 - + https://github.com/dotnet/toolset - 0bbc0764bf4d0685ae23fb1d33b6c935e1ea0efa + 9c2c1085dc154e10d3cfff2bb790f68418ab9e3c https://github.com/dotnet/sdk 9cd501f50f426f24d98065d1617ee67cd4ce0d2d - + https://github.com/dotnet/cli - 34a3f7cf50555642d799c7ebefe1fae1a3ef98ec + d264d42155a74215931920b24a6be356202614fb diff --git a/eng/Versions.props b/eng/Versions.props index 7d947a978..5406d403c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.101-servicing.19476.11 + 3.0.101-servicing.19476.13 @@ -33,7 +33,7 @@ - 3.0.101-servicing.19476.8 + 3.0.101-servicing.19476.9 0.2.0 From 0352f6caeb51d54880eff73ccbb060f64b9d2d9a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 27 Sep 2019 20:07:48 +0000 Subject: [PATCH 321/420] [release/3.1.1xx] Update dependencies from dotnet/core-setup (#4975) * Update dependencies from https://github.com/dotnet/core-setup build 20190927.2 - Microsoft.NETCore.App - 3.1.0-preview1.19477.2 - NETStandard.Library.Ref - 2.1.0-preview1.19477.2 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19477.2 * Update dependencies from https://github.com/dotnet/core-setup build 20190927.8 - Microsoft.NETCore.App - 3.1.0-preview1.19477.8 - NETStandard.Library.Ref - 2.1.0-preview1.19477.8 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19477.8 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f4c684a76..60d03eb10 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 008e3cc5cd407d769e71a56a657ec0271bb0ffc5 + 8447759ffbfe2c8700d78cf53edc828380a460ef - + https://github.com/dotnet/core-setup - 008e3cc5cd407d769e71a56a657ec0271bb0ffc5 + 8447759ffbfe2c8700d78cf53edc828380a460ef - + https://github.com/dotnet/core-setup - 008e3cc5cd407d769e71a56a657ec0271bb0ffc5 + 8447759ffbfe2c8700d78cf53edc828380a460ef https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 9a3494767..437d27f1e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview1.19476.43 + 3.1.0-preview1.19477.8 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -52,11 +52,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview1.19476.43 + 2.1.0-preview1.19477.8 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview1.19476.43 + 3.1.0-preview1.19477.8 $(MicrosoftWindowsDesktopAppPackageVersion) From 3cceab1b796c51966ae3655b1a299fc0b3da6bac Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 28 Sep 2019 01:35:40 +0000 Subject: [PATCH 322/420] Update dependencies from https://github.com/dotnet/toolset build 20190927.6 (#4984) - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19477.6 Dependency coherency updates - Microsoft.NET.Sdk - 3.0.101-servicing.19477.3 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 62ab189d6..897768966 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -67,13 +67,13 @@ https://github.com/dotnet/templating a776e417c83c52908298b3767e462feae8b18b98 - + https://github.com/dotnet/toolset - 9c2c1085dc154e10d3cfff2bb790f68418ab9e3c + 7e54b8d05388cb937a3cd872fb9ad14dd972ba3a - + https://github.com/dotnet/sdk - 9cd501f50f426f24d98065d1617ee67cd4ce0d2d + 3819a21a612cd8bc15b6f6c4e361d18490469577 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index 5406d403c..0157e97a3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.101-servicing.19476.13 + 3.0.101-servicing.19477.6 @@ -40,7 +40,7 @@ - 3.0.101-servicing.19476.2 + 3.0.101-servicing.19477.3 $(MicrosoftNETSdkPackageVersion) From 4c79da6f03abc5c702ed67dbc88aa1be35c4798a Mon Sep 17 00:00:00 2001 From: William Li Date: Sun, 29 Sep 2019 20:58:16 -0700 Subject: [PATCH 323/420] Remove opensuse (#4955) --- .vsts-ci.yml | 7 --- eng/docker/opensuse.13.2/Dockerfile | 26 ---------- eng/docker/opensuse.42.1/Dockerfile | 51 ------------------- eng/docker/opensuse.42.3/Dockerfile | 50 ------------------ eng/dockerrun.sh | 6 --- netci.groovy | 3 +- .../targets/GetRuntimeInformation.targets | 6 +-- src/redist/targets/SetBuildDefaults.targets | 2 - 8 files changed, 3 insertions(+), 148 deletions(-) delete mode 100644 eng/docker/opensuse.13.2/Dockerfile delete mode 100644 eng/docker/opensuse.42.1/Dockerfile delete mode 100644 eng/docker/opensuse.42.3/Dockerfile diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 6b1c79247..ed0b46fd8 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -130,13 +130,6 @@ stages: _RuntimeIdentifier: '' _BuildArchitecture: 'x64' _DropSuffix: '' - Build_OpenSUSE_42_3_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker opensuse.42.3' - _LinuxPortable: '--linux-portable' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _DropSuffix: '' Build_CentOS_7_1_Debug_x64: _BuildConfig: Debug _DockerParameter: '--docker centos' diff --git a/eng/docker/opensuse.13.2/Dockerfile b/eng/docker/opensuse.13.2/Dockerfile deleted file mode 100644 index bc8ff4617..000000000 --- a/eng/docker/opensuse.13.2/Dockerfile +++ /dev/null @@ -1,26 +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. -# - -FROM microsoft/dotnet-buildtools-prereqs:opensuse132_prereqs_v4 - -RUN zypper -n install sudo \ - ncurses-utils && \ - zypper clean -a -# Setup User to match Host User, and give superuser permissions -ARG USER_ID=0 -RUN useradd -m code_executor -u ${USER_ID} -g wheel -RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers - -# With the User Change, we need to change permissions on these directories -RUN chmod -R a+rwx /usr/local -RUN chmod -R a+rwx /home -RUN chmod -R 755 /usr/lib/sudo - -# Set user to the one we just created -USER ${USER_ID} - -# Set working directory -ARG WORK_DIR -WORKDIR ${WORK_DIR} diff --git a/eng/docker/opensuse.42.1/Dockerfile b/eng/docker/opensuse.42.1/Dockerfile deleted file mode 100644 index fee6378a1..000000000 --- a/eng/docker/opensuse.42.1/Dockerfile +++ /dev/null @@ -1,51 +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. -# - -FROM opensuse:42.1 - -# Install the base toolchain we need to build anything (clang, cmake, make and the like) -# this does not include libraries that we need to compile different projects, we'd like -# them in a different layer. -RUN zypper -n install binutils \ - cmake \ - which \ - gcc \ - llvm-clang \ - tar \ - ncurses-utils \ - curl \ - git \ - sudo && \ - ln -s /usr/bin/clang++ /usr/bin/clang++-3.5 && \ - zypper clean -a - -# Dependencies of CoreCLR and CoreFX. - -RUN zypper -n install --force-resolution \ - libunwind \ - libicu \ - lttng-ust \ - libuuid1 \ - libopenssl1_0_0 \ - libcurl4 \ - krb5 && \ - zypper clean -a - -# Setup User to match Host User, and give superuser permissions -ARG USER_ID=0 -RUN useradd -m code_executor -u ${USER_ID} -g wheel -RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers - -# With the User Change, we need to change permissions on these directories -RUN chmod -R a+rwx /usr/local -RUN chmod -R a+rwx /home -RUN chmod -R 755 /usr/lib/sudo - -# Set user to the one we just created -USER ${USER_ID} - -# Set working directory -ARG WORK_DIR -WORKDIR ${WORK_DIR} \ No newline at end of file diff --git a/eng/docker/opensuse.42.3/Dockerfile b/eng/docker/opensuse.42.3/Dockerfile deleted file mode 100644 index d92b408e7..000000000 --- a/eng/docker/opensuse.42.3/Dockerfile +++ /dev/null @@ -1,50 +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. -# - -FROM microsoft/dotnet-buildtools-prereqs:opensuse-42.3-d46ee12-20180327014902 - -# Install the base toolchain we need to build anything (clang, cmake, make and the like) -# this does not include libraries that we need to compile different projects, we'd like -# them in a different layer. -RUN zypper -n install binutils \ - cmake \ - which \ - gcc \ - llvm-clang \ - tar \ - ncurses-utils \ - curl \ - git \ - sudo && \ - zypper clean -a - -# Dependencies of CoreCLR and CoreFX. - -RUN zypper -n install --force-resolution \ - libunwind \ - libicu \ - lttng-ust \ - libuuid1 \ - libopenssl1_0_0 \ - libcurl4 \ - krb5 && \ - zypper clean -a - -# Setup User to match Host User, and give superuser permissions -ARG USER_ID=0 -RUN useradd -m code_executor -u ${USER_ID} -g wheel -RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers - -# With the User Change, we need to change permissions on these directories -RUN chmod -R a+rwx /usr/local -RUN chmod -R a+rwx /home -RUN chmod -R 755 /usr/lib/sudo - -# Set user to the one we just created -USER ${USER_ID} - -# Set working directory -ARG WORK_DIR -WORKDIR ${WORK_DIR} \ No newline at end of file diff --git a/eng/dockerrun.sh b/eng/dockerrun.sh index ef41e2fa8..b42852d87 100755 --- a/eng/dockerrun.sh +++ b/eng/dockerrun.sh @@ -79,12 +79,6 @@ if [ -z "$DOCKERFILE" ]; then echo "using 'fedora.23' image" export DOCKERFILE=eng/docker/fedora.23 fi - elif [ "$(cat /etc/*-release | grep -cim1 opensuse)" -eq 1 ]; then - echo "Detected current OS as openSUSE, determining openSUSE version to use..." - if [ "$(cat /etc/*-release | grep -cim1 13.2)" -eq 1 ]; then - echo "using 'openSUSE.13.2' image" - export DOCKERFILE=eng/docker/opensuse.13.2 - fi else echo "Unknown Linux Distro. Using 'ubuntu' image" export DOCKERFILE=eng/docker/ubuntu diff --git a/netci.groovy b/netci.groovy index 31d73f078..e964e99bb 100644 --- a/netci.groovy +++ b/netci.groovy @@ -21,7 +21,6 @@ def platformList = [ 'Linux:x64:Release', 'Linux_NoSuffix:arm:Release', 'Linux_NoSuffix:x64:Release', - 'opensuse.42.3:x64:Debug', 'OSX10.12:x64:Release', 'RHEL6:x64:Debug', 'RHEL7.2:x64:Release', @@ -95,7 +94,7 @@ ${buildCommand} osUsedForMachineAffinity = 'Ubuntu16.04'; buildCommand = "${baseShellBuildCommand} --runtime-id rhel.6-x64 --docker rhel.6" } - else if (os == 'ubuntu.18.04' || os == 'fedora.27' || os == 'opensuse.42.3') { + else if (os == 'ubuntu.18.04' || os == 'fedora.27') { osUsedForMachineAffinity = 'Ubuntu16.04' osVersionUsedForMachineAffinity = 'latest-docker' buildCommand = "${baseShellBuildCommand} --docker ${os} --linux-portable" diff --git a/src/redist/targets/GetRuntimeInformation.targets b/src/redist/targets/GetRuntimeInformation.targets index ff9ee1781..9248c46c8 100644 --- a/src/redist/targets/GetRuntimeInformation.targets +++ b/src/redist/targets/GetRuntimeInformation.targets @@ -28,15 +28,13 @@ $(Rid) + '$(Rid)' == 'linux-musl-x64' ">$(Rid) $(OSName)-$(Architecture) $(HostRid) + '$(HostRid)' == 'linux-musl-x64' ">$(HostRid) $(HostOSName)-$(Architecture) $(HostMonikerRid) $(Architecture) diff --git a/src/redist/targets/SetBuildDefaults.targets b/src/redist/targets/SetBuildDefaults.targets index 8d035b09f..b31e5350d 100644 --- a/src/redist/targets/SetBuildDefaults.targets +++ b/src/redist/targets/SetBuildDefaults.targets @@ -10,7 +10,6 @@ OR $(Rid.StartsWith('freebsd')) OR $(Rid.StartsWith('linux-musl')) OR $(Rid.StartsWith('fedora.27')) - OR $(Rid.StartsWith('opensuse.42.3')) OR $(Rid.StartsWith('ubuntu.18.04')))">true false @@ -20,7 +19,6 @@ AND '$(Rid)' != 'rhel.6-x64' AND '$(Rid)' != 'linux-musl-x64' AND '$(Rid)' != 'fedora.27-x64' - AND '$(Rid)' != 'opensuse.42.3-x64' AND '$(Rid)' != 'ubuntu.18.04-x64'">true--> true From 9d3f5570ffdd352f20ccd56a1e916618381d5cb5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2019 04:24:40 +0000 Subject: [PATCH 324/420] Update dependencies from https://github.com/dotnet/core-setup build 20190927.22 (#4989) - Microsoft.NETCore.App - 3.1.0-preview1.19477.22 - NETStandard.Library.Ref - 2.1.0-preview1.19477.22 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19477.22 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 60d03eb10..99ba16030 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 8447759ffbfe2c8700d78cf53edc828380a460ef + e5ea848cf4173815a04921132e163e9e8ee17587 - + https://github.com/dotnet/core-setup - 8447759ffbfe2c8700d78cf53edc828380a460ef + e5ea848cf4173815a04921132e163e9e8ee17587 - + https://github.com/dotnet/core-setup - 8447759ffbfe2c8700d78cf53edc828380a460ef + e5ea848cf4173815a04921132e163e9e8ee17587 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 437d27f1e..6391286a9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview1.19477.8 + 3.1.0-preview1.19477.22 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -52,11 +52,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview1.19477.8 + 2.1.0-preview1.19477.22 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview1.19477.8 + 3.1.0-preview1.19477.22 $(MicrosoftWindowsDesktopAppPackageVersion) From 09363ecf15de3961dbc393e6857256c799b340b5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2019 04:45:34 +0000 Subject: [PATCH 325/420] Update dependencies from https://github.com/dotnet/toolset build 20190929.3 (#5013) - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19479.3 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.101-servicing.19477.8 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 897768966..d47acc874 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -67,17 +67,17 @@ https://github.com/dotnet/templating a776e417c83c52908298b3767e462feae8b18b98 - + https://github.com/dotnet/toolset - 7e54b8d05388cb937a3cd872fb9ad14dd972ba3a + 264be8c7fd7a837c98ec4eff76e65af65b628156 https://github.com/dotnet/sdk 3819a21a612cd8bc15b6f6c4e361d18490469577 - + https://github.com/dotnet/cli - d264d42155a74215931920b24a6be356202614fb + b7448323496b263ae6b695ded6b7c9aebcf388b4 diff --git a/eng/Versions.props b/eng/Versions.props index 0157e97a3..c8384f396 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.101-servicing.19477.6 + 3.0.101-servicing.19479.3 @@ -33,7 +33,7 @@ - 3.0.101-servicing.19476.9 + 3.0.101-servicing.19477.8 0.2.0 From fb5c5d992cb94ecc0e34a55f99678e63ae630a60 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Mon, 30 Sep 2019 09:14:24 -0700 Subject: [PATCH 326/420] Add dotnet3.1 feeds --- NuGet.config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NuGet.config b/NuGet.config index 175941859..c5efe56ae 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,6 +13,8 @@ + + From 8e3b73b83b537e3fc764ca6ca104cd215ba69c7d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2019 18:21:18 +0000 Subject: [PATCH 327/420] Update dependencies from https://github.com/dotnet/toolset build 20190930.2 (#5015) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19480.2 Dependency coherency updates - Microsoft.DotNet.Common.ItemTemplates - 3.1.0-preview1.19476.7 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.NET.Sdk - 3.1.100-preview1.19477.6 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19479.3 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 99ba16030..982a554f9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -38,21 +38,21 @@ https://github.com/aspnet/AspNetCore 1937c804fa83ee3adddc7e648c610f880c24188e - + https://github.com/dotnet/templating - e8d6da33000a416b2b36b4f04b1756dcc99f671d + fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 256b3e07a94d90a0585b1f8da8d3b99526272637 + caaf8a50f875e9857d3c56a6e8a020c60f6830d5 - + https://github.com/dotnet/sdk - 902380600200731914d936fca50b60e3e06dcb16 + 8cfc10488c50eea7b0562f5de36dcdc64bf2fb37 - + https://github.com/dotnet/cli - 4a9e195d7123e1c3d774cf8e6881d3ff93f47c44 + 448a99fcc1eac067880ba4263bd6a3945d0f76de diff --git a/eng/Versions.props b/eng/Versions.props index 6391286a9..bd6c5c4f8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19474.6 + 3.1.100-preview1.19480.2 @@ -33,14 +33,14 @@ - 3.1.100-preview1.19474.2 + 3.1.100-preview1.19479.3 0.2.0 - 3.1.100-preview1.19469.1 + 3.1.100-preview1.19477.6 $(MicrosoftNETSdkPackageVersion) From b06c620cf2a38afd2db1c99d60c8e557d4a690dc Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Mon, 30 Sep 2019 12:28:38 -0700 Subject: [PATCH 328/420] Fix merge errors --- eng/Version.Details.xml | 2 ++ eng/Versions.props | 2 +- src/redist/targets/BundledTemplates.targets | 1 - 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ff9bdcc16..ed784c106 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,7 +14,9 @@ https://github.com/dotnet/core-setup e5ea848cf4173815a04921132e163e9e8ee17587 + https://github.com/dotnet/core-setup + e5ea848cf4173815a04921132e163e9e8ee17587 https://github.com/dotnet/core-setup diff --git a/eng/Versions.props b/eng/Versions.props index 7805c8e9d..f11fedb26 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,7 +45,7 @@ 3.1.0-preview1.19477.22 - 3.1.0-preview1.19477.22/MicrosoftNETCoreAppPackageVersion> + 3.1.0-preview1.19477.22 $(MicrosoftNETCoreAppPackageVersion) 3.1.0-preview1.19477.22 3.1.0-preview1.19477.22 diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index 84d1df417..e3184942b 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -129,7 +129,6 @@ Date: Mon, 30 Sep 2019 12:35:03 -0700 Subject: [PATCH 329/420] Update dependencies --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ed784c106..c1536e0cf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -36,9 +36,9 @@ 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/corefx - d0f0bfa5b123b4c1183c889cf4017bb529675502 + 719c1be452ab63d28a2d4b7cb53d7b38e228a41a https://github.com/aspnet/AspNetCore From 3e5d82d54f3f8c47953c3ae9bb1900e155e221e5 Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Mon, 30 Sep 2019 12:58:24 -0700 Subject: [PATCH 330/420] Don't use global CLI as it's incompatible with running SdkTests --- eng/configure-toolset.ps1 | 4 ++++ eng/configure-toolset.sh | 3 +++ 2 files changed, 7 insertions(+) create mode 100644 eng/configure-toolset.ps1 create mode 100644 eng/configure-toolset.sh diff --git a/eng/configure-toolset.ps1 b/eng/configure-toolset.ps1 new file mode 100644 index 000000000..87375243e --- /dev/null +++ b/eng/configure-toolset.ps1 @@ -0,0 +1,4 @@ +# SdkTests do not currently work with globally installed CLI as they use dotnet-install.ps1 to install more runtimes + +$script:useInstalledDotNetCli = $false + diff --git a/eng/configure-toolset.sh b/eng/configure-toolset.sh new file mode 100644 index 000000000..d890b1b02 --- /dev/null +++ b/eng/configure-toolset.sh @@ -0,0 +1,3 @@ +# SdkTests do not currently work with globally installed CLI as they use dotnet-install.ps1 to install more runtimes + +useInstalledDotNetCli="false" \ No newline at end of file From 0ef7c20be68536c8a92aa62c62b09e183f8558c9 Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Mon, 30 Sep 2019 13:11:18 -0700 Subject: [PATCH 331/420] Fix missing download for Microsoft.DotNet.Web.ItemTemplates 3.0 --- src/redist/targets/BundledTemplates.targets | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index e3184942b..5a122dd61 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -126,11 +126,17 @@ [$(MicrosoftDotNetCommonItemTemplates30PackageVersion)]; " /> - + + - - - - From df5aef5b6106949da2d7c29087a46dd86caaa55e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 1 Oct 2019 00:20:44 +0000 Subject: [PATCH 333/420] Update dependencies from https://github.com/dotnet/core-setup build 20190930.12 (#5025) - Microsoft.NETCore.App.Ref - 3.1.0-preview1.19480.12 - Microsoft.NETCore.App - 3.1.0-preview1.19480.12 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0-preview1.19480.12 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19480.12 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview1.19480.12 - Microsoft.NETCore.DotNetAppHost - 3.1.0-preview1.19480.12 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview1.19480.12 Dependency coherency updates - Microsoft.NETCore.Platforms - 3.1.0-preview1.19480.7 (parent: Microsoft.NetCore.App) --- NuGet.config | 3 +++ eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 14 +++++++------- 3 files changed, 26 insertions(+), 23 deletions(-) diff --git a/NuGet.config b/NuGet.config index c5efe56ae..84e92e811 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,6 +6,9 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c1536e0cf..b15e8fb6e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,33 +2,33 @@ - + https://github.com/dotnet/core-setup - e5ea848cf4173815a04921132e163e9e8ee17587 + c032701d3d607d0c54a215b431a225120d3a7c06 - + https://github.com/dotnet/core-setup - e5ea848cf4173815a04921132e163e9e8ee17587 + c032701d3d607d0c54a215b431a225120d3a7c06 - + https://github.com/dotnet/core-setup - e5ea848cf4173815a04921132e163e9e8ee17587 + c032701d3d607d0c54a215b431a225120d3a7c06 - + https://github.com/dotnet/core-setup - e5ea848cf4173815a04921132e163e9e8ee17587 + c032701d3d607d0c54a215b431a225120d3a7c06 - + https://github.com/dotnet/core-setup - e5ea848cf4173815a04921132e163e9e8ee17587 + c032701d3d607d0c54a215b431a225120d3a7c06 - + https://github.com/dotnet/core-setup - e5ea848cf4173815a04921132e163e9e8ee17587 + c032701d3d607d0c54a215b431a225120d3a7c06 - + https://github.com/dotnet/core-setup - e5ea848cf4173815a04921132e163e9e8ee17587 + c032701d3d607d0c54a215b431a225120d3a7c06 @@ -36,9 +36,9 @@ 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/corefx - 719c1be452ab63d28a2d4b7cb53d7b38e228a41a + 44de005400b7681b2f2f3e3f40e97f15da05d39f https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index f11fedb26..2bf72917b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,22 +44,22 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview1.19477.22 - 3.1.0-preview1.19477.22 + 3.1.0-preview1.19480.12 + 3.1.0-preview1.19480.12 $(MicrosoftNETCoreAppPackageVersion) - 3.1.0-preview1.19477.22 - 3.1.0-preview1.19477.22 + 3.1.0-preview1.19480.12 + 3.1.0-preview1.19480.12 $(MicrosoftNETCoreDotNetHostResolverPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) - 3.1.0-preview1.19477.22 + 3.1.0-preview1.19480.12 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) 2.1.0 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview1.19477.22 - 3.1.0-preview1.19477.22 + 3.1.0-preview1.19480.12 + 3.1.0-preview1.19480.12 $(MicrosoftWindowsDesktopAppPackageVersion) From 4587faf037a38436ff70cddd4cfe0d48da0f7ab8 Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Mon, 30 Sep 2019 21:03:31 -0700 Subject: [PATCH 334/420] React to 3.0 dev channel removal (#5021) --- .vsts-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index ed0b46fd8..2c754dfa2 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -301,7 +301,6 @@ stages: # This will run only after all the publishing stages have run. # These stages are introduced in the eng/common/templates/post-build/channels YAML templates - NetCore_Dev31_Publish - - NetCore_Dev30_Publish - NetCore_Dev5_Publish - NetCore_Release30_Publish - NetCore_Release31_Publish From af31cf657dcb2d33c07113dc476ec8beefcd122c Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Mon, 30 Sep 2019 21:04:19 -0700 Subject: [PATCH 335/420] React to 3.0 dev channel removal (#5022) --- .vsts-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index ed0b46fd8..2c754dfa2 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -301,7 +301,6 @@ stages: # This will run only after all the publishing stages have run. # These stages are introduced in the eng/common/templates/post-build/channels YAML templates - NetCore_Dev31_Publish - - NetCore_Dev30_Publish - NetCore_Dev5_Publish - NetCore_Release30_Publish - NetCore_Release31_Publish From 3ca3abc0dd3c0636a7ee4c533e66367a4a1cfb2e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 1 Oct 2019 05:32:34 +0000 Subject: [PATCH 336/420] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5026) * Update dependencies from https://github.com/dotnet/toolset build 20190930.5 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19480.5 * Update dependencies from https://github.com/dotnet/toolset build 20190930.8 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19480.8 * Update dependencies from https://github.com/dotnet/toolset build 20190930.9 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19480.9 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b15e8fb6e..8b329cd30 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -68,9 +68,9 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - caaf8a50f875e9857d3c56a6e8a020c60f6830d5 + 7a1807b943aef899ce4b27a73cc96fc074f3a2ec https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 2bf72917b..a026030f2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19480.2 + 3.1.100-preview1.19480.9 From b40c1e69b549cec4fe9ec40cf14b1ccb85cd7a10 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 1 Oct 2019 10:08:00 +0000 Subject: [PATCH 337/420] [release/3.1.1xx] Update dependencies from dotnet/core-setup (#5030) * Update dependencies from https://github.com/dotnet/core-setup build 20190930.22 - Microsoft.NETCore.App.Ref - 3.1.0-preview1.19480.22 - Microsoft.NETCore.App - 3.1.0-preview1.19480.22 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0-preview1.19480.22 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19480.22 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview1.19480.22 - Microsoft.NETCore.DotNetAppHost - 3.1.0-preview1.19480.22 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview1.19480.22 Dependency coherency updates - Microsoft.NETCore.Platforms - 3.1.0-preview1.19480.10 (parent: Microsoft.NetCore.App) * Update dependencies from https://github.com/dotnet/core-setup build 20190930.25 - Microsoft.NETCore.App.Ref - 3.1.0-preview1.19480.25 - Microsoft.NETCore.App - 3.1.0-preview1.19480.25 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0-preview1.19480.25 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19480.25 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview1.19480.25 - Microsoft.NETCore.DotNetAppHost - 3.1.0-preview1.19480.25 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview1.19480.25 Dependency coherency updates - Microsoft.NETCore.Platforms - 3.1.0-preview1.19480.10 (parent: Microsoft.NetCore.App) * Update dependencies from https://github.com/dotnet/core-setup build 20190930.27 - Microsoft.NETCore.App.Ref - 3.1.0-preview1.19480.27 - Microsoft.NETCore.App - 3.1.0-preview1.19480.27 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0-preview1.19480.27 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19480.27 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview1.19480.27 - Microsoft.NETCore.DotNetAppHost - 3.1.0-preview1.19480.27 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview1.19480.27 Dependency coherency updates - Microsoft.NETCore.Platforms - 3.1.0-preview1.19480.14 (parent: Microsoft.NetCore.App) --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 14 +++++++------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8b329cd30..5eef609ec 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,33 +2,33 @@ - + https://github.com/dotnet/core-setup - c032701d3d607d0c54a215b431a225120d3a7c06 + dfb28413477684834589b8b23492b48c43726e10 - + https://github.com/dotnet/core-setup - c032701d3d607d0c54a215b431a225120d3a7c06 + dfb28413477684834589b8b23492b48c43726e10 - + https://github.com/dotnet/core-setup - c032701d3d607d0c54a215b431a225120d3a7c06 + dfb28413477684834589b8b23492b48c43726e10 - + https://github.com/dotnet/core-setup - c032701d3d607d0c54a215b431a225120d3a7c06 + dfb28413477684834589b8b23492b48c43726e10 - + https://github.com/dotnet/core-setup - c032701d3d607d0c54a215b431a225120d3a7c06 + dfb28413477684834589b8b23492b48c43726e10 - + https://github.com/dotnet/core-setup - c032701d3d607d0c54a215b431a225120d3a7c06 + dfb28413477684834589b8b23492b48c43726e10 - + https://github.com/dotnet/core-setup - c032701d3d607d0c54a215b431a225120d3a7c06 + dfb28413477684834589b8b23492b48c43726e10 @@ -36,9 +36,9 @@ 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/corefx - 44de005400b7681b2f2f3e3f40e97f15da05d39f + 66917d1fd792d43a26009b5b231d5cb94361650e https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index a026030f2..c013cc4de 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,22 +44,22 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview1.19480.12 - 3.1.0-preview1.19480.12 + 3.1.0-preview1.19480.27 + 3.1.0-preview1.19480.27 $(MicrosoftNETCoreAppPackageVersion) - 3.1.0-preview1.19480.12 - 3.1.0-preview1.19480.12 + 3.1.0-preview1.19480.27 + 3.1.0-preview1.19480.27 $(MicrosoftNETCoreDotNetHostResolverPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) - 3.1.0-preview1.19480.12 + 3.1.0-preview1.19480.27 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) 2.1.0 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview1.19480.12 - 3.1.0-preview1.19480.12 + 3.1.0-preview1.19480.27 + 3.1.0-preview1.19480.27 $(MicrosoftWindowsDesktopAppPackageVersion) From 82b52ad4d00c7ed60075d07785b30ad52fc5f2dc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 1 Oct 2019 13:03:16 +0000 Subject: [PATCH 338/420] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5033) * Update dependencies from https://github.com/dotnet/toolset build 20190930.10 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19480.10 * Update dependencies from https://github.com/dotnet/toolset build 20191001.1 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19501.1 * Update dependencies from https://github.com/dotnet/toolset build 20191001.2 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19501.2 * Update dependencies from https://github.com/dotnet/toolset build 20191001.4 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19501.4 * Update dependencies from https://github.com/dotnet/toolset build 20191001.5 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19501.5 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview1.19501.1 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5eef609ec..187f82203 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -68,13 +68,13 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 7a1807b943aef899ce4b27a73cc96fc074f3a2ec + 0520dfe19b406b0cc146b7b9bb6dec674ce50372 - + https://github.com/dotnet/sdk - 8cfc10488c50eea7b0562f5de36dcdc64bf2fb37 + fcf6cead4e21bcd242ddf0687111ca8794020851 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index c013cc4de..56f86b1b4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19480.9 + 3.1.100-preview1.19501.5 @@ -40,7 +40,7 @@ - 3.1.100-preview1.19477.6 + 3.1.100-preview1.19501.1 $(MicrosoftNETSdkPackageVersion) From fed9ecf474d463741ea98041fb1ab5c3908c76fe Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 1 Oct 2019 19:25:24 +0000 Subject: [PATCH 339/420] [release/3.0.1xx] Update dependencies from dotnet/toolset (#5034) * Update dependencies from https://github.com/dotnet/toolset build 20191001.3 - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19501.3 * Update dependencies from https://github.com/dotnet/toolset build 20191001.8 - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19501.8 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.0.101-servicing.19501.1 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d47acc874..8a4c1b851 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -67,17 +67,17 @@ https://github.com/dotnet/templating a776e417c83c52908298b3767e462feae8b18b98 - + https://github.com/dotnet/toolset - 264be8c7fd7a837c98ec4eff76e65af65b628156 + a7bdde3404b9080615fe7f8a4e7ef9d27aaa03bf https://github.com/dotnet/sdk 3819a21a612cd8bc15b6f6c4e361d18490469577 - + https://github.com/dotnet/cli - b7448323496b263ae6b695ded6b7c9aebcf388b4 + 0b104bba96794c0fe14044afb62cf4b290eed2dc diff --git a/eng/Versions.props b/eng/Versions.props index c8384f396..52f54ee47 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.0.101-servicing.19479.3 + 3.0.101-servicing.19501.8 @@ -33,7 +33,7 @@ - 3.0.101-servicing.19477.8 + 3.0.101-servicing.19501.1 0.2.0 From 57c03e2caf7a1aebf6e44e52a9a13f5138b3b844 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Divino=20C=C3=A9sar?= Date: Tue, 1 Oct 2019 13:22:33 -0700 Subject: [PATCH 340/420] Download blobs from MSRC storage & Add CredProvider to Dockerfiles (#4753) * Download core-setup files from MSRC storage Add support for downloading core-setup files from an authenticated endpoint * Update GenerateLayout.targets * Adding changes to pass SAS token around * Add credential provider to Dockerfile's * Update after PR feedback * Add comments about approach * Copy NuGet config variables --- eng/build.yml | 9 +++++++++ eng/docker/alpine.3.6/Dockerfile | 13 ++++++++++--- eng/docker/rhel.6/Dockerfile | 4 +++- eng/docker/rhel/Dockerfile | 5 ++++- eng/docker/ubuntu.16.04/Dockerfile | 14 +++++++++++--- eng/dockerrun.sh | 6 ++++++ src/redist/targets/GenerateLayout.targets | 11 ++++++++++- 7 files changed, 53 insertions(+), 9 deletions(-) diff --git a/eng/build.yml b/eng/build.yml index 07ca10348..82e02fabc 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -40,6 +40,11 @@ phases: - _TeamName: Roslyn-Project-System - _BuildArgs: '' - _SignType: test + - _DOTNETCLIMSRC_READ_SAS_TOKEN: '' + + - ${{ if and(eq(variables['System.TeamProject'], 'internal'), contains(variables['Build.SourceBranch'], 'internal')) }}: + - group: DotNet-MSRC-Storage + - _DOTNETCLIMSRC_READ_SAS_TOKEN: $(dotnetclimsrc-read-sas-token) - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - group: DotNet-Symbol-Server-PATs @@ -79,6 +84,7 @@ phases: env: DOTNET_CLI_UI_LANGUAGE: $(_DOTNET_CLI_UI_LANGUAGE) DropSuffix: $(_DropSuffix) + DOTNETCLIMSRC_READ_SAS_TOKEN: $(_DOTNETCLIMSRC_READ_SAS_TOKEN) - ${{ if ne(parameters.agentOs, 'Windows_NT') }}: - script: 'eng/setbuildinfo.sh $(_BuildArchitecture) $(_BuildConfig)' @@ -98,6 +104,7 @@ phases: displayName: Build env: DropSuffix: $(_DropSuffix) + DOTNETCLIMSRC_READ_SAS_TOKEN: $(_DOTNETCLIMSRC_READ_SAS_TOKEN) - ${{ if or(eq(parameters.agentOs, 'Darwin'), eq(parameters.agentOs, 'FreeBSD')) }}: - script: ./build.sh @@ -108,6 +115,8 @@ phases: $(_BuildArgs) $(_AdditionalBuildParameters) displayName: Build + env: + DOTNETCLIMSRC_READ_SAS_TOKEN: $(_DOTNETCLIMSRC_READ_SAS_TOKEN) - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.agentOs, 'Windows_NT')) }}: - task: NuGetCommand@2 diff --git a/eng/docker/alpine.3.6/Dockerfile b/eng/docker/alpine.3.6/Dockerfile index ac6a7264b..9f9461690 100644 --- a/eng/docker/alpine.3.6/Dockerfile +++ b/eng/docker/alpine.3.6/Dockerfile @@ -18,10 +18,17 @@ RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers RUN chmod -R a+rwx /usr/local RUN chmod -R a+rwx /home -# Set user to the one we just created -USER ${USER_ID} - # Set working directory ARG WORK_DIR WORKDIR ${WORK_DIR} +# Set up Azure Artifacts credential provider +# We download the installer and execute it using ${USER_ID} so that the installer +# put the NuGet plugins in the correct $HOME/.nuget folder. +RUN curl -O https://raw.githubusercontent.com/Microsoft/artifacts-credprovider/master/helpers/installcredprovider.sh +RUN chmod +x ./installcredprovider.sh + +# Set user to the one we just created +USER ${USER_ID} + +RUN ./installcredprovider.sh diff --git a/eng/docker/rhel.6/Dockerfile b/eng/docker/rhel.6/Dockerfile index 1895a1e30..9e2e572d0 100644 --- a/eng/docker/rhel.6/Dockerfile +++ b/eng/docker/rhel.6/Dockerfile @@ -26,7 +26,9 @@ USER ${USER_ID} # Set library path to make CURL and ICU libraries that are in /usr/local/lib visible ENV LD_LIBRARY_PATH /usr/local/lib -# Set working directory +# Set working directory ARG WORK_DIR WORKDIR ${WORK_DIR} +# Set up Azure Artifacts credential provider +RUN wget -qO- https://raw.githubusercontent.com/Microsoft/artifacts-credprovider/master/helpers/installcredprovider.sh | bash diff --git a/eng/docker/rhel/Dockerfile b/eng/docker/rhel/Dockerfile index cd3f4f029..cd5ec2d15 100644 --- a/eng/docker/rhel/Dockerfile +++ b/eng/docker/rhel/Dockerfile @@ -19,6 +19,9 @@ RUN chown root:root /usr/bin/sudo && chmod 4755 /usr/bin/sudo # Set user to the one we just created USER ${USER_ID} -# Set working directory +# Set working directory ARG WORK_DIR WORKDIR ${WORK_DIR} + +# Set up Azure Artifacts credential provider +RUN wget -qO- https://raw.githubusercontent.com/Microsoft/artifacts-credprovider/master/helpers/installcredprovider.sh | bash diff --git a/eng/docker/ubuntu.16.04/Dockerfile b/eng/docker/ubuntu.16.04/Dockerfile index 4713a4b23..c58504613 100644 --- a/eng/docker/ubuntu.16.04/Dockerfile +++ b/eng/docker/ubuntu.16.04/Dockerfile @@ -49,9 +49,17 @@ RUN chmod -R a+rwx /usr/local RUN chmod -R a+rwx /home RUN chmod -R 755 /usr/lib/sudo -# Set user to the one we just created -USER ${USER_ID} - # Set working directory ARG WORK_DIR WORKDIR ${WORK_DIR} + +# Set up Azure Artifacts credential provider. +# We download the installer and execute it using ${USER_ID} so that the installer +# put the NuGet plugins in the correct $HOME/.nuget folder. +RUN curl -O https://raw.githubusercontent.com/Microsoft/artifacts-credprovider/master/helpers/installcredprovider.sh +RUN chmod +x ./installcredprovider.sh + +# Set user to the one we just created +USER ${USER_ID} + +RUN ./installcredprovider.sh diff --git a/eng/dockerrun.sh b/eng/dockerrun.sh index b42852d87..a41b3c059 100755 --- a/eng/dockerrun.sh +++ b/eng/dockerrun.sh @@ -142,7 +142,13 @@ docker run $INTERACTIVE -t --rm --sig-proxy=true \ -e BUILD_SOURCEBRANCH \ -e BUILD_BUILDNUMBER \ -e BUILD_SOURCEVERSION \ + -e SYSTEM_TEAMPROJECT \ + -e DOTNECLIMSRC_READ_SAS_TOKEN \ -e AGENT_JOBNAME \ -e AGENT_OS \ + -e VSS_NUGET_URI_PREFIXES \ + -e VSS_NUGET_ACCESSTOKEN \ + -e DOTNET_SYSTEM_NET_HTTP_USESOCKETSHTTPHANDLER=0 \ + -e NUGET_CREDENTIALPROVIDER_SESSIONTOKENCACHE_ENABLED=true \ $DOTNET_BUILD_CONTAINER_TAG \ $BUILD_COMMAND "$@" diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index 812329f22..6db1be7be 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -18,8 +18,17 @@ $(RedistLayoutPath)sdk\$(SdkVersion)\ + + true + $(DOTNETCLIMSRC_READ_SAS_TOKEN) + + https://dotnetclimsrc.blob.core.windows.net/dotnet/ https://dotnetcli.azureedge.net/dotnet/ + + https://dotnetclimsrc.blob.core.windows.net/dotnet/ https://dotnetcli.blob.core.windows.net/dotnet/ + + https://dotnetclimsrc.blob.core.windows.net/dotnet/ https://dotnetfeed.blob.core.windows.net/dotnet-toolset/ $(HostRid) @@ -277,7 +286,7 @@ From 941401b85efa2acb9051c2bdcac154f62c94cce0 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Tue, 1 Oct 2019 14:04:26 -0700 Subject: [PATCH 341/420] Template versioning needs to flow into core-sdk (#5042) * Updating templates version; fixing the versions flow. * Using: 'NUnit3DotNetNewTemplatePackageVersion' * Remove 'CoherentParentDependency' --- eng/Version.Details.xml | 4 ++++ eng/Versions.props | 17 ++++++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 187f82203..178287523 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -64,6 +64,10 @@ https://github.com/aspnet/AspNetCore 1937c804fa83ee3adddc7e648c610f880c24188e + + https://github.com/dotnet/test-templates + 6ae8a6e7dd862c9447771c108d43fb9028f22c22 + https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c diff --git a/eng/Versions.props b/eng/Versions.props index 56f86b1b4..23e689d49 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -22,6 +22,18 @@ 3.1.0-preview1.19476.4 + + + 3.1.0-preview1.19476.7 + + + + 1.0.2-beta4.19465.1 + + + + 1.6.3 + 3.1.0-preview1.19475.24 @@ -66,10 +78,9 @@ $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) - 1.6.3 - 3.1.0-preview1.19475.1 + $(NUnit3DotNetNewTemplatePackageVersion) + $(MicrosoftDotNetCommonItemTemplatesPackageVersion) $(MicrosoftDotNetCommonItemTemplates31PackageVersion) - 1.0.2-beta4.19465.1 $(AspNetCoreVersion) 4.8.0-rc2.19462.10 From f90da6f9d6d97968bc0387dd6f81e08ea273ea27 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 1 Oct 2019 21:47:31 -0700 Subject: [PATCH 342/420] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5049) * Update dependencies from https://github.com/dotnet/toolset build 20191001.11 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19501.11 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19501.5 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191001.12 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19501.12 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19501.5 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191001.13 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19501.13 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19501.9 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191001.16 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19501.16 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19501.11 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191001.15 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19501.15 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19501.9 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191001.17 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19501.17 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19501.11 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191001.19 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19501.19 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19501.11 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 178287523..5c9a573c9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,17 +72,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 0520dfe19b406b0cc146b7b9bb6dec674ce50372 + 27bf0b699bd289a2636947dd6a3ef0a6952a8a5c https://github.com/dotnet/sdk fcf6cead4e21bcd242ddf0687111ca8794020851 - + https://github.com/dotnet/cli - 448a99fcc1eac067880ba4263bd6a3945d0f76de + 8feda7443ceea1af2ba6759a975e9f1b17937204 diff --git a/eng/Versions.props b/eng/Versions.props index 23e689d49..5b9ed6cd3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19501.5 + 3.1.100-preview1.19501.19 @@ -45,7 +45,7 @@ - 3.1.100-preview1.19479.3 + 3.1.100-preview1.19501.11 0.2.0 From 0b90d76f39f96a99383578b07609d4b82c90c9c6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 1 Oct 2019 21:47:42 -0700 Subject: [PATCH 343/420] [release/3.1.1xx] Update dependencies from dotnet/core-setup (#5047) * Update dependencies from https://github.com/dotnet/core-setup build 20191001.9 - Microsoft.NETCore.App.Ref - 3.1.0-preview1.19501.9 - Microsoft.NETCore.App - 3.1.0-preview1.19501.9 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0-preview1.19501.9 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19501.9 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview1.19501.9 - Microsoft.NETCore.DotNetAppHost - 3.1.0-preview1.19501.9 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview1.19501.9 * Update dependencies from https://github.com/dotnet/core-setup build 20191001.13 - Microsoft.NETCore.App.Ref - 3.1.0-preview1.19501.13 - Microsoft.NETCore.App - 3.1.0-preview1.19501.13 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0-preview1.19501.13 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19501.13 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview1.19501.13 - Microsoft.NETCore.DotNetAppHost - 3.1.0-preview1.19501.13 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview1.19501.13 * Update dependencies from https://github.com/dotnet/core-setup build 20191001.15 - Microsoft.NETCore.App.Ref - 3.1.0-preview1.19501.15 - Microsoft.NETCore.App - 3.1.0-preview1.19501.15 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0-preview1.19501.15 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19501.15 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview1.19501.15 - Microsoft.NETCore.DotNetAppHost - 3.1.0-preview1.19501.15 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview1.19501.15 Dependency coherency updates - Microsoft.NETCore.Platforms - 3.1.0-preview1.19501.5 (parent: Microsoft.NetCore.App) --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 14 +++++++------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5c9a573c9..9dd7fc315 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,33 +2,33 @@ - + https://github.com/dotnet/core-setup - dfb28413477684834589b8b23492b48c43726e10 + dc615e8b193c5cc25ed7122432562f8399672181 - + https://github.com/dotnet/core-setup - dfb28413477684834589b8b23492b48c43726e10 + dc615e8b193c5cc25ed7122432562f8399672181 - + https://github.com/dotnet/core-setup - dfb28413477684834589b8b23492b48c43726e10 + dc615e8b193c5cc25ed7122432562f8399672181 - + https://github.com/dotnet/core-setup - dfb28413477684834589b8b23492b48c43726e10 + dc615e8b193c5cc25ed7122432562f8399672181 - + https://github.com/dotnet/core-setup - dfb28413477684834589b8b23492b48c43726e10 + dc615e8b193c5cc25ed7122432562f8399672181 - + https://github.com/dotnet/core-setup - dfb28413477684834589b8b23492b48c43726e10 + dc615e8b193c5cc25ed7122432562f8399672181 - + https://github.com/dotnet/core-setup - dfb28413477684834589b8b23492b48c43726e10 + dc615e8b193c5cc25ed7122432562f8399672181 @@ -36,9 +36,9 @@ 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/corefx - 66917d1fd792d43a26009b5b231d5cb94361650e + 09e0353381e2b9da8dd90d64869de076740cc800 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 5b9ed6cd3..ef5250409 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,22 +56,22 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview1.19480.27 - 3.1.0-preview1.19480.27 + 3.1.0-preview1.19501.15 + 3.1.0-preview1.19501.15 $(MicrosoftNETCoreAppPackageVersion) - 3.1.0-preview1.19480.27 - 3.1.0-preview1.19480.27 + 3.1.0-preview1.19501.15 + 3.1.0-preview1.19501.15 $(MicrosoftNETCoreDotNetHostResolverPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) - 3.1.0-preview1.19480.27 + 3.1.0-preview1.19501.15 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) 2.1.0 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview1.19480.27 - 3.1.0-preview1.19480.27 + 3.1.0-preview1.19501.15 + 3.1.0-preview1.19501.15 $(MicrosoftWindowsDesktopAppPackageVersion) From 3e9c4d7b87b8d0b076c6e4728da72c2110db54e0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 2 Oct 2019 08:16:25 +0000 Subject: [PATCH 344/420] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5055) * Update dependencies from https://github.com/dotnet/toolset build 20191001.21 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19501.21 * Update dependencies from https://github.com/dotnet/toolset build 20191002.1 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19502.1 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19501.15 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9dd7fc315..3d8a8478d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,17 +72,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 27bf0b699bd289a2636947dd6a3ef0a6952a8a5c + bca3d53bb6033747e301a5bcd92d3eb5bf3aee48 https://github.com/dotnet/sdk fcf6cead4e21bcd242ddf0687111ca8794020851 - + https://github.com/dotnet/cli - 8feda7443ceea1af2ba6759a975e9f1b17937204 + 4751d423a94d34393f90b3fcaa8eceb6b665af44 diff --git a/eng/Versions.props b/eng/Versions.props index ef5250409..324014336 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19501.19 + 3.1.100-preview1.19502.1 @@ -45,7 +45,7 @@ - 3.1.100-preview1.19501.11 + 3.1.100-preview1.19501.15 0.2.0 From 383b1ae5fd5c761e67a5503c540245d6bb9a2dfa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 2 Oct 2019 15:50:20 +0000 Subject: [PATCH 345/420] [release/3.1.1xx] Update dependencies from dotnet/core-setup (#5054) * Update dependencies from https://github.com/dotnet/core-setup build 20191001.22 - Microsoft.NETCore.App.Ref - 3.1.0-preview1.19501.22 - Microsoft.NETCore.App - 3.1.0-preview1.19501.22 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0-preview1.19501.22 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19501.22 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview1.19501.22 - Microsoft.NETCore.DotNetAppHost - 3.1.0-preview1.19501.22 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview1.19501.22 Dependency coherency updates - Microsoft.NETCore.Platforms - 3.1.0-preview1.19501.8 (parent: Microsoft.NetCore.App) - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.1-preview1.19477.1 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.0-preview1.19501.3 (parent: Microsoft.WindowsDesktop.App) * Update dependencies from https://github.com/dotnet/core-setup build 20191001.24 - Microsoft.NETCore.App.Ref - 3.1.0-preview1.19501.24 - Microsoft.NETCore.App - 3.1.0-preview1.19501.24 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0-preview1.19501.24 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19501.24 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview1.19501.24 - Microsoft.NETCore.DotNetAppHost - 3.1.0-preview1.19501.24 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview1.19501.24 Dependency coherency updates - Microsoft.NETCore.Platforms - 3.1.0-preview1.19501.8 (parent: Microsoft.NetCore.App) - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.1-preview1.19501.1 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.0-preview1.19501.6 (parent: Microsoft.WindowsDesktop.App) --- eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 18 +++++++++--------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3d8a8478d..65547e343 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,33 +2,33 @@ - + https://github.com/dotnet/core-setup - dc615e8b193c5cc25ed7122432562f8399672181 + 0b3fcd7a02fd29017f01f01a36ea562c5fda1eec - + https://github.com/dotnet/core-setup - dc615e8b193c5cc25ed7122432562f8399672181 + 0b3fcd7a02fd29017f01f01a36ea562c5fda1eec - + https://github.com/dotnet/core-setup - dc615e8b193c5cc25ed7122432562f8399672181 + 0b3fcd7a02fd29017f01f01a36ea562c5fda1eec - + https://github.com/dotnet/core-setup - dc615e8b193c5cc25ed7122432562f8399672181 + 0b3fcd7a02fd29017f01f01a36ea562c5fda1eec - + https://github.com/dotnet/core-setup - dc615e8b193c5cc25ed7122432562f8399672181 + 0b3fcd7a02fd29017f01f01a36ea562c5fda1eec - + https://github.com/dotnet/core-setup - dc615e8b193c5cc25ed7122432562f8399672181 + 0b3fcd7a02fd29017f01f01a36ea562c5fda1eec - + https://github.com/dotnet/core-setup - dc615e8b193c5cc25ed7122432562f8399672181 + 0b3fcd7a02fd29017f01f01a36ea562c5fda1eec @@ -36,9 +36,9 @@ 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/corefx - 09e0353381e2b9da8dd90d64869de076740cc800 + e61772dfb9cfc9b08d95950814ebe51f22cd2de6 https://github.com/aspnet/AspNetCore @@ -85,13 +85,13 @@ 4751d423a94d34393f90b3fcaa8eceb6b665af44 - + https://github.com/dotnet/winforms - 3e3e5cde020a9084e8eab4c4f1a278b9d7e63566 + be3d33927476deb6e299c69cc68f0c54ed1b828c - + https://github.com/dotnet/wpf - a0912c73f4a4069f28aa0483ad7b0ed30d745018 + 9a67316ef068c3f4a78a11916777b505b0bbacca diff --git a/eng/Versions.props b/eng/Versions.props index 324014336..857cfd8b6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,11 +16,11 @@ - 4.8.1-preview1.19476.2 + 4.8.1-preview1.19501.1 - 3.1.0-preview1.19476.4 + 3.1.0-preview1.19501.6 @@ -56,22 +56,22 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview1.19501.15 - 3.1.0-preview1.19501.15 + 3.1.0-preview1.19501.24 + 3.1.0-preview1.19501.24 $(MicrosoftNETCoreAppPackageVersion) - 3.1.0-preview1.19501.15 - 3.1.0-preview1.19501.15 + 3.1.0-preview1.19501.24 + 3.1.0-preview1.19501.24 $(MicrosoftNETCoreDotNetHostResolverPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) - 3.1.0-preview1.19501.15 + 3.1.0-preview1.19501.24 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) 2.1.0 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview1.19501.15 - 3.1.0-preview1.19501.15 + 3.1.0-preview1.19501.24 + 3.1.0-preview1.19501.24 $(MicrosoftWindowsDesktopAppPackageVersion) From ff183e5bdcd23d5b62d2d2a60914a5ab5cbf2796 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 2 Oct 2019 15:53:49 +0000 Subject: [PATCH 346/420] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5060) * Update dependencies from https://github.com/dotnet/toolset build 20191002.3 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19502.3 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19502.1 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191002.4 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19502.4 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19502.1 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191002.6 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19502.6 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19502.2 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 65547e343..d80750968 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,17 +72,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - bca3d53bb6033747e301a5bcd92d3eb5bf3aee48 + 0eb7ab18f77c18a07ce0c6785ee930dc7abdfff2 https://github.com/dotnet/sdk fcf6cead4e21bcd242ddf0687111ca8794020851 - + https://github.com/dotnet/cli - 4751d423a94d34393f90b3fcaa8eceb6b665af44 + 40b41b92358e6bab9295f67532c403426fe4b605 diff --git a/eng/Versions.props b/eng/Versions.props index 857cfd8b6..ec030b7b2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19502.1 + 3.1.100-preview1.19502.6 @@ -45,7 +45,7 @@ - 3.1.100-preview1.19501.15 + 3.1.100-preview1.19502.2 0.2.0 From 6174295324814a0920e8e36ab84eecf327120258 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 2 Oct 2019 09:23:28 -0700 Subject: [PATCH 347/420] Update dependencies from https://github.com/aspnet/AspNetCore build 20191001.11 (#5058) - dotnet-user-secrets - 3.1.0-preview1.19501.11 - dotnet-watch - 3.1.0-preview1.19501.11 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19501.11 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19501.11 - dotnet-dev-certs - 3.1.0-preview1.19501.11 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19501.11 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d80750968..b3980e840 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -40,29 +40,29 @@ https://github.com/dotnet/corefx e61772dfb9cfc9b08d95950814ebe51f22cd2de6 - + https://github.com/aspnet/AspNetCore - 1937c804fa83ee3adddc7e648c610f880c24188e + ff095ddf559203abd4ccf906d40b31a444344050 - + https://github.com/aspnet/AspNetCore - 1937c804fa83ee3adddc7e648c610f880c24188e + ff095ddf559203abd4ccf906d40b31a444344050 - + https://github.com/aspnet/AspNetCore - 1937c804fa83ee3adddc7e648c610f880c24188e + ff095ddf559203abd4ccf906d40b31a444344050 - + https://github.com/aspnet/AspNetCore - 1937c804fa83ee3adddc7e648c610f880c24188e + ff095ddf559203abd4ccf906d40b31a444344050 - + https://github.com/aspnet/AspNetCore - 1937c804fa83ee3adddc7e648c610f880c24188e + ff095ddf559203abd4ccf906d40b31a444344050 - + https://github.com/aspnet/AspNetCore - 1937c804fa83ee3adddc7e648c610f880c24188e + ff095ddf559203abd4ccf906d40b31a444344050 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index ec030b7b2..6b6a79d1a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,12 +36,12 @@ - 3.1.0-preview1.19475.24 - 3.1.0-preview1.19475.24 - 3.1.0-preview1.19475.24 - 3.1.0-preview1.19475.24 - 3.1.0-preview1.19475.24 - 3.1.0-preview1.19475.24 + 3.1.0-preview1.19501.11 + 3.1.0-preview1.19501.11 + 3.1.0-preview1.19501.11 + 3.1.0-preview1.19501.11 + 3.1.0-preview1.19501.11 + 3.1.0-preview1.19501.11 From 421ec230d0ac3bd9bdb6367c10d41fc4055d4222 Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Wed, 2 Oct 2019 12:32:23 -0700 Subject: [PATCH 348/420] Add self-contained end-to-end coverage Also, re-enable skipped test and remove unnecessary workarounds --- test/EndToEnd/ProjectBuildTests.cs | 61 ++++++++++++------------------ 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/test/EndToEnd/ProjectBuildTests.cs b/test/EndToEnd/ProjectBuildTests.cs index be7f7132d..c666d2af1 100644 --- a/test/EndToEnd/ProjectBuildTests.cs +++ b/test/EndToEnd/ProjectBuildTests.cs @@ -2,16 +2,15 @@ using System.IO; using System.Linq; using System.Xml.Linq; +using Microsoft.DotNet.PlatformAbstractions; using Microsoft.DotNet.TestFramework; using Microsoft.DotNet.Tools.Test.Utilities; using Xunit; namespace EndToEnd.Tests { - public class ProjectBuildTests : TestBase { - [Fact] public void ItCanNewRestoreBuildRunCleanMSBuildProject() { @@ -35,18 +34,8 @@ namespace EndToEnd.Tests .Should().Pass(); var runCommand = new RunCommand() - .WithWorkingDirectory(projectDirectory); - - // Set DOTNET_ROOT as workaround for https://github.com/dotnet/cli/issues/10196 - var dotnetRoot = Path.GetDirectoryName(RepoDirectoriesProvider.DotnetUnderTest); - if (!string.IsNullOrEmpty(dotnetRoot)) - { - bool useX86 = RepoDirectoriesProvider.DotnetRidUnderTest.EndsWith("x86", StringComparison.InvariantCultureIgnoreCase); - runCommand = runCommand.WithEnvironmentVariable(useX86 ? "DOTNET_ROOT(x86)" : "DOTNET_ROOT", - dotnetRoot); - } - - runCommand.ExecuteWithCapturedOutput() + .WithWorkingDirectory(projectDirectory) + .ExecuteWithCapturedOutput() .Should().Pass() .And.HaveStdOutContaining("Hello World!"); @@ -61,7 +50,7 @@ namespace EndToEnd.Tests binDirectory.Should().NotHaveFilesMatching("*.dll", SearchOption.AllDirectories); } - [Fact(Skip = "Need support for ASP.NET on .NET Core 3.1")] + [Fact] public void ItCanRunAnAppUsingTheWebSdk() { var directory = TestAssets.CreateTestDirectory(); @@ -88,21 +77,10 @@ namespace EndToEnd.Tests .Should().Pass(); var runCommand = new RunCommand() - .WithWorkingDirectory(projectDirectory); - - // Set DOTNET_ROOT as workaround for https://github.com/dotnet/cli/issues/10196 - var dotnetRoot = Path.GetDirectoryName(RepoDirectoriesProvider.DotnetUnderTest); - if (!string.IsNullOrEmpty(dotnetRoot)) - { - bool useX86 = RepoDirectoriesProvider.DotnetRidUnderTest.EndsWith("x86", StringComparison.InvariantCultureIgnoreCase); - runCommand = runCommand.WithEnvironmentVariable(useX86 ? "DOTNET_ROOT(x86)" : "DOTNET_ROOT", - dotnetRoot); - } - - runCommand.ExecuteWithCapturedOutput() + .WithWorkingDirectory(projectDirectory) + .ExecuteWithCapturedOutput() .Should().Pass() .And.HaveStdOutContaining("Hello World!"); - } [Theory] @@ -125,7 +103,22 @@ namespace EndToEnd.Tests TestTemplateBuild(templateName); } - private void TestTemplateBuild(string templateName) + [WindowsOnlyTheory] + [InlineData("wpf")] + public void ItCanBuildDesktopTemplatesSelfContained(string templateName) + { + TestTemplateBuild(templateName); + } + + [Theory] + [InlineData("web")] + [InlineData("console")] + public void ItCanBuildTemplatesSelfContained(string templateName) + { + TestTemplateBuild(templateName, selfContained: true); + } + + private void TestTemplateBuild(string templateName, bool selfContained = false) { var directory = TestAssets.CreateTestDirectory(identifier: templateName); string projectDirectory = directory.FullName; @@ -136,18 +129,12 @@ namespace EndToEnd.Tests .Execute(newArgs) .Should().Pass(); - // Work-around for MVC template test until ASP.Net publishes Preview 5 'Microsoft.AspNetCore.Mvc.NewtonsoftJson' to NuGet.org - string restoreArgs = string.Equals(templateName, "mvc", StringComparison.OrdinalIgnoreCase) ? "/p:RestoreAdditionalProjectSources=https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore/index.json" : ""; - new RestoreCommand() - .WithWorkingDirectory(projectDirectory) - .Execute(restoreArgs) - .Should().Pass(); - + var buildArgs = selfContained ? "" :$"-r {RuntimeEnvironment.GetRuntimeIdentifier()}"; var dotnetRoot = Path.GetDirectoryName(RepoDirectoriesProvider.DotnetUnderTest); new BuildCommand() .WithEnvironmentVariable("PATH", dotnetRoot) // override PATH since razor rely on PATH to find dotnet .WithWorkingDirectory(projectDirectory) - .Execute() + .Execute(buildArgs) .Should().Pass(); } } From 7c72c6cb8db8154f9fe38d87c8605b4f3d8155f5 Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Wed, 2 Oct 2019 12:42:28 -0700 Subject: [PATCH 349/420] Fix typo causing 3.1 ASP.NET runtime pack to not be found --- src/redist/targets/GenerateBundledVersions.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index e6966995c..9cec553b0 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -88,7 +88,7 @@ linux-arm; linux-arm64" /> - + From 21e1457e2dffc07fcc548f908a3218901e831082 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 2 Oct 2019 22:21:06 +0000 Subject: [PATCH 350/420] Update dependencies from https://github.com/dotnet/toolset build 20191002.12 (#5074) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19502.12 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19502.6 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b3980e840..95a58a0d0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,17 +72,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 0eb7ab18f77c18a07ce0c6785ee930dc7abdfff2 + 52d1e466c33a3913f4976e44e3003c71b2d5c6b8 https://github.com/dotnet/sdk fcf6cead4e21bcd242ddf0687111ca8794020851 - + https://github.com/dotnet/cli - 40b41b92358e6bab9295f67532c403426fe4b605 + ad2542a940868e6d385eb807121a229044edf074 diff --git a/eng/Versions.props b/eng/Versions.props index 6b6a79d1a..c3756e74b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19502.6 + 3.1.100-preview1.19502.12 @@ -45,7 +45,7 @@ - 3.1.100-preview1.19502.2 + 3.1.100-preview1.19502.6 0.2.0 From 2aeb92223dddfdf29aedc2f208caad334a6747dd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 02:49:50 +0000 Subject: [PATCH 351/420] [release/3.1.1xx] Update dependencies from aspnet/AspNetCore (#5066) * Update dependencies from https://github.com/aspnet/AspNetCore build 20191002.1 - dotnet-user-secrets - 3.1.0-preview1.19502.1 - dotnet-watch - 3.1.0-preview1.19502.1 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19502.1 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19502.1 - dotnet-dev-certs - 3.1.0-preview1.19502.1 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19502.1 * Update dependencies from https://github.com/aspnet/AspNetCore build 20191002.13 - dotnet-user-secrets - 3.1.0-preview1.19502.13 - dotnet-watch - 3.1.0-preview1.19502.13 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19502.13 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19502.13 - dotnet-dev-certs - 3.1.0-preview1.19502.13 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19502.13 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 95a58a0d0..1eb06005a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -40,29 +40,29 @@ https://github.com/dotnet/corefx e61772dfb9cfc9b08d95950814ebe51f22cd2de6 - + https://github.com/aspnet/AspNetCore - ff095ddf559203abd4ccf906d40b31a444344050 + cca42d9624e6adcff85c3865f1189032a202c2ed - + https://github.com/aspnet/AspNetCore - ff095ddf559203abd4ccf906d40b31a444344050 + cca42d9624e6adcff85c3865f1189032a202c2ed - + https://github.com/aspnet/AspNetCore - ff095ddf559203abd4ccf906d40b31a444344050 + cca42d9624e6adcff85c3865f1189032a202c2ed - + https://github.com/aspnet/AspNetCore - ff095ddf559203abd4ccf906d40b31a444344050 + cca42d9624e6adcff85c3865f1189032a202c2ed - + https://github.com/aspnet/AspNetCore - ff095ddf559203abd4ccf906d40b31a444344050 + cca42d9624e6adcff85c3865f1189032a202c2ed - + https://github.com/aspnet/AspNetCore - ff095ddf559203abd4ccf906d40b31a444344050 + cca42d9624e6adcff85c3865f1189032a202c2ed https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index c3756e74b..9c99ba379 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,12 +36,12 @@ - 3.1.0-preview1.19501.11 - 3.1.0-preview1.19501.11 - 3.1.0-preview1.19501.11 - 3.1.0-preview1.19501.11 - 3.1.0-preview1.19501.11 - 3.1.0-preview1.19501.11 + 3.1.0-preview1.19502.13 + 3.1.0-preview1.19502.13 + 3.1.0-preview1.19502.13 + 3.1.0-preview1.19502.13 + 3.1.0-preview1.19502.13 + 3.1.0-preview1.19502.13 From 7b26e35c70427b0308861a906a3eefe7bd09fd99 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 04:20:38 +0000 Subject: [PATCH 352/420] Update dependencies from https://github.com/dotnet/toolset build 20191002.17 (#5083) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19502.17 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19502.10 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1eb06005a..1e8e6922a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,17 +72,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 52d1e466c33a3913f4976e44e3003c71b2d5c6b8 + c4f759675019b19ac14df330e87c24bb5a114696 https://github.com/dotnet/sdk fcf6cead4e21bcd242ddf0687111ca8794020851 - + https://github.com/dotnet/cli - ad2542a940868e6d385eb807121a229044edf074 + e64971ec20eeee64e41ad2f69de06609ac06d954 diff --git a/eng/Versions.props b/eng/Versions.props index 9c99ba379..701f87e6c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19502.12 + 3.1.100-preview1.19502.17 @@ -45,7 +45,7 @@ - 3.1.100-preview1.19502.6 + 3.1.100-preview1.19502.10 0.2.0 From f2ef63801542982b56bb311f0e9ff2aa3f6c961f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 07:46:13 +0000 Subject: [PATCH 353/420] Update dependencies from https://github.com/dotnet/toolset build 20191002.20 (#5087) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19502.20 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1e8e6922a..7776b07b7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - c4f759675019b19ac14df330e87c24bb5a114696 + 97b27dc1c39cff6315c977ea63e8104cb45ceb4c https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 701f87e6c..d1cc29107 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19502.17 + 3.1.100-preview1.19502.20 From 262a91cb436a5ec452bc54856e8f19fdfe8a3a97 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 08:50:44 +0000 Subject: [PATCH 354/420] Update dependencies from https://github.com/dotnet/toolset build 20191003.1 (#5088) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19503.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7776b07b7..e1220e3e2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 97b27dc1c39cff6315c977ea63e8104cb45ceb4c + dbe9eb3587186051340be9ed853670acfc5acf04 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index d1cc29107..5dbbe1a7f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19502.20 + 3.1.100-preview1.19503.1 From 1a7f735b3e5bc01ce0d1929d0038ac200a096737 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Thu, 3 Oct 2019 14:37:59 -0700 Subject: [PATCH 355/420] Enabling ASP.NET targeting pack and shared framework in RPM/DEB native installers. (#5090) --- src/redist/targets/GenerateDebs.targets | 14 ++++++++++---- src/redist/targets/GenerateRPMs.targets | 6 +++++- .../packaging/deb/dotnet-debian_config.json | 4 +++- .../targets/packaging/rpm/dotnet-config.json | 8 ++++++++ 4 files changed, 26 insertions(+), 6 deletions(-) diff --git a/src/redist/targets/GenerateDebs.targets b/src/redist/targets/GenerateDebs.targets index 71a95a41a..cedf06792 100644 --- a/src/redist/targets/GenerateDebs.targets +++ b/src/redist/targets/GenerateDebs.targets @@ -235,10 +235,12 @@ + + - + + - + + @@ -351,9 +353,11 @@ + + @@ -370,9 +374,11 @@ + + diff --git a/src/redist/targets/GenerateRPMs.targets b/src/redist/targets/GenerateRPMs.targets index 5755bd5df..dd6ac2f09 100644 --- a/src/redist/targets/GenerateRPMs.targets +++ b/src/redist/targets/GenerateRPMs.targets @@ -286,10 +286,12 @@ + - + + + + diff --git a/src/redist/targets/packaging/deb/dotnet-debian_config.json b/src/redist/targets/packaging/deb/dotnet-debian_config.json index 836d41375..35a0f433f 100644 --- a/src/redist/targets/packaging/deb/dotnet-debian_config.json +++ b/src/redist/targets/packaging/deb/dotnet-debian_config.json @@ -32,6 +32,8 @@ "%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME%": { "package_version": "%SHARED_FRAMEWORK_DEBIAN_PACKAGE_VERSION%" }%SHARED_FRAMEWORK_DEBIAN_PACKAGE_ADDITIONAL_DEPENDENCY%, "%NETCOREAPP_TARGETING_PACK_DEBIAN_PACKAGE_NAME%": { "package_version": "%SHARED_FRAMEWORK_DEBIAN_PACKAGE_VERSION%" }, "%NETCORE_APPHOST_PACK_DEBIAN_PACKAGE_NAME%": { "package_version": "%SHARED_FRAMEWORK_DEBIAN_PACKAGE_VERSION%" }, - "%NETSTANDARD_TARGETING_PACK_DEBIAN_PACKAGE_NAME%": { "package_version": "%NET_STANDARD_DEBIAN_PACKAGE_VERSION%" } + "%NETSTANDARD_TARGETING_PACK_DEBIAN_PACKAGE_NAME%": { "package_version": "%NET_STANDARD_DEBIAN_PACKAGE_VERSION%" }, + "%ASPNETCORE_SHAREDFX_DEBIAN_PACKAGE_NAME%": { "package_version": "%ASPNETCORE_SHAREDFX_DEBIAN_PACKAGE_VERSION%" }, + "%ASPNET_TARGETING_PACK_DEBIAN_PACKAGE_NAME%": { "package_version": "%ASPNETCORE_SHAREDFX_DEBIAN_PACKAGE_VERSION%" } } } diff --git a/src/redist/targets/packaging/rpm/dotnet-config.json b/src/redist/targets/packaging/rpm/dotnet-config.json index d06c428f1..fd090e2d8 100644 --- a/src/redist/targets/packaging/rpm/dotnet-config.json +++ b/src/redist/targets/packaging/rpm/dotnet-config.json @@ -37,6 +37,14 @@ { "package_name": "%NETSTANDARD_TARGETING_PACK_RPM_PACKAGE_NAME%", "package_version": "%NETSTANDARD_TARGETING_PACK_RPM_PACKAGE_VERSION%" + }, + { + "package_name": "%ASPNETCORE_SHAREDFX_RPM_PACKAGE_NAME%", + "package_version": "%ASPNETCORE_SHAREDFX_RPM_PACKAGE_VERSION%" + }, + { + "package_name": "%ASPNET_TARGETING_PACK_RPM_PACKAGE_NAME%", + "package_version": "%ASPNETCORE_SHAREDFX_RPM_PACKAGE_VERSION%" } ], "directories": [ From 56a3333f55853e050a7284a2ce6b391b0328a8d2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 15:02:59 -0700 Subject: [PATCH 356/420] Update dependencies from https://github.com/dotnet/toolset build 20191003.5 (#5092) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19503.5 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview1.19503.1 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e1220e3e2..c60f8f311 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,13 +72,13 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - dbe9eb3587186051340be9ed853670acfc5acf04 + bbb399397efe290384a23c3bb680ee13bf31de87 - + https://github.com/dotnet/sdk - fcf6cead4e21bcd242ddf0687111ca8794020851 + 9fa3ace9cfd9d9517618ce73dd41b522e24f749f https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index 5dbbe1a7f..fa7813d25 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19503.1 + 3.1.100-preview1.19503.5 @@ -52,7 +52,7 @@ - 3.1.100-preview1.19501.1 + 3.1.100-preview1.19503.1 $(MicrosoftNETSdkPackageVersion) From 776c42b31292dfc3d1adb2a8d561a2c3a16b387d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2019 17:57:42 -0700 Subject: [PATCH 357/420] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5093) * Update dependencies from https://github.com/dotnet/toolset build 20191003.6 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19503.6 * Update dependencies from https://github.com/dotnet/toolset build 20191003.8 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19503.8 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19503.3 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c60f8f311..72ee43916 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,17 +72,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - bbb399397efe290384a23c3bb680ee13bf31de87 + 71ef7d7a00f41e83935878f231cdedd9738d93f5 https://github.com/dotnet/sdk 9fa3ace9cfd9d9517618ce73dd41b522e24f749f - + https://github.com/dotnet/cli - e64971ec20eeee64e41ad2f69de06609ac06d954 + 22c175e2daa78616ae41438cc3aca94a349cf8cf diff --git a/eng/Versions.props b/eng/Versions.props index fa7813d25..d220c52ea 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19503.5 + 3.1.100-preview1.19503.8 @@ -45,7 +45,7 @@ - 3.1.100-preview1.19502.10 + 3.1.100-preview1.19503.3 0.2.0 From 630bfccd296674e761e71fe76e7ff48206bb0f0a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 4 Oct 2019 05:55:38 +0000 Subject: [PATCH 358/420] Update dependencies from https://github.com/aspnet/AspNetCore build 20191003.31 (#5098) - dotnet-user-secrets - 3.1.0-preview1.19503.31 - dotnet-watch - 3.1.0-preview1.19503.31 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19503.31 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19503.31 - dotnet-dev-certs - 3.1.0-preview1.19503.31 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19503.31 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 72ee43916..6585661a2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -40,29 +40,29 @@ https://github.com/dotnet/corefx e61772dfb9cfc9b08d95950814ebe51f22cd2de6 - + https://github.com/aspnet/AspNetCore - cca42d9624e6adcff85c3865f1189032a202c2ed + a7b739bab3b1d310eeec6aef551ce39650bdcf24 - + https://github.com/aspnet/AspNetCore - cca42d9624e6adcff85c3865f1189032a202c2ed + a7b739bab3b1d310eeec6aef551ce39650bdcf24 - + https://github.com/aspnet/AspNetCore - cca42d9624e6adcff85c3865f1189032a202c2ed + a7b739bab3b1d310eeec6aef551ce39650bdcf24 - + https://github.com/aspnet/AspNetCore - cca42d9624e6adcff85c3865f1189032a202c2ed + a7b739bab3b1d310eeec6aef551ce39650bdcf24 - + https://github.com/aspnet/AspNetCore - cca42d9624e6adcff85c3865f1189032a202c2ed + a7b739bab3b1d310eeec6aef551ce39650bdcf24 - + https://github.com/aspnet/AspNetCore - cca42d9624e6adcff85c3865f1189032a202c2ed + a7b739bab3b1d310eeec6aef551ce39650bdcf24 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index d220c52ea..5899cabe8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,12 +36,12 @@ - 3.1.0-preview1.19502.13 - 3.1.0-preview1.19502.13 - 3.1.0-preview1.19502.13 - 3.1.0-preview1.19502.13 - 3.1.0-preview1.19502.13 - 3.1.0-preview1.19502.13 + 3.1.0-preview1.19503.31 + 3.1.0-preview1.19503.31 + 3.1.0-preview1.19503.31 + 3.1.0-preview1.19503.31 + 3.1.0-preview1.19503.31 + 3.1.0-preview1.19503.31 From 02dbcb34c5154a5088ec2a8f2d79e35348a5b364 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 4 Oct 2019 10:25:40 +0000 Subject: [PATCH 359/420] Update dependencies from https://github.com/dotnet/toolset build 20191004.1 (#5103) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19504.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6585661a2..fb9c5a587 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 71ef7d7a00f41e83935878f231cdedd9738d93f5 + b2b0e2ae095f1f38f854023124b753457caddea2 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 5899cabe8..53a77ecb4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19503.8 + 3.1.100-preview1.19504.1 From 0e58699620049b64fe824d1811bec8ed702e22a4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 4 Oct 2019 11:40:46 +0000 Subject: [PATCH 360/420] Update dependencies from https://github.com/dotnet/toolset build 20191004.3 (#5105) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19504.3 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19504.2 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fb9c5a587..74a70a195 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,17 +72,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - b2b0e2ae095f1f38f854023124b753457caddea2 + a5d1be3bd55b78cd1df4936a142d09587f93ce95 https://github.com/dotnet/sdk 9fa3ace9cfd9d9517618ce73dd41b522e24f749f - + https://github.com/dotnet/cli - 22c175e2daa78616ae41438cc3aca94a349cf8cf + b872b3fe70a4d596be9d646a7d8c780b27d4e5b6 diff --git a/eng/Versions.props b/eng/Versions.props index 53a77ecb4..63ecd8b61 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19504.1 + 3.1.100-preview1.19504.3 @@ -45,7 +45,7 @@ - 3.1.100-preview1.19503.3 + 3.1.100-preview1.19504.2 0.2.0 From 16e07b44ed916b928eb6272aa8e5547ca02da196 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 4 Oct 2019 13:05:41 +0000 Subject: [PATCH 361/420] Update dependencies from https://github.com/dotnet/toolset build 20191004.4 (#5106) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19504.4 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview1.19504.1 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 74a70a195..476ec2b6e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,13 +72,13 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - a5d1be3bd55b78cd1df4936a142d09587f93ce95 + 9d603ec25c2c08a13711f37b4c3130e532e1bd58 - + https://github.com/dotnet/sdk - 9fa3ace9cfd9d9517618ce73dd41b522e24f749f + 7def7a9c5adc9e4d52a4cf19eee2c3998e3f3b93 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index 63ecd8b61..560d8961b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19504.3 + 3.1.100-preview1.19504.4 @@ -52,7 +52,7 @@ - 3.1.100-preview1.19503.1 + 3.1.100-preview1.19504.1 $(MicrosoftNETSdkPackageVersion) From d6f09906f10f1c7f229ab3b1efe65fb10f54e738 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 4 Oct 2019 15:01:33 +0000 Subject: [PATCH 362/420] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5107) * Update dependencies from https://github.com/dotnet/toolset build 20191004.6 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19504.6 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19504.3 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191004.7 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19504.7 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19504.3 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 476ec2b6e..c72a18d24 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,17 +72,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 9d603ec25c2c08a13711f37b4c3130e532e1bd58 + e2b74c1a0fdae19a76b63f21ee8483a7849231cb https://github.com/dotnet/sdk 7def7a9c5adc9e4d52a4cf19eee2c3998e3f3b93 - + https://github.com/dotnet/cli - b872b3fe70a4d596be9d646a7d8c780b27d4e5b6 + 5a44f16c79b1d4f5bf0fb2500454347acdaa38aa diff --git a/eng/Versions.props b/eng/Versions.props index 560d8961b..d5b38508a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19504.4 + 3.1.100-preview1.19504.7 @@ -45,7 +45,7 @@ - 3.1.100-preview1.19504.2 + 3.1.100-preview1.19504.3 0.2.0 From b791284d1eca6ad125690660bb96d73b17e581de Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 4 Oct 2019 16:43:43 +0000 Subject: [PATCH 363/420] [release/3.1.1xx] Update dependencies from dotnet/core-setup (#5102) * Update dependencies from https://github.com/dotnet/core-setup build 20191003.14 - Microsoft.NETCore.App.Ref - 3.1.0-preview1.19503.14 - Microsoft.NETCore.App - 3.1.0-preview1.19503.14 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0-preview1.19503.14 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19503.14 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview1.19503.14 - Microsoft.NETCore.DotNetAppHost - 3.1.0-preview1.19503.14 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview1.19503.14 * Update dependencies from https://github.com/dotnet/core-setup build 20191004.2 - Microsoft.NETCore.App.Ref - 3.1.0-preview1.19504.2 - Microsoft.NETCore.App - 3.1.0-preview1.19504.2 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0-preview1.19504.2 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19504.2 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview1.19504.2 - Microsoft.NETCore.DotNetAppHost - 3.1.0-preview1.19504.2 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview1.19504.2 Dependency coherency updates - Microsoft.NETCore.Platforms - 3.1.0-preview1.19504.1 (parent: Microsoft.NetCore.App) --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 14 +++++++------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c72a18d24..fc6cbfaaf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,33 +2,33 @@ - + https://github.com/dotnet/core-setup - 0b3fcd7a02fd29017f01f01a36ea562c5fda1eec + 50de4c0d1f33599adc6d71ae6d5b8783140c0b83 - + https://github.com/dotnet/core-setup - 0b3fcd7a02fd29017f01f01a36ea562c5fda1eec + 50de4c0d1f33599adc6d71ae6d5b8783140c0b83 - + https://github.com/dotnet/core-setup - 0b3fcd7a02fd29017f01f01a36ea562c5fda1eec + 50de4c0d1f33599adc6d71ae6d5b8783140c0b83 - + https://github.com/dotnet/core-setup - 0b3fcd7a02fd29017f01f01a36ea562c5fda1eec + 50de4c0d1f33599adc6d71ae6d5b8783140c0b83 - + https://github.com/dotnet/core-setup - 0b3fcd7a02fd29017f01f01a36ea562c5fda1eec + 50de4c0d1f33599adc6d71ae6d5b8783140c0b83 - + https://github.com/dotnet/core-setup - 0b3fcd7a02fd29017f01f01a36ea562c5fda1eec + 50de4c0d1f33599adc6d71ae6d5b8783140c0b83 - + https://github.com/dotnet/core-setup - 0b3fcd7a02fd29017f01f01a36ea562c5fda1eec + 50de4c0d1f33599adc6d71ae6d5b8783140c0b83 @@ -36,9 +36,9 @@ 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/corefx - e61772dfb9cfc9b08d95950814ebe51f22cd2de6 + ba3d206594ca389b309d826604b28410f05f19e7 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index d5b38508a..91bee8ec7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,22 +56,22 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview1.19501.24 - 3.1.0-preview1.19501.24 + 3.1.0-preview1.19504.2 + 3.1.0-preview1.19504.2 $(MicrosoftNETCoreAppPackageVersion) - 3.1.0-preview1.19501.24 - 3.1.0-preview1.19501.24 + 3.1.0-preview1.19504.2 + 3.1.0-preview1.19504.2 $(MicrosoftNETCoreDotNetHostResolverPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) - 3.1.0-preview1.19501.24 + 3.1.0-preview1.19504.2 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) 2.1.0 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview1.19501.24 - 3.1.0-preview1.19501.24 + 3.1.0-preview1.19504.2 + 3.1.0-preview1.19504.2 $(MicrosoftWindowsDesktopAppPackageVersion) From 6c136d644fcd27710c4e99a84b3cf418901cf4e2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 4 Oct 2019 12:56:39 -0700 Subject: [PATCH 364/420] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5108) * Update dependencies from https://github.com/dotnet/toolset build 20191004.8 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19504.8 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19504.5 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191004.9 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19504.9 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19504.4 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191004.10 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19504.10 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19504.4 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191004.12 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19504.12 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19504.4 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191004.13 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19504.13 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview1.19504.2 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19504.4 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fc6cbfaaf..69d8325b8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,17 +72,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - e2b74c1a0fdae19a76b63f21ee8483a7849231cb + fe22c3a615bc55f84d32928f4d45575e0e10550a - + https://github.com/dotnet/sdk - 7def7a9c5adc9e4d52a4cf19eee2c3998e3f3b93 + 484317f665ca9fd05897f864639d639e7238cbbd - + https://github.com/dotnet/cli - 5a44f16c79b1d4f5bf0fb2500454347acdaa38aa + e637600604a575387798a42c9615f9d021d0f415 diff --git a/eng/Versions.props b/eng/Versions.props index 91bee8ec7..d86513e00 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19504.7 + 3.1.100-preview1.19504.13 @@ -45,14 +45,14 @@ - 3.1.100-preview1.19504.3 + 3.1.100-preview1.19504.4 0.2.0 - 3.1.100-preview1.19504.1 + 3.1.100-preview1.19504.2 $(MicrosoftNETSdkPackageVersion) From 57f4c6d7e7dbb01cd07f0b0ffb700882b22b72ad Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 4 Oct 2019 14:10:07 -0700 Subject: [PATCH 365/420] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5110) * Update dependencies from https://github.com/dotnet/toolset build 20191004.14 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19504.14 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19504.6 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191004.15 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19504.15 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19504.6 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 69d8325b8..62e49b57d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,17 +72,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - fe22c3a615bc55f84d32928f4d45575e0e10550a + c6b00f4721e23c3e5769dbb5e69d44504f1bd9bc https://github.com/dotnet/sdk 484317f665ca9fd05897f864639d639e7238cbbd - + https://github.com/dotnet/cli - e637600604a575387798a42c9615f9d021d0f415 + 83d51c4fe49d716729f38178b4e20f2a95f03c78 diff --git a/eng/Versions.props b/eng/Versions.props index d86513e00..9cf969ec9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19504.13 + 3.1.100-preview1.19504.15 @@ -45,7 +45,7 @@ - 3.1.100-preview1.19504.4 + 3.1.100-preview1.19504.6 0.2.0 From 1e8f10a4ef3e81c00b35f30ea7ea08a6ab69bb5e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 5 Oct 2019 02:35:42 +0000 Subject: [PATCH 366/420] Update dependencies from https://github.com/dotnet/core-setup build 20191004.13 (#5113) - Microsoft.NETCore.App.Ref - 3.1.0-preview1.19504.13 - Microsoft.NETCore.App - 3.1.0-preview1.19504.13 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0-preview1.19504.13 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19504.13 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview1.19504.13 - Microsoft.NETCore.DotNetAppHost - 3.1.0-preview1.19504.13 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview1.19504.13 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 62e49b57d..042f05133 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,33 +2,33 @@ - + https://github.com/dotnet/core-setup - 50de4c0d1f33599adc6d71ae6d5b8783140c0b83 + fd1162d3db7db9c79bf01d32604862f4bee25b96 - + https://github.com/dotnet/core-setup - 50de4c0d1f33599adc6d71ae6d5b8783140c0b83 + fd1162d3db7db9c79bf01d32604862f4bee25b96 - + https://github.com/dotnet/core-setup - 50de4c0d1f33599adc6d71ae6d5b8783140c0b83 + fd1162d3db7db9c79bf01d32604862f4bee25b96 - + https://github.com/dotnet/core-setup - 50de4c0d1f33599adc6d71ae6d5b8783140c0b83 + fd1162d3db7db9c79bf01d32604862f4bee25b96 - + https://github.com/dotnet/core-setup - 50de4c0d1f33599adc6d71ae6d5b8783140c0b83 + fd1162d3db7db9c79bf01d32604862f4bee25b96 - + https://github.com/dotnet/core-setup - 50de4c0d1f33599adc6d71ae6d5b8783140c0b83 + fd1162d3db7db9c79bf01d32604862f4bee25b96 - + https://github.com/dotnet/core-setup - 50de4c0d1f33599adc6d71ae6d5b8783140c0b83 + fd1162d3db7db9c79bf01d32604862f4bee25b96 diff --git a/eng/Versions.props b/eng/Versions.props index 9cf969ec9..394995588 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,22 +56,22 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview1.19504.2 - 3.1.0-preview1.19504.2 + 3.1.0-preview1.19504.13 + 3.1.0-preview1.19504.13 $(MicrosoftNETCoreAppPackageVersion) - 3.1.0-preview1.19504.2 - 3.1.0-preview1.19504.2 + 3.1.0-preview1.19504.13 + 3.1.0-preview1.19504.13 $(MicrosoftNETCoreDotNetHostResolverPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) - 3.1.0-preview1.19504.2 + 3.1.0-preview1.19504.13 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) 2.1.0 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview1.19504.2 - 3.1.0-preview1.19504.2 + 3.1.0-preview1.19504.13 + 3.1.0-preview1.19504.13 $(MicrosoftWindowsDesktopAppPackageVersion) From 6afd7e3c65adb4730b317add3feac933fb65617e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 5 Oct 2019 05:40:39 +0000 Subject: [PATCH 367/420] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5115) * Update dependencies from https://github.com/dotnet/toolset build 20191004.30 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19504.30 * Update dependencies from https://github.com/dotnet/toolset build 20191004.31 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19504.31 * Update dependencies from https://github.com/dotnet/toolset build 20191004.33 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19504.33 * Update dependencies from https://github.com/dotnet/toolset build 20191004.34 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19504.34 * Update dependencies from https://github.com/dotnet/toolset build 20191004.35 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19504.35 * Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19504.22 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 042f05133..d4687028a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,17 +72,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - c6b00f4721e23c3e5769dbb5e69d44504f1bd9bc + fff7792b9db12c0d4a1569686ea60590e5be02ac https://github.com/dotnet/sdk 484317f665ca9fd05897f864639d639e7238cbbd - + https://github.com/dotnet/cli - 83d51c4fe49d716729f38178b4e20f2a95f03c78 + ab9f11b98ce8e64d3ec63768dc5b8f1b33c8189e diff --git a/eng/Versions.props b/eng/Versions.props index 394995588..2963bbcac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19504.15 + 3.1.100-preview1.19504.35 @@ -45,7 +45,7 @@ - 3.1.100-preview1.19504.6 + 3.1.100-preview1.19504.22 0.2.0 From 9088d6cf48eff9e01be5f9fec44345fc740c013a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 5 Oct 2019 05:41:41 +0000 Subject: [PATCH 368/420] Update dependencies from https://github.com/aspnet/AspNetCore build 20191004.2 (#5116) - dotnet-user-secrets - 3.1.0-preview1.19504.2 - dotnet-watch - 3.1.0-preview1.19504.2 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19504.2 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19504.2 - dotnet-dev-certs - 3.1.0-preview1.19504.2 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19504.2 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d4687028a..0582337ac 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -40,29 +40,29 @@ https://github.com/dotnet/corefx ba3d206594ca389b309d826604b28410f05f19e7 - + https://github.com/aspnet/AspNetCore - a7b739bab3b1d310eeec6aef551ce39650bdcf24 + a92f8ffa177a5f4d1189f211049f094fe09e76c5 - + https://github.com/aspnet/AspNetCore - a7b739bab3b1d310eeec6aef551ce39650bdcf24 + a92f8ffa177a5f4d1189f211049f094fe09e76c5 - + https://github.com/aspnet/AspNetCore - a7b739bab3b1d310eeec6aef551ce39650bdcf24 + a92f8ffa177a5f4d1189f211049f094fe09e76c5 - + https://github.com/aspnet/AspNetCore - a7b739bab3b1d310eeec6aef551ce39650bdcf24 + a92f8ffa177a5f4d1189f211049f094fe09e76c5 - + https://github.com/aspnet/AspNetCore - a7b739bab3b1d310eeec6aef551ce39650bdcf24 + a92f8ffa177a5f4d1189f211049f094fe09e76c5 - + https://github.com/aspnet/AspNetCore - a7b739bab3b1d310eeec6aef551ce39650bdcf24 + a92f8ffa177a5f4d1189f211049f094fe09e76c5 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 2963bbcac..6965c6027 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,12 +36,12 @@ - 3.1.0-preview1.19503.31 - 3.1.0-preview1.19503.31 - 3.1.0-preview1.19503.31 - 3.1.0-preview1.19503.31 - 3.1.0-preview1.19503.31 - 3.1.0-preview1.19503.31 + 3.1.0-preview1.19504.2 + 3.1.0-preview1.19504.2 + 3.1.0-preview1.19504.2 + 3.1.0-preview1.19504.2 + 3.1.0-preview1.19504.2 + 3.1.0-preview1.19504.2 From cb63b499dbb6e814fa0ed34274eaf8448437c7c6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 5 Oct 2019 05:46:10 +0000 Subject: [PATCH 369/420] Update dependencies from https://github.com/dotnet/core-setup build 20191004.15 (#5118) - Microsoft.NETCore.App.Ref - 3.1.0-preview1.19504.15 - Microsoft.NETCore.App - 3.1.0-preview1.19504.15 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0-preview1.19504.15 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19504.15 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview1.19504.15 - Microsoft.NETCore.DotNetAppHost - 3.1.0-preview1.19504.15 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview1.19504.15 Dependency coherency updates - Microsoft.NETCore.Platforms - 3.1.0-preview1.19504.6 (parent: Microsoft.NetCore.App) --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 14 +++++++------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0582337ac..66bfcd15a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,33 +2,33 @@ - + https://github.com/dotnet/core-setup - fd1162d3db7db9c79bf01d32604862f4bee25b96 + ea8a25eb0679dc4d940623688189885086286adc - + https://github.com/dotnet/core-setup - fd1162d3db7db9c79bf01d32604862f4bee25b96 + ea8a25eb0679dc4d940623688189885086286adc - + https://github.com/dotnet/core-setup - fd1162d3db7db9c79bf01d32604862f4bee25b96 + ea8a25eb0679dc4d940623688189885086286adc - + https://github.com/dotnet/core-setup - fd1162d3db7db9c79bf01d32604862f4bee25b96 + ea8a25eb0679dc4d940623688189885086286adc - + https://github.com/dotnet/core-setup - fd1162d3db7db9c79bf01d32604862f4bee25b96 + ea8a25eb0679dc4d940623688189885086286adc - + https://github.com/dotnet/core-setup - fd1162d3db7db9c79bf01d32604862f4bee25b96 + ea8a25eb0679dc4d940623688189885086286adc - + https://github.com/dotnet/core-setup - fd1162d3db7db9c79bf01d32604862f4bee25b96 + ea8a25eb0679dc4d940623688189885086286adc @@ -36,9 +36,9 @@ 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/corefx - ba3d206594ca389b309d826604b28410f05f19e7 + f969dd277b3288d0ee07d10dacc5dc3613030674 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 6965c6027..c1298ce05 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,22 +56,22 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview1.19504.13 - 3.1.0-preview1.19504.13 + 3.1.0-preview1.19504.15 + 3.1.0-preview1.19504.15 $(MicrosoftNETCoreAppPackageVersion) - 3.1.0-preview1.19504.13 - 3.1.0-preview1.19504.13 + 3.1.0-preview1.19504.15 + 3.1.0-preview1.19504.15 $(MicrosoftNETCoreDotNetHostResolverPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) - 3.1.0-preview1.19504.13 + 3.1.0-preview1.19504.15 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) 2.1.0 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview1.19504.13 - 3.1.0-preview1.19504.13 + 3.1.0-preview1.19504.15 + 3.1.0-preview1.19504.15 $(MicrosoftWindowsDesktopAppPackageVersion) From e8d00d2c43f654efb9e1d8159b9b0e054133a95c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 5 Oct 2019 01:03:14 -0700 Subject: [PATCH 370/420] Update dependencies from https://github.com/dotnet/core-setup build 20191004.18 (#5121) - Microsoft.NETCore.App.Ref - 3.1.0-preview1.19504.18 - Microsoft.NETCore.App - 3.1.0-preview1.19504.18 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0-preview1.19504.18 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19504.18 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview1.19504.18 - Microsoft.NETCore.DotNetAppHost - 3.1.0-preview1.19504.18 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview1.19504.18 Dependency coherency updates - Microsoft.NETCore.Platforms - 3.1.0-preview1.19504.8 (parent: Microsoft.NetCore.App) --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 14 +++++++------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 66bfcd15a..0466c8368 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,33 +2,33 @@ - + https://github.com/dotnet/core-setup - ea8a25eb0679dc4d940623688189885086286adc + 27610507ac04a478c225054699afb20e86cc7881 - + https://github.com/dotnet/core-setup - ea8a25eb0679dc4d940623688189885086286adc + 27610507ac04a478c225054699afb20e86cc7881 - + https://github.com/dotnet/core-setup - ea8a25eb0679dc4d940623688189885086286adc + 27610507ac04a478c225054699afb20e86cc7881 - + https://github.com/dotnet/core-setup - ea8a25eb0679dc4d940623688189885086286adc + 27610507ac04a478c225054699afb20e86cc7881 - + https://github.com/dotnet/core-setup - ea8a25eb0679dc4d940623688189885086286adc + 27610507ac04a478c225054699afb20e86cc7881 - + https://github.com/dotnet/core-setup - ea8a25eb0679dc4d940623688189885086286adc + 27610507ac04a478c225054699afb20e86cc7881 - + https://github.com/dotnet/core-setup - ea8a25eb0679dc4d940623688189885086286adc + 27610507ac04a478c225054699afb20e86cc7881 @@ -36,9 +36,9 @@ 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/corefx - f969dd277b3288d0ee07d10dacc5dc3613030674 + f4137889514bef5b9149e25d6edbaeb66f8beba6 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index c1298ce05..9fb788f78 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,22 +56,22 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview1.19504.15 - 3.1.0-preview1.19504.15 + 3.1.0-preview1.19504.18 + 3.1.0-preview1.19504.18 $(MicrosoftNETCoreAppPackageVersion) - 3.1.0-preview1.19504.15 - 3.1.0-preview1.19504.15 + 3.1.0-preview1.19504.18 + 3.1.0-preview1.19504.18 $(MicrosoftNETCoreDotNetHostResolverPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) - 3.1.0-preview1.19504.15 + 3.1.0-preview1.19504.18 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) 2.1.0 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview1.19504.15 - 3.1.0-preview1.19504.15 + 3.1.0-preview1.19504.18 + 3.1.0-preview1.19504.18 $(MicrosoftWindowsDesktopAppPackageVersion) From 215b42fe3cad0cea9f81b780c449e7e8a39eb6fe Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 5 Oct 2019 09:15:40 +0000 Subject: [PATCH 371/420] Update dependencies from https://github.com/dotnet/core-setup build 20191004.20 (#5122) - Microsoft.NETCore.App.Ref - 3.1.0-preview1.19504.20 - Microsoft.NETCore.App - 3.1.0-preview1.19504.20 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0-preview1.19504.20 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19504.20 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview1.19504.20 - Microsoft.NETCore.DotNetAppHost - 3.1.0-preview1.19504.20 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview1.19504.20 Dependency coherency updates - Microsoft.NETCore.Platforms - 3.1.0-preview1.19504.10 (parent: Microsoft.NetCore.App) --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 14 +++++++------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0466c8368..405ed55af 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,33 +2,33 @@ - + https://github.com/dotnet/core-setup - 27610507ac04a478c225054699afb20e86cc7881 + 45f675b1acc38eaea182bf6ef284d1b13141d134 - + https://github.com/dotnet/core-setup - 27610507ac04a478c225054699afb20e86cc7881 + 45f675b1acc38eaea182bf6ef284d1b13141d134 - + https://github.com/dotnet/core-setup - 27610507ac04a478c225054699afb20e86cc7881 + 45f675b1acc38eaea182bf6ef284d1b13141d134 - + https://github.com/dotnet/core-setup - 27610507ac04a478c225054699afb20e86cc7881 + 45f675b1acc38eaea182bf6ef284d1b13141d134 - + https://github.com/dotnet/core-setup - 27610507ac04a478c225054699afb20e86cc7881 + 45f675b1acc38eaea182bf6ef284d1b13141d134 - + https://github.com/dotnet/core-setup - 27610507ac04a478c225054699afb20e86cc7881 + 45f675b1acc38eaea182bf6ef284d1b13141d134 - + https://github.com/dotnet/core-setup - 27610507ac04a478c225054699afb20e86cc7881 + 45f675b1acc38eaea182bf6ef284d1b13141d134 @@ -36,9 +36,9 @@ 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/corefx - f4137889514bef5b9149e25d6edbaeb66f8beba6 + 0498dfedf8dbbd088c74399f45bc0b0c861c831a https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 9fb788f78..141f7383f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,22 +56,22 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview1.19504.18 - 3.1.0-preview1.19504.18 + 3.1.0-preview1.19504.20 + 3.1.0-preview1.19504.20 $(MicrosoftNETCoreAppPackageVersion) - 3.1.0-preview1.19504.18 - 3.1.0-preview1.19504.18 + 3.1.0-preview1.19504.20 + 3.1.0-preview1.19504.20 $(MicrosoftNETCoreDotNetHostResolverPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) - 3.1.0-preview1.19504.18 + 3.1.0-preview1.19504.20 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) 2.1.0 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview1.19504.18 - 3.1.0-preview1.19504.18 + 3.1.0-preview1.19504.20 + 3.1.0-preview1.19504.20 $(MicrosoftWindowsDesktopAppPackageVersion) From 4d0cbd16b44d4a6c8ac823d6063d98b0e00e3e5f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 5 Oct 2019 10:10:04 +0000 Subject: [PATCH 372/420] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5120) * Update dependencies from https://github.com/dotnet/toolset build 20191004.36 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19504.36 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview1.19504.8 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191004.37 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19504.37 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview1.19504.8 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19504.23 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191004.38 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19504.38 * Update dependencies from https://github.com/dotnet/toolset build 20191004.39 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19504.39 * Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview1.19504.8 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19504.25 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191005.1 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19505.1 * Update dependencies from https://github.com/dotnet/toolset build 20191005.2 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19505.2 * Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview1.19504.9 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19504.25 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191005.3 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19505.3 * Update dependencies from https://github.com/dotnet/toolset build 20191005.4 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19505.4 * Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview1.19504.9 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19505.1 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 405ed55af..281bfabda 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,17 +72,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - fff7792b9db12c0d4a1569686ea60590e5be02ac + 05f51e8bc09a746c1a41453fb0f65c01fe4865dc - + https://github.com/dotnet/sdk - 484317f665ca9fd05897f864639d639e7238cbbd + cd1c25c76c39d54a5e9040cc4ed193b39f9a161e - + https://github.com/dotnet/cli - ab9f11b98ce8e64d3ec63768dc5b8f1b33c8189e + 2f59a87ad793f59231d22bffd0d2bc408aa104e8 diff --git a/eng/Versions.props b/eng/Versions.props index 141f7383f..d72759c20 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19504.35 + 3.1.100-preview1.19505.4 @@ -45,14 +45,14 @@ - 3.1.100-preview1.19504.22 + 3.1.100-preview1.19505.1 0.2.0 - 3.1.100-preview1.19504.2 + 3.1.100-preview1.19504.9 $(MicrosoftNETSdkPackageVersion) From 8dbb885ea43eb6ecf9f9ed2fa64a9dd506c38fb7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 5 Oct 2019 05:18:19 -0700 Subject: [PATCH 373/420] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5123) * Update dependencies from https://github.com/dotnet/toolset build 20191005.7 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19505.7 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19505.3 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191005.5 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19505.5 * Update dependencies from https://github.com/dotnet/toolset build 20191005.6 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19505.6 * Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19505.2 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 281bfabda..209337e5a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,17 +72,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 05f51e8bc09a746c1a41453fb0f65c01fe4865dc + 532bc93c64a433f242b1ece66e27b78399c2ad3c https://github.com/dotnet/sdk cd1c25c76c39d54a5e9040cc4ed193b39f9a161e - + https://github.com/dotnet/cli - 2f59a87ad793f59231d22bffd0d2bc408aa104e8 + d254e3023b11bba8779fa598bd4fbf93b5a0bbf3 diff --git a/eng/Versions.props b/eng/Versions.props index d72759c20..2bbdc3dee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19505.4 + 3.1.100-preview1.19505.6 @@ -45,7 +45,7 @@ - 3.1.100-preview1.19505.1 + 3.1.100-preview1.19505.2 0.2.0 From 924834c23755f97400c4dbc7ce3aadadf367e43b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 5 Oct 2019 13:20:38 +0000 Subject: [PATCH 374/420] Update dependencies from https://github.com/dotnet/toolset build 20191005.10 (#5124) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19505.10 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19505.3 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 209337e5a..eea75a3a0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,17 +72,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 532bc93c64a433f242b1ece66e27b78399c2ad3c + 3c548403b5797ea873f96927ac6a626d5a679c82 https://github.com/dotnet/sdk cd1c25c76c39d54a5e9040cc4ed193b39f9a161e - + https://github.com/dotnet/cli - d254e3023b11bba8779fa598bd4fbf93b5a0bbf3 + 1a37c7939ac0f0bfc6c3dde5d570dabf8a6befa1 diff --git a/eng/Versions.props b/eng/Versions.props index 2bbdc3dee..1ad0c7696 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19505.6 + 3.1.100-preview1.19505.10 @@ -45,7 +45,7 @@ - 3.1.100-preview1.19505.2 + 3.1.100-preview1.19505.3 0.2.0 From 7eafa6014815a365ae6fe5669d27b8ed39e2a375 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 5 Oct 2019 17:31:27 +0000 Subject: [PATCH 375/420] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5125) * Update dependencies from https://github.com/dotnet/toolset build 20191005.11 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19505.11 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview1.19505.1 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191005.12 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19505.12 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview1.19505.1 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19505.4 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index eea75a3a0..1590831de 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,17 +72,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 3c548403b5797ea873f96927ac6a626d5a679c82 + e29153307876bfd9d358cef5c11a7ea35f4ce381 - + https://github.com/dotnet/sdk - cd1c25c76c39d54a5e9040cc4ed193b39f9a161e + fc2c6f61b9bae9eb07e80ca11f9d12e20aa02bd3 - + https://github.com/dotnet/cli - 1a37c7939ac0f0bfc6c3dde5d570dabf8a6befa1 + e8db8f5a58c9a4d41a0923447fd6a9a9a68a2db8 diff --git a/eng/Versions.props b/eng/Versions.props index 1ad0c7696..a21ccac58 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19505.10 + 3.1.100-preview1.19505.12 @@ -45,14 +45,14 @@ - 3.1.100-preview1.19505.3 + 3.1.100-preview1.19505.4 0.2.0 - 3.1.100-preview1.19504.9 + 3.1.100-preview1.19505.1 $(MicrosoftNETSdkPackageVersion) From bc140029e3d150e4f6e3e758aeccca2a0d15dfc9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 5 Oct 2019 18:56:05 +0000 Subject: [PATCH 376/420] Update dependencies from https://github.com/aspnet/AspNetCore build 20191005.1 (#5128) - dotnet-user-secrets - 3.1.0-preview1.19505.1 - dotnet-watch - 3.1.0-preview1.19505.1 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19505.1 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19505.1 - dotnet-dev-certs - 3.1.0-preview1.19505.1 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19505.1 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1590831de..81830eea8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -40,29 +40,29 @@ https://github.com/dotnet/corefx 0498dfedf8dbbd088c74399f45bc0b0c861c831a - + https://github.com/aspnet/AspNetCore - a92f8ffa177a5f4d1189f211049f094fe09e76c5 + 3c62e9e751be0f27eff5e686d2e41e0ad41277c9 - + https://github.com/aspnet/AspNetCore - a92f8ffa177a5f4d1189f211049f094fe09e76c5 + 3c62e9e751be0f27eff5e686d2e41e0ad41277c9 - + https://github.com/aspnet/AspNetCore - a92f8ffa177a5f4d1189f211049f094fe09e76c5 + 3c62e9e751be0f27eff5e686d2e41e0ad41277c9 - + https://github.com/aspnet/AspNetCore - a92f8ffa177a5f4d1189f211049f094fe09e76c5 + 3c62e9e751be0f27eff5e686d2e41e0ad41277c9 - + https://github.com/aspnet/AspNetCore - a92f8ffa177a5f4d1189f211049f094fe09e76c5 + 3c62e9e751be0f27eff5e686d2e41e0ad41277c9 - + https://github.com/aspnet/AspNetCore - a92f8ffa177a5f4d1189f211049f094fe09e76c5 + 3c62e9e751be0f27eff5e686d2e41e0ad41277c9 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index a21ccac58..5f0bfc82f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,12 +36,12 @@ - 3.1.0-preview1.19504.2 - 3.1.0-preview1.19504.2 - 3.1.0-preview1.19504.2 - 3.1.0-preview1.19504.2 - 3.1.0-preview1.19504.2 - 3.1.0-preview1.19504.2 + 3.1.0-preview1.19505.1 + 3.1.0-preview1.19505.1 + 3.1.0-preview1.19505.1 + 3.1.0-preview1.19505.1 + 3.1.0-preview1.19505.1 + 3.1.0-preview1.19505.1 From ec10e1bd08256da9ec31425e3634fff9b75e33ef Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 5 Oct 2019 12:28:50 -0700 Subject: [PATCH 377/420] Update dependencies from https://github.com/dotnet/toolset build 20191005.14 (#5130) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19505.14 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 81830eea8..b1c2dee4c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - e29153307876bfd9d358cef5c11a7ea35f4ce381 + 0c9f38c9a14314c49e38f943c15b02a6592647cb https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 5f0bfc82f..100247ca0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19505.12 + 3.1.100-preview1.19505.14 From 51aea17b737983b26df1bad2d337557e471e87bd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 5 Oct 2019 14:04:41 -0700 Subject: [PATCH 378/420] Update dependencies from https://github.com/dotnet/toolset build 20191005.16 (#5133) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19505.16 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19505.6 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b1c2dee4c..5d3ce0cc4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,17 +72,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 0c9f38c9a14314c49e38f943c15b02a6592647cb + b2c4aeafa737cf6382c60181f206183a335e625d https://github.com/dotnet/sdk fc2c6f61b9bae9eb07e80ca11f9d12e20aa02bd3 - + https://github.com/dotnet/cli - e8db8f5a58c9a4d41a0923447fd6a9a9a68a2db8 + a1c6d9063dc47bff109253e906660c47dcfc5bcc diff --git a/eng/Versions.props b/eng/Versions.props index 100247ca0..0ed8bd3d9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19505.14 + 3.1.100-preview1.19505.16 @@ -45,7 +45,7 @@ - 3.1.100-preview1.19505.4 + 3.1.100-preview1.19505.6 0.2.0 From 2b6c4266560acb7a389569710eb6db5e569db5b5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 5 Oct 2019 19:04:53 -0700 Subject: [PATCH 379/420] Update dependencies from https://github.com/dotnet/core-setup build 20191005.4 (#5135) - Microsoft.NETCore.App.Ref - 3.1.0-preview1.19505.4 - Microsoft.NETCore.App - 3.1.0-preview1.19505.4 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0-preview1.19505.4 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19505.4 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview1.19505.4 - Microsoft.NETCore.DotNetAppHost - 3.1.0-preview1.19505.4 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview1.19505.4 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.1-preview1.19504.1 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.0-preview1.19505.1 (parent: Microsoft.WindowsDesktop.App) --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 18 +++++++++--------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5d3ce0cc4..59f1d1b69 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,33 +2,33 @@ - + https://github.com/dotnet/core-setup - 45f675b1acc38eaea182bf6ef284d1b13141d134 + f046fe0e33340def6bf72f939126012f740ea5b5 - + https://github.com/dotnet/core-setup - 45f675b1acc38eaea182bf6ef284d1b13141d134 + f046fe0e33340def6bf72f939126012f740ea5b5 - + https://github.com/dotnet/core-setup - 45f675b1acc38eaea182bf6ef284d1b13141d134 + f046fe0e33340def6bf72f939126012f740ea5b5 - + https://github.com/dotnet/core-setup - 45f675b1acc38eaea182bf6ef284d1b13141d134 + f046fe0e33340def6bf72f939126012f740ea5b5 - + https://github.com/dotnet/core-setup - 45f675b1acc38eaea182bf6ef284d1b13141d134 + f046fe0e33340def6bf72f939126012f740ea5b5 - + https://github.com/dotnet/core-setup - 45f675b1acc38eaea182bf6ef284d1b13141d134 + f046fe0e33340def6bf72f939126012f740ea5b5 - + https://github.com/dotnet/core-setup - 45f675b1acc38eaea182bf6ef284d1b13141d134 + f046fe0e33340def6bf72f939126012f740ea5b5 @@ -85,13 +85,13 @@ a1c6d9063dc47bff109253e906660c47dcfc5bcc - + https://github.com/dotnet/winforms - be3d33927476deb6e299c69cc68f0c54ed1b828c + 1934207dfd7aa570337791a67e4eeec4f6b82265 - + https://github.com/dotnet/wpf - 9a67316ef068c3f4a78a11916777b505b0bbacca + 17d637dbe1d67cadaf4b0a151bd2f6daa5ed97d1 diff --git a/eng/Versions.props b/eng/Versions.props index 0ed8bd3d9..095c7a157 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,11 +16,11 @@ - 4.8.1-preview1.19501.1 + 4.8.1-preview1.19504.1 - 3.1.0-preview1.19501.6 + 3.1.0-preview1.19505.1 @@ -56,22 +56,22 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview1.19504.20 - 3.1.0-preview1.19504.20 + 3.1.0-preview1.19505.4 + 3.1.0-preview1.19505.4 $(MicrosoftNETCoreAppPackageVersion) - 3.1.0-preview1.19504.20 - 3.1.0-preview1.19504.20 + 3.1.0-preview1.19505.4 + 3.1.0-preview1.19505.4 $(MicrosoftNETCoreDotNetHostResolverPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) - 3.1.0-preview1.19504.20 + 3.1.0-preview1.19505.4 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) 2.1.0 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview1.19504.20 - 3.1.0-preview1.19504.20 + 3.1.0-preview1.19505.4 + 3.1.0-preview1.19505.4 $(MicrosoftWindowsDesktopAppPackageVersion) From 772df19133ef12cd153c1d020595a732b49c17f0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 6 Oct 2019 02:30:37 +0000 Subject: [PATCH 380/420] Update dependencies from https://github.com/dotnet/toolset build 20191005.18 (#5136) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19505.18 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 59f1d1b69..5bc9a111d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - b2c4aeafa737cf6382c60181f206183a335e625d + 74eb66e562b95097c9bf3a1934aed947212e33cd https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 095c7a157..91e3db828 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19505.16 + 3.1.100-preview1.19505.18 From c5f566eed52b7d73a117470de85a998ccc9fb5cc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 6 Oct 2019 05:45:23 +0000 Subject: [PATCH 381/420] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5137) * Update dependencies from https://github.com/dotnet/toolset build 20191005.19 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19505.19 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19505.9 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191005.20 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19505.20 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview1.19505.2 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19505.9 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191005.21 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19505.21 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview1.19505.2 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19505.9 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191005.22 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19505.22 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview1.19505.2 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19505.10 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5bc9a111d..dd7507634 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,17 +72,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 74eb66e562b95097c9bf3a1934aed947212e33cd + e45016679b66c16db4078fac4f126c3845a7451f - + https://github.com/dotnet/sdk - fc2c6f61b9bae9eb07e80ca11f9d12e20aa02bd3 + c5caf9406ccecd70bf6ebfe3d8bbeb7452df1995 - + https://github.com/dotnet/cli - a1c6d9063dc47bff109253e906660c47dcfc5bcc + 035d1100f8aa6e3d3013e4de33d685ec3fa53d7c diff --git a/eng/Versions.props b/eng/Versions.props index 91e3db828..7b0b358ac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19505.18 + 3.1.100-preview1.19505.22 @@ -45,14 +45,14 @@ - 3.1.100-preview1.19505.6 + 3.1.100-preview1.19505.10 0.2.0 - 3.1.100-preview1.19505.1 + 3.1.100-preview1.19505.2 $(MicrosoftNETSdkPackageVersion) From 7d3605a721ca7a98f416498f31f731acec9d1468 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 6 Oct 2019 08:16:46 +0000 Subject: [PATCH 382/420] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5140) * Update dependencies from https://github.com/dotnet/toolset build 20191005.23 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19505.23 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19505.11 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191005.24 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19505.24 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19505.11 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191006.1 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19506.1 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview1.19505.3 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19505.11 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dd7507634..1d952ae27 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,17 +72,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - e45016679b66c16db4078fac4f126c3845a7451f + 7e4493ed6bbf26ce0ddb4a7dc0c26fe45f3ed610 - + https://github.com/dotnet/sdk - c5caf9406ccecd70bf6ebfe3d8bbeb7452df1995 + c3d91f04768a270fb742169e2db08664226f2c22 - + https://github.com/dotnet/cli - 035d1100f8aa6e3d3013e4de33d685ec3fa53d7c + e0371fb5ff31ad88d27ab7df3c2c7fd16d9aae17 diff --git a/eng/Versions.props b/eng/Versions.props index 7b0b358ac..46568864c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19505.22 + 3.1.100-preview1.19506.1 @@ -45,14 +45,14 @@ - 3.1.100-preview1.19505.10 + 3.1.100-preview1.19505.11 0.2.0 - 3.1.100-preview1.19505.2 + 3.1.100-preview1.19505.3 $(MicrosoftNETSdkPackageVersion) From 257643fd28b7930d65c4400a54cd81156bd586f4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 6 Oct 2019 15:07:46 +0000 Subject: [PATCH 383/420] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5142) * Update dependencies from https://github.com/dotnet/toolset build 20191006.2 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19506.2 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19506.1 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191006.5 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19506.5 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19506.1 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191006.6 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19506.6 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19506.2 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1d952ae27..e463cc1cf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,17 +72,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 7e4493ed6bbf26ce0ddb4a7dc0c26fe45f3ed610 + e9ce440a1cb586d9e9fa7012dbb60088037dd0e2 https://github.com/dotnet/sdk c3d91f04768a270fb742169e2db08664226f2c22 - + https://github.com/dotnet/cli - e0371fb5ff31ad88d27ab7df3c2c7fd16d9aae17 + 81e415540553d36bdeffdbb6981c58dde92dbbf5 diff --git a/eng/Versions.props b/eng/Versions.props index 46568864c..e5a32f650 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19506.1 + 3.1.100-preview1.19506.6 @@ -45,7 +45,7 @@ - 3.1.100-preview1.19505.11 + 3.1.100-preview1.19506.2 0.2.0 From 091383899c47666ae6211d7d6b3d3b53806c4f69 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 6 Oct 2019 09:29:46 -0700 Subject: [PATCH 384/420] [release/3.1.1xx] Update dependencies from dotnet/core-setup (#5138) * Update dependencies from https://github.com/dotnet/core-setup build 20191005.5 - Microsoft.NETCore.App.Ref - 3.1.0-preview1.19505.5 - Microsoft.NETCore.App - 3.1.0-preview1.19505.5 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0-preview1.19505.5 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19505.5 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview1.19505.5 - Microsoft.NETCore.DotNetAppHost - 3.1.0-preview1.19505.5 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview1.19505.5 Dependency coherency updates - Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.0-preview1.19505.2 (parent: Microsoft.WindowsDesktop.App) * Update dependencies from https://github.com/dotnet/core-setup build 20191006.1 - Microsoft.NETCore.App.Ref - 3.1.0-preview1.19506.1 - Microsoft.NETCore.App - 3.1.0-preview1.19506.1 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0-preview1.19506.1 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19506.1 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview1.19506.1 - Microsoft.NETCore.DotNetAppHost - 3.1.0-preview1.19506.1 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview1.19506.1 Dependency coherency updates - Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.0-preview1.19505.2 (parent: Microsoft.WindowsDesktop.App) --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e463cc1cf..80c4b570f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,33 +2,33 @@ - + https://github.com/dotnet/core-setup - f046fe0e33340def6bf72f939126012f740ea5b5 + bbf5542781136f9f3a1f30b010cb782e775d54c7 - + https://github.com/dotnet/core-setup - f046fe0e33340def6bf72f939126012f740ea5b5 + bbf5542781136f9f3a1f30b010cb782e775d54c7 - + https://github.com/dotnet/core-setup - f046fe0e33340def6bf72f939126012f740ea5b5 + bbf5542781136f9f3a1f30b010cb782e775d54c7 - + https://github.com/dotnet/core-setup - f046fe0e33340def6bf72f939126012f740ea5b5 + bbf5542781136f9f3a1f30b010cb782e775d54c7 - + https://github.com/dotnet/core-setup - f046fe0e33340def6bf72f939126012f740ea5b5 + bbf5542781136f9f3a1f30b010cb782e775d54c7 - + https://github.com/dotnet/core-setup - f046fe0e33340def6bf72f939126012f740ea5b5 + bbf5542781136f9f3a1f30b010cb782e775d54c7 - + https://github.com/dotnet/core-setup - f046fe0e33340def6bf72f939126012f740ea5b5 + bbf5542781136f9f3a1f30b010cb782e775d54c7 @@ -89,9 +89,9 @@ https://github.com/dotnet/winforms 1934207dfd7aa570337791a67e4eeec4f6b82265 - + https://github.com/dotnet/wpf - 17d637dbe1d67cadaf4b0a151bd2f6daa5ed97d1 + d7adcfe00706477704409105077aec4c6ac7eadb diff --git a/eng/Versions.props b/eng/Versions.props index e5a32f650..124a1dc83 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ - 3.1.0-preview1.19505.1 + 3.1.0-preview1.19505.2 @@ -56,22 +56,22 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview1.19505.4 - 3.1.0-preview1.19505.4 + 3.1.0-preview1.19506.1 + 3.1.0-preview1.19506.1 $(MicrosoftNETCoreAppPackageVersion) - 3.1.0-preview1.19505.4 - 3.1.0-preview1.19505.4 + 3.1.0-preview1.19506.1 + 3.1.0-preview1.19506.1 $(MicrosoftNETCoreDotNetHostResolverPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) - 3.1.0-preview1.19505.4 + 3.1.0-preview1.19506.1 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) 2.1.0 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview1.19505.4 - 3.1.0-preview1.19505.4 + 3.1.0-preview1.19506.1 + 3.1.0-preview1.19506.1 $(MicrosoftWindowsDesktopAppPackageVersion) From 9dcc06f2a149d39ccc8db7fd0606b15415174cf7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 6 Oct 2019 17:20:13 +0000 Subject: [PATCH 385/420] Update dependencies from https://github.com/dotnet/toolset build 20191006.7 (#5143) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19506.7 Dependency coherency updates - Microsoft.NET.Sdk - 3.1.100-preview1.19506.1 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 80c4b570f..d5b63778e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,13 +72,13 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - e9ce440a1cb586d9e9fa7012dbb60088037dd0e2 + f428d624c16fe2b91a0b744883f5628c5c53ce95 - + https://github.com/dotnet/sdk - c3d91f04768a270fb742169e2db08664226f2c22 + 357126710492d620198a60ee340ebeca9070f133 https://github.com/dotnet/cli diff --git a/eng/Versions.props b/eng/Versions.props index 124a1dc83..3f386db93 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19506.6 + 3.1.100-preview1.19506.7 @@ -52,7 +52,7 @@ - 3.1.100-preview1.19505.3 + 3.1.100-preview1.19506.1 $(MicrosoftNETSdkPackageVersion) From 3a518826f467e9e8c543e15d49b4f94a0aa1bad6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 6 Oct 2019 11:23:45 -0700 Subject: [PATCH 386/420] Update dependencies from https://github.com/dotnet/toolset build 20191006.8 (#5145) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19506.8 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19506.3 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d5b63778e..122b02a78 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,17 +72,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - f428d624c16fe2b91a0b744883f5628c5c53ce95 + b2d176e2ba905f0d6376ecf12cbcd104336992f0 https://github.com/dotnet/sdk 357126710492d620198a60ee340ebeca9070f133 - + https://github.com/dotnet/cli - 81e415540553d36bdeffdbb6981c58dde92dbbf5 + 67f32ea98b5e5c185b55fab26c8b1c4ddef469d6 diff --git a/eng/Versions.props b/eng/Versions.props index 3f386db93..e55cf7df2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19506.7 + 3.1.100-preview1.19506.8 @@ -45,7 +45,7 @@ - 3.1.100-preview1.19506.2 + 3.1.100-preview1.19506.3 0.2.0 From 0ae9787c4fc2108e9d3523770b38e8382375e297 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 6 Oct 2019 19:46:41 +0000 Subject: [PATCH 387/420] Update dependencies from https://github.com/dotnet/toolset build 20191006.10 (#5147) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19506.10 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 122b02a78..730523076 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - b2d176e2ba905f0d6376ecf12cbcd104336992f0 + 037006a38e88bbca07f32cf37e8d5d0091437ef4 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index e55cf7df2..c4fd1e08e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19506.8 + 3.1.100-preview1.19506.10 From 16c181b17c8d3a9aaff4efad9fdf72ae3ceb9b75 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 6 Oct 2019 20:31:07 +0000 Subject: [PATCH 388/420] Update dependencies from https://github.com/aspnet/AspNetCore build 20191006.1 (#5148) - dotnet-user-secrets - 3.1.0-preview1.19506.1 - dotnet-watch - 3.1.0-preview1.19506.1 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19506.1 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19506.1 - dotnet-dev-certs - 3.1.0-preview1.19506.1 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19506.1 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 730523076..afe8c906e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -40,29 +40,29 @@ https://github.com/dotnet/corefx 0498dfedf8dbbd088c74399f45bc0b0c861c831a - + https://github.com/aspnet/AspNetCore - 3c62e9e751be0f27eff5e686d2e41e0ad41277c9 + f1d22fdf7095bf5a9ed5bec469109ee65d0fd8ca - + https://github.com/aspnet/AspNetCore - 3c62e9e751be0f27eff5e686d2e41e0ad41277c9 + f1d22fdf7095bf5a9ed5bec469109ee65d0fd8ca - + https://github.com/aspnet/AspNetCore - 3c62e9e751be0f27eff5e686d2e41e0ad41277c9 + f1d22fdf7095bf5a9ed5bec469109ee65d0fd8ca - + https://github.com/aspnet/AspNetCore - 3c62e9e751be0f27eff5e686d2e41e0ad41277c9 + f1d22fdf7095bf5a9ed5bec469109ee65d0fd8ca - + https://github.com/aspnet/AspNetCore - 3c62e9e751be0f27eff5e686d2e41e0ad41277c9 + f1d22fdf7095bf5a9ed5bec469109ee65d0fd8ca - + https://github.com/aspnet/AspNetCore - 3c62e9e751be0f27eff5e686d2e41e0ad41277c9 + f1d22fdf7095bf5a9ed5bec469109ee65d0fd8ca https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index c4fd1e08e..591c1d49d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,12 +36,12 @@ - 3.1.0-preview1.19505.1 - 3.1.0-preview1.19505.1 - 3.1.0-preview1.19505.1 - 3.1.0-preview1.19505.1 - 3.1.0-preview1.19505.1 - 3.1.0-preview1.19505.1 + 3.1.0-preview1.19506.1 + 3.1.0-preview1.19506.1 + 3.1.0-preview1.19506.1 + 3.1.0-preview1.19506.1 + 3.1.0-preview1.19506.1 + 3.1.0-preview1.19506.1 From 04900281244a27f9369a1de46a74294b8638addb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 6 Oct 2019 20:50:27 +0000 Subject: [PATCH 389/420] Update dependencies from https://github.com/dotnet/toolset build 20191006.11 (#5151) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19506.11 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index afe8c906e..767f0d348 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 037006a38e88bbca07f32cf37e8d5d0091437ef4 + 8e03480c994ae13b1592bbd0a830b08459f8e05c https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 591c1d49d..6f5e938e9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19506.10 + 3.1.100-preview1.19506.11 From 85e8a111fae40e0a4e3b400211c3dfd5fbee5114 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 6 Oct 2019 23:26:52 +0000 Subject: [PATCH 390/420] Update dependencies from https://github.com/dotnet/toolset build 20191006.13 (#5152) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19506.13 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19506.6 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 767f0d348..9084ab7fc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,17 +72,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 8e03480c994ae13b1592bbd0a830b08459f8e05c + 0cbfdf10228beb100606ea48bc2c532fd7efb088 https://github.com/dotnet/sdk 357126710492d620198a60ee340ebeca9070f133 - + https://github.com/dotnet/cli - 67f32ea98b5e5c185b55fab26c8b1c4ddef469d6 + 71f00700ecf6225fcd7b946938152d9574205c61 diff --git a/eng/Versions.props b/eng/Versions.props index 6f5e938e9..dc52b957c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19506.11 + 3.1.100-preview1.19506.13 @@ -45,7 +45,7 @@ - 3.1.100-preview1.19506.3 + 3.1.100-preview1.19506.6 0.2.0 From 5a6c8239d1bc5dc203c7b8233e6595a44e9051b5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 6 Oct 2019 18:02:47 -0700 Subject: [PATCH 391/420] Update dependencies from https://github.com/aspnet/AspNetCore build 20191006.2 (#5154) - dotnet-user-secrets - 3.1.0-preview1.19506.2 - dotnet-watch - 3.1.0-preview1.19506.2 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19506.2 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19506.2 - dotnet-dev-certs - 3.1.0-preview1.19506.2 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19506.2 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9084ab7fc..6f0a359ee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -40,29 +40,29 @@ https://github.com/dotnet/corefx 0498dfedf8dbbd088c74399f45bc0b0c861c831a - + https://github.com/aspnet/AspNetCore - f1d22fdf7095bf5a9ed5bec469109ee65d0fd8ca + 1def7ea25d56d3c0cd8abdca2edd28346c9e688e - + https://github.com/aspnet/AspNetCore - f1d22fdf7095bf5a9ed5bec469109ee65d0fd8ca + 1def7ea25d56d3c0cd8abdca2edd28346c9e688e - + https://github.com/aspnet/AspNetCore - f1d22fdf7095bf5a9ed5bec469109ee65d0fd8ca + 1def7ea25d56d3c0cd8abdca2edd28346c9e688e - + https://github.com/aspnet/AspNetCore - f1d22fdf7095bf5a9ed5bec469109ee65d0fd8ca + 1def7ea25d56d3c0cd8abdca2edd28346c9e688e - + https://github.com/aspnet/AspNetCore - f1d22fdf7095bf5a9ed5bec469109ee65d0fd8ca + 1def7ea25d56d3c0cd8abdca2edd28346c9e688e - + https://github.com/aspnet/AspNetCore - f1d22fdf7095bf5a9ed5bec469109ee65d0fd8ca + 1def7ea25d56d3c0cd8abdca2edd28346c9e688e https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index dc52b957c..c86a50829 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,12 +36,12 @@ - 3.1.0-preview1.19506.1 - 3.1.0-preview1.19506.1 - 3.1.0-preview1.19506.1 - 3.1.0-preview1.19506.1 - 3.1.0-preview1.19506.1 - 3.1.0-preview1.19506.1 + 3.1.0-preview1.19506.2 + 3.1.0-preview1.19506.2 + 3.1.0-preview1.19506.2 + 3.1.0-preview1.19506.2 + 3.1.0-preview1.19506.2 + 3.1.0-preview1.19506.2 From e6953f59a1f1aca77ce10632b2ac7253b9be8cbf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 6 Oct 2019 19:04:28 -0700 Subject: [PATCH 392/420] Update dependencies from https://github.com/dotnet/toolset build 20191006.16 (#5155) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19506.16 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6f0a359ee..c6311ab82 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 0cbfdf10228beb100606ea48bc2c532fd7efb088 + 7a864723e64e17c2d2139cbcedcc20596b15d906 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index c86a50829..37ab0a7a0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19506.13 + 3.1.100-preview1.19506.16 From 2f2322bfcacdf6e0bb6f051a2056813914b72586 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2019 04:11:02 +0000 Subject: [PATCH 393/420] Update dependencies from https://github.com/dotnet/toolset build 20191006.17 (#5157) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19506.17 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19506.9 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c6311ab82..ef3a42025 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,17 +72,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 7a864723e64e17c2d2139cbcedcc20596b15d906 + e9c6794f1f124e273571237eb72a949ee5c950c6 https://github.com/dotnet/sdk 357126710492d620198a60ee340ebeca9070f133 - + https://github.com/dotnet/cli - 71f00700ecf6225fcd7b946938152d9574205c61 + d8f1eacf0615884bfbc1c4b1f6d6a3690b35bb65 diff --git a/eng/Versions.props b/eng/Versions.props index 37ab0a7a0..c0b53ffc2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19506.16 + 3.1.100-preview1.19506.17 @@ -45,7 +45,7 @@ - 3.1.100-preview1.19506.6 + 3.1.100-preview1.19506.9 0.2.0 From afcfe274848c7be0afe8a614002ed145cc0dc6ff Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 9 Oct 2019 01:11:11 +0000 Subject: [PATCH 394/420] Update dependencies from https://github.com/dotnet/toolset build 20191008.11 (#5175) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19508.11 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ef3a42025..60eff2438 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - e9c6794f1f124e273571237eb72a949ee5c950c6 + 0ee2151da081af3868a93aa28a84e06a900e08e6 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index c0b53ffc2..5c6323f6a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19506.17 + 3.1.100-preview1.19508.11 From 9adabe74af1df888dedda18c6c5bd5e6213b150b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 9 Oct 2019 05:35:36 +0000 Subject: [PATCH 395/420] Update dependencies from https://github.com/aspnet/AspNetCore build 20191008.20 (#5177) - dotnet-user-secrets - 3.1.0-preview1.19508.20 - dotnet-watch - 3.1.0-preview1.19508.20 - Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19508.20 - Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19508.20 - dotnet-dev-certs - 3.1.0-preview1.19508.20 - Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19508.20 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 60eff2438..a286d15cd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -40,29 +40,29 @@ https://github.com/dotnet/corefx 0498dfedf8dbbd088c74399f45bc0b0c861c831a - + https://github.com/aspnet/AspNetCore - 1def7ea25d56d3c0cd8abdca2edd28346c9e688e + 84be18b1048236ad163d737b442a4ccf3b10d997 - + https://github.com/aspnet/AspNetCore - 1def7ea25d56d3c0cd8abdca2edd28346c9e688e + 84be18b1048236ad163d737b442a4ccf3b10d997 - + https://github.com/aspnet/AspNetCore - 1def7ea25d56d3c0cd8abdca2edd28346c9e688e + 84be18b1048236ad163d737b442a4ccf3b10d997 - + https://github.com/aspnet/AspNetCore - 1def7ea25d56d3c0cd8abdca2edd28346c9e688e + 84be18b1048236ad163d737b442a4ccf3b10d997 - + https://github.com/aspnet/AspNetCore - 1def7ea25d56d3c0cd8abdca2edd28346c9e688e + 84be18b1048236ad163d737b442a4ccf3b10d997 - + https://github.com/aspnet/AspNetCore - 1def7ea25d56d3c0cd8abdca2edd28346c9e688e + 84be18b1048236ad163d737b442a4ccf3b10d997 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 5c6323f6a..3b0a14c8e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,12 +36,12 @@ - 3.1.0-preview1.19506.2 - 3.1.0-preview1.19506.2 - 3.1.0-preview1.19506.2 - 3.1.0-preview1.19506.2 - 3.1.0-preview1.19506.2 - 3.1.0-preview1.19506.2 + 3.1.0-preview1.19508.20 + 3.1.0-preview1.19508.20 + 3.1.0-preview1.19508.20 + 3.1.0-preview1.19508.20 + 3.1.0-preview1.19508.20 + 3.1.0-preview1.19508.20 From aac93eb7c142235b2a2b0f6216b5c467e31c32c9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 9 Oct 2019 07:39:17 +0000 Subject: [PATCH 396/420] Update dependencies from https://github.com/dotnet/toolset build 20191008.12 (#5178) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19508.12 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a286d15cd..6baff13d1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 0ee2151da081af3868a93aa28a84e06a900e08e6 + ddc9190400be24c30053a900e031bfcaea2cc283 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 3b0a14c8e..ed735b097 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19508.11 + 3.1.100-preview1.19508.12 From ac3b59712d74beaefcb84fc43c6ec875bdc438e2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 9 Oct 2019 08:15:24 +0000 Subject: [PATCH 397/420] Update dependencies from https://github.com/dotnet/toolset build 20191009.1 (#5179) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19509.1 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview1.19508.5 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6baff13d1..bc65cc9b9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,17 +72,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - ddc9190400be24c30053a900e031bfcaea2cc283 + 77f17e5221f6a2dfca9c0c7eb1a6012584c311c3 https://github.com/dotnet/sdk 357126710492d620198a60ee340ebeca9070f133 - + https://github.com/dotnet/cli - d8f1eacf0615884bfbc1c4b1f6d6a3690b35bb65 + 4e2114d5c1991e4da355322d9fcc39a94542662d diff --git a/eng/Versions.props b/eng/Versions.props index ed735b097..9a3726f2b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19508.12 + 3.1.100-preview1.19509.1 @@ -45,7 +45,7 @@ - 3.1.100-preview1.19506.9 + 3.1.100-preview1.19508.5 0.2.0 From d182beb5480347890008e9236386eb58cd01e07d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 11 Oct 2019 05:45:43 +0000 Subject: [PATCH 398/420] Update dependencies from https://github.com/dotnet/toolset build 20191010.9 (#5205) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19510.9 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bc65cc9b9..e021085e6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 77f17e5221f6a2dfca9c0c7eb1a6012584c311c3 + 4af474b048cbfa3c68e057d38dc78cfde2aa9965 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 9a3726f2b..cd35544c0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19509.1 + 3.1.100-preview1.19510.9 From 1f08f3ddaa0b5c9aeae434f3acb5f69ef7c57c73 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 11 Oct 2019 08:40:41 +0000 Subject: [PATCH 399/420] Update dependencies from https://github.com/dotnet/toolset build 20191011.1 (#5208) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19511.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e021085e6..a7c398924 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 4af474b048cbfa3c68e057d38dc78cfde2aa9965 + 69ccfc548e7badc24d2c38b6be7919600e7f0283 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index cd35544c0..f5996c40e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19510.9 + 3.1.100-preview1.19511.1 From a6a7b0f4645de6960befeff0086f3a2a53ccd39b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 11 Oct 2019 22:49:14 +0000 Subject: [PATCH 400/420] [release/3.1.1xx] Update dependencies from dotnet/core-setup (#5203) * Update dependencies from https://github.com/dotnet/core-setup build 20191010.20 - Microsoft.NETCore.App.Ref - 3.1.0-preview2.19510.20 - Microsoft.NETCore.App - 3.1.0-preview2.19510.20 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0-preview2.19510.20 - Microsoft.WindowsDesktop.App - 3.1.0-preview2.19510.20 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview2.19510.20 - Microsoft.NETCore.DotNetAppHost - 3.1.0-preview2.19510.20 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview2.19510.20 Dependency coherency updates - Microsoft.NETCore.Platforms - 3.1.0-preview2.19510.10 (parent: Microsoft.NetCore.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.0-preview2.19510.4 (parent: Microsoft.WindowsDesktop.App) * Update dependencies from https://github.com/dotnet/core-setup build 20191010.21 - Microsoft.NETCore.App.Ref - 3.1.0-preview2.19510.21 - Microsoft.NETCore.App - 3.1.0-preview2.19510.21 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0-preview2.19510.21 - Microsoft.WindowsDesktop.App - 3.1.0-preview2.19510.21 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview2.19510.21 - Microsoft.NETCore.DotNetAppHost - 3.1.0-preview2.19510.21 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview2.19510.21 Dependency coherency updates - Microsoft.NETCore.Platforms - 3.1.0-preview2.19510.14 (parent: Microsoft.NetCore.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.0-preview2.19510.4 (parent: Microsoft.WindowsDesktop.App) * Update dependencies from https://github.com/dotnet/core-setup build 20191011.6 - Microsoft.NETCore.App.Ref - 3.1.0-preview2.19511.6 - Microsoft.NETCore.App - 3.1.0-preview2.19511.6 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0-preview2.19511.6 - Microsoft.WindowsDesktop.App - 3.1.0-preview2.19511.6 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview2.19511.6 - Microsoft.NETCore.DotNetAppHost - 3.1.0-preview2.19511.6 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview2.19511.6 Dependency coherency updates - Microsoft.NETCore.Platforms - 3.1.0-preview2.19511.4 (parent: Microsoft.NetCore.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.0-preview2.19510.4 (parent: Microsoft.WindowsDesktop.App) --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a7c398924..c46087b37 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,33 +2,33 @@ - + https://github.com/dotnet/core-setup - bbf5542781136f9f3a1f30b010cb782e775d54c7 + f15311bdc5e9fbf4026a3099c32c5ea6b50d6236 - + https://github.com/dotnet/core-setup - bbf5542781136f9f3a1f30b010cb782e775d54c7 + f15311bdc5e9fbf4026a3099c32c5ea6b50d6236 - + https://github.com/dotnet/core-setup - bbf5542781136f9f3a1f30b010cb782e775d54c7 + f15311bdc5e9fbf4026a3099c32c5ea6b50d6236 - + https://github.com/dotnet/core-setup - bbf5542781136f9f3a1f30b010cb782e775d54c7 + f15311bdc5e9fbf4026a3099c32c5ea6b50d6236 - + https://github.com/dotnet/core-setup - bbf5542781136f9f3a1f30b010cb782e775d54c7 + f15311bdc5e9fbf4026a3099c32c5ea6b50d6236 - + https://github.com/dotnet/core-setup - bbf5542781136f9f3a1f30b010cb782e775d54c7 + f15311bdc5e9fbf4026a3099c32c5ea6b50d6236 - + https://github.com/dotnet/core-setup - bbf5542781136f9f3a1f30b010cb782e775d54c7 + f15311bdc5e9fbf4026a3099c32c5ea6b50d6236 @@ -36,9 +36,9 @@ 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/corefx - 0498dfedf8dbbd088c74399f45bc0b0c861c831a + 080eeeb860704f586972f94ac3cabba6f34d08ed https://github.com/aspnet/AspNetCore @@ -89,9 +89,9 @@ https://github.com/dotnet/winforms 1934207dfd7aa570337791a67e4eeec4f6b82265 - + https://github.com/dotnet/wpf - d7adcfe00706477704409105077aec4c6ac7eadb + ea419d76724ac6fd0a4cd731bedba8e3a09c8e43 diff --git a/eng/Versions.props b/eng/Versions.props index f5996c40e..9c20c89d2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ - 3.1.0-preview1.19505.2 + 3.1.0-preview2.19510.4 @@ -56,22 +56,22 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview1.19506.1 - 3.1.0-preview1.19506.1 + 3.1.0-preview2.19511.6 + 3.1.0-preview2.19511.6 $(MicrosoftNETCoreAppPackageVersion) - 3.1.0-preview1.19506.1 - 3.1.0-preview1.19506.1 + 3.1.0-preview2.19511.6 + 3.1.0-preview2.19511.6 $(MicrosoftNETCoreDotNetHostResolverPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) - 3.1.0-preview1.19506.1 + 3.1.0-preview2.19511.6 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) 2.1.0 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview1.19506.1 - 3.1.0-preview1.19506.1 + 3.1.0-preview2.19511.6 + 3.1.0-preview2.19511.6 $(MicrosoftWindowsDesktopAppPackageVersion) From c143f5e9b3d2f3c2130431cd5d92b2b6f9a6f029 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Mon, 14 Oct 2019 11:42:24 -0700 Subject: [PATCH 401/420] Update branding to 3.1.100-preview2 --- src/redist/targets/Versions.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/Versions.targets b/src/redist/targets/Versions.targets index e174f99df..e1d48c098 100644 --- a/src/redist/targets/Versions.targets +++ b/src/redist/targets/Versions.targets @@ -4,7 +4,7 @@ 1 1 00 - preview1 + preview2 From 48fe0c154227d1fabfdfd00e868f92d680caf5b9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2019 22:09:55 +0000 Subject: [PATCH 402/420] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5218) * Update dependencies from https://github.com/dotnet/toolset build 20191011.9 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview1.19511.9 * Update dependencies from https://github.com/dotnet/toolset build 20191014.3 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19514.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c46087b37..081c58529 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 69ccfc548e7badc24d2c38b6be7919600e7f0283 + 089dfdfebe493f062569d874fe0899fb80e876e9 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 9c20c89d2..90e4e969d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview1.19511.1 + 3.1.100-preview2.19514.3 From 0e1880b4cfcc2be703198647857c96186ecb9828 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2019 23:05:36 +0000 Subject: [PATCH 403/420] Update dependencies from https://github.com/dotnet/toolset build 20191014.5 (#5228) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19514.5 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview2.19514.2 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 081c58529..9476037da 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,17 +72,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 089dfdfebe493f062569d874fe0899fb80e876e9 + 3e288fd1432532a9e7747e3f0168379afcd11388 https://github.com/dotnet/sdk 357126710492d620198a60ee340ebeca9070f133 - + https://github.com/dotnet/cli - 4e2114d5c1991e4da355322d9fcc39a94542662d + fc59ff6789f5fa497fbc7a74001596201edd9595 diff --git a/eng/Versions.props b/eng/Versions.props index 90e4e969d..d7562372c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview2.19514.3 + 3.1.100-preview2.19514.5 @@ -45,7 +45,7 @@ - 3.1.100-preview1.19508.5 + 3.1.100-preview2.19514.2 0.2.0 From c47eb9b4f8af05d1bb0cb6fd17b517858a50c481 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 16 Oct 2019 00:56:18 +0000 Subject: [PATCH 404/420] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5235) * Update dependencies from https://github.com/dotnet/toolset build 20191015.9 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19515.9 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview2.19515.4 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191015.12 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19515.12 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview2.19515.6 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9476037da..70b9325ce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,17 +72,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 3e288fd1432532a9e7747e3f0168379afcd11388 + 8ee30306ac5348d7a98a8872e13a0a29ab426b8b https://github.com/dotnet/sdk 357126710492d620198a60ee340ebeca9070f133 - + https://github.com/dotnet/cli - fc59ff6789f5fa497fbc7a74001596201edd9595 + 36bd8c868d4bd0ccd643ce27cc05179aff254028 diff --git a/eng/Versions.props b/eng/Versions.props index d7562372c..786234d81 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview2.19514.5 + 3.1.100-preview2.19515.12 @@ -45,7 +45,7 @@ - 3.1.100-preview2.19514.2 + 3.1.100-preview2.19515.6 0.2.0 From fda8e34c66272ffd41238a8a3d6a67d78ec49847 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 16 Oct 2019 06:05:34 +0000 Subject: [PATCH 405/420] Update dependencies from https://github.com/dotnet/core-setup build 20191015.16 (#5238) - Microsoft.NETCore.App.Ref - 3.1.0-preview2.19515.16 - Microsoft.NETCore.App - 3.1.0-preview2.19515.16 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0-preview2.19515.16 - Microsoft.WindowsDesktop.App - 3.1.0-preview2.19515.16 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview2.19515.16 - Microsoft.NETCore.DotNetAppHost - 3.1.0-preview2.19515.16 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview2.19515.16 Dependency coherency updates - Microsoft.NETCore.Platforms - 3.1.0-preview2.19514.6 (parent: Microsoft.NetCore.App) - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.1-preview1.19515.8 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.0-preview2.19515.8 (parent: Microsoft.WindowsDesktop.App) --- eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 18 +++++++++--------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 70b9325ce..e16544a7e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,33 +2,33 @@ - + https://github.com/dotnet/core-setup - f15311bdc5e9fbf4026a3099c32c5ea6b50d6236 + 57ce1fec7a023a8e32cc64f8ce2637a0b3cdba35 - + https://github.com/dotnet/core-setup - f15311bdc5e9fbf4026a3099c32c5ea6b50d6236 + 57ce1fec7a023a8e32cc64f8ce2637a0b3cdba35 - + https://github.com/dotnet/core-setup - f15311bdc5e9fbf4026a3099c32c5ea6b50d6236 + 57ce1fec7a023a8e32cc64f8ce2637a0b3cdba35 - + https://github.com/dotnet/core-setup - f15311bdc5e9fbf4026a3099c32c5ea6b50d6236 + 57ce1fec7a023a8e32cc64f8ce2637a0b3cdba35 - + https://github.com/dotnet/core-setup - f15311bdc5e9fbf4026a3099c32c5ea6b50d6236 + 57ce1fec7a023a8e32cc64f8ce2637a0b3cdba35 - + https://github.com/dotnet/core-setup - f15311bdc5e9fbf4026a3099c32c5ea6b50d6236 + 57ce1fec7a023a8e32cc64f8ce2637a0b3cdba35 - + https://github.com/dotnet/core-setup - f15311bdc5e9fbf4026a3099c32c5ea6b50d6236 + 57ce1fec7a023a8e32cc64f8ce2637a0b3cdba35 @@ -36,9 +36,9 @@ 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/corefx - 080eeeb860704f586972f94ac3cabba6f34d08ed + d6156966c01a8a45a069fecdc68c162f94d9d58d https://github.com/aspnet/AspNetCore @@ -85,13 +85,13 @@ 36bd8c868d4bd0ccd643ce27cc05179aff254028 - + https://github.com/dotnet/winforms - 1934207dfd7aa570337791a67e4eeec4f6b82265 + 3886eb2dc8384f5490e289a321707ddc454ec45e - + https://github.com/dotnet/wpf - ea419d76724ac6fd0a4cd731bedba8e3a09c8e43 + 8c5494aa7298e8182ccb4639eb52b002458d0158 diff --git a/eng/Versions.props b/eng/Versions.props index 786234d81..cf2cf939c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,11 +16,11 @@ - 4.8.1-preview1.19504.1 + 4.8.1-preview1.19515.8 - 3.1.0-preview2.19510.4 + 3.1.0-preview2.19515.8 @@ -56,22 +56,22 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview2.19511.6 - 3.1.0-preview2.19511.6 + 3.1.0-preview2.19515.16 + 3.1.0-preview2.19515.16 $(MicrosoftNETCoreAppPackageVersion) - 3.1.0-preview2.19511.6 - 3.1.0-preview2.19511.6 + 3.1.0-preview2.19515.16 + 3.1.0-preview2.19515.16 $(MicrosoftNETCoreDotNetHostResolverPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) - 3.1.0-preview2.19511.6 + 3.1.0-preview2.19515.16 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) 2.1.0 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview2.19511.6 - 3.1.0-preview2.19511.6 + 3.1.0-preview2.19515.16 + 3.1.0-preview2.19515.16 $(MicrosoftWindowsDesktopAppPackageVersion) From 09d6567e85ca53c9a7f7a001f04500ecf677f7a2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 16 Oct 2019 06:56:16 +0000 Subject: [PATCH 406/420] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5237) * Update dependencies from https://github.com/dotnet/toolset build 20191015.14 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19515.14 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview2.19515.9 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/toolset build 20191015.15 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19515.15 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview2.19515.9 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e16544a7e..d64ba232b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,17 +72,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 8ee30306ac5348d7a98a8872e13a0a29ab426b8b + 5408c9880fbe5a38823e1fd730df6157b6a96d29 https://github.com/dotnet/sdk 357126710492d620198a60ee340ebeca9070f133 - + https://github.com/dotnet/cli - 36bd8c868d4bd0ccd643ce27cc05179aff254028 + 676366c557959d002c573887e46f9da4d306fe6e diff --git a/eng/Versions.props b/eng/Versions.props index cf2cf939c..70c36ee4f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview2.19515.12 + 3.1.100-preview2.19515.15 @@ -45,7 +45,7 @@ - 3.1.100-preview2.19515.6 + 3.1.100-preview2.19515.9 0.2.0 From 20ff01940b761685559ad87d12d7992d757456e0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 16 Oct 2019 08:05:47 +0000 Subject: [PATCH 407/420] Update dependencies from https://github.com/dotnet/toolset build 20191016.1 (#5240) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19516.1 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview2.19515.10 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d64ba232b..180a2658a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,17 +72,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 5408c9880fbe5a38823e1fd730df6157b6a96d29 + a25adb6deaf5be938a181a21f327fdbd7bfcf0c7 https://github.com/dotnet/sdk 357126710492d620198a60ee340ebeca9070f133 - + https://github.com/dotnet/cli - 676366c557959d002c573887e46f9da4d306fe6e + 210eda4a041d2a9dc84c0b0b27669727608065f0 diff --git a/eng/Versions.props b/eng/Versions.props index 70c36ee4f..34659c1d2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview2.19515.15 + 3.1.100-preview2.19516.1 @@ -45,7 +45,7 @@ - 3.1.100-preview2.19515.9 + 3.1.100-preview2.19515.10 0.2.0 From 6f7202d895275c4608a29c2ecdf5e0c46e19e0fd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 16 Oct 2019 13:05:44 +0000 Subject: [PATCH 408/420] Update dependencies from https://github.com/dotnet/core-setup build 20191016.1 (#5243) - Microsoft.NETCore.App.Ref - 3.1.0-preview2.19516.1 - Microsoft.NETCore.App - 3.1.0-preview2.19516.1 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.0-preview2.19516.1 - Microsoft.WindowsDesktop.App - 3.1.0-preview2.19516.1 - Microsoft.NETCore.DotNetHostResolver - 3.1.0-preview2.19516.1 - Microsoft.NETCore.DotNetAppHost - 3.1.0-preview2.19516.1 - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.0-preview2.19516.1 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 180a2658a..8434afad9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,33 +2,33 @@ - + https://github.com/dotnet/core-setup - 57ce1fec7a023a8e32cc64f8ce2637a0b3cdba35 + f8aac40612d167c5beff554f569897177e786d3a - + https://github.com/dotnet/core-setup - 57ce1fec7a023a8e32cc64f8ce2637a0b3cdba35 + f8aac40612d167c5beff554f569897177e786d3a - + https://github.com/dotnet/core-setup - 57ce1fec7a023a8e32cc64f8ce2637a0b3cdba35 + f8aac40612d167c5beff554f569897177e786d3a - + https://github.com/dotnet/core-setup - 57ce1fec7a023a8e32cc64f8ce2637a0b3cdba35 + f8aac40612d167c5beff554f569897177e786d3a - + https://github.com/dotnet/core-setup - 57ce1fec7a023a8e32cc64f8ce2637a0b3cdba35 + f8aac40612d167c5beff554f569897177e786d3a - + https://github.com/dotnet/core-setup - 57ce1fec7a023a8e32cc64f8ce2637a0b3cdba35 + f8aac40612d167c5beff554f569897177e786d3a - + https://github.com/dotnet/core-setup - 57ce1fec7a023a8e32cc64f8ce2637a0b3cdba35 + f8aac40612d167c5beff554f569897177e786d3a diff --git a/eng/Versions.props b/eng/Versions.props index 34659c1d2..0efcbf930 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,22 +56,22 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview2.19515.16 - 3.1.0-preview2.19515.16 + 3.1.0-preview2.19516.1 + 3.1.0-preview2.19516.1 $(MicrosoftNETCoreAppPackageVersion) - 3.1.0-preview2.19515.16 - 3.1.0-preview2.19515.16 + 3.1.0-preview2.19516.1 + 3.1.0-preview2.19516.1 $(MicrosoftNETCoreDotNetHostResolverPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) - 3.1.0-preview2.19515.16 + 3.1.0-preview2.19516.1 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) 2.1.0 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview2.19515.16 - 3.1.0-preview2.19515.16 + 3.1.0-preview2.19516.1 + 3.1.0-preview2.19516.1 $(MicrosoftWindowsDesktopAppPackageVersion) From 8e00216d4c3a93026506f3ba75145167cbdffdb2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 16 Oct 2019 19:38:32 +0000 Subject: [PATCH 409/420] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5244) * Update dependencies from https://github.com/dotnet/toolset build 20191016.5 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19516.5 * Update dependencies from https://github.com/dotnet/toolset build 20191016.9 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19516.9 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview2.19516.2 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8434afad9..9ad8ca676 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,17 +72,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - a25adb6deaf5be938a181a21f327fdbd7bfcf0c7 + b1a610f7a41f1d494a53ceca71e04733d89115aa https://github.com/dotnet/sdk 357126710492d620198a60ee340ebeca9070f133 - + https://github.com/dotnet/cli - 210eda4a041d2a9dc84c0b0b27669727608065f0 + 6e4e8182c7a005729b4232b10dda6428c86f40e1 diff --git a/eng/Versions.props b/eng/Versions.props index 0efcbf930..9f63cf56a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview2.19516.1 + 3.1.100-preview2.19516.9 @@ -45,7 +45,7 @@ - 3.1.100-preview2.19515.10 + 3.1.100-preview2.19516.2 0.2.0 From 1150508cc1cd45398d14bd25726363913c53c359 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 16 Oct 2019 23:15:51 +0000 Subject: [PATCH 410/420] [release/3.1.1xx] Update dependencies from dotnet/toolset (#5248) * Update dependencies from https://github.com/dotnet/toolset build 20191016.16 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19516.16 * Update dependencies from https://github.com/dotnet/toolset build 20191016.17 - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19516.17 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9ad8ca676..bb2ad68d0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - b1a610f7a41f1d494a53ceca71e04733d89115aa + c6d46c4650f475d96af4342b217a109b410321b7 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 9f63cf56a..ff33a2453 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview2.19516.9 + 3.1.100-preview2.19516.17 From c3079ffab5436bbba8a45c0a48b4ff692d7a3505 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 17 Oct 2019 04:35:47 +0000 Subject: [PATCH 411/420] Update dependencies from https://github.com/dotnet/toolset build 20191016.21 (#5255) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19516.21 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bb2ad68d0..b11348bb0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - c6d46c4650f475d96af4342b217a109b410321b7 + 720a03cd44ef592643529b9aeb54c1bc4c3f629b https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index ff33a2453..e03531ccd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview2.19516.17 + 3.1.100-preview2.19516.21 From a0d8585d3159cc5498e17a9920e19a2f99f69ada Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 17 Oct 2019 05:30:53 +0000 Subject: [PATCH 412/420] Update dependencies from https://github.com/dotnet/toolset build 20191016.22 (#5258) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19516.22 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview2.19516.7 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b11348bb0..6f88a02aa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,17 +72,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 720a03cd44ef592643529b9aeb54c1bc4c3f629b + ee44feb9fd48d49d2c6db468b21360298e0a91c5 https://github.com/dotnet/sdk 357126710492d620198a60ee340ebeca9070f133 - + https://github.com/dotnet/cli - 6e4e8182c7a005729b4232b10dda6428c86f40e1 + 9ab8ebd60375c33c2e10399f208eb50de84c4a1f diff --git a/eng/Versions.props b/eng/Versions.props index e03531ccd..ad7aa5c92 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview2.19516.21 + 3.1.100-preview2.19516.22 @@ -45,7 +45,7 @@ - 3.1.100-preview2.19516.2 + 3.1.100-preview2.19516.7 0.2.0 From fa24912bf4e83bbaa68d9fa5ad42b292b779b010 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 17 Oct 2019 08:30:39 +0000 Subject: [PATCH 413/420] Update dependencies from https://github.com/dotnet/toolset build 20191017.1 (#5260) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19517.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6f88a02aa..bfbb8b5b8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,9 +72,9 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - ee44feb9fd48d49d2c6db468b21360298e0a91c5 + 30d9a11fb60ad91bf0dc89a0cb5b93f07cfabbaa https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index ad7aa5c92..09f47081a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview2.19516.22 + 3.1.100-preview2.19517.1 From fe70f7c907f1542a80917994be7037826670051f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 17 Oct 2019 10:40:40 +0000 Subject: [PATCH 414/420] Update dependencies from https://github.com/dotnet/toolset build 20191017.2 (#5261) - Microsoft.Dotnet.Toolset.Internal - 3.1.100-preview2.19517.2 Dependency coherency updates - Microsoft.DotNet.MSBuildSdkResolver - 3.1.100-preview2.19517.1 (parent: Microsoft.Dotnet.Toolset.Internal) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bfbb8b5b8..438914015 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -72,17 +72,17 @@ https://github.com/dotnet/templating fa98e14b1b8d84a1a711ef909384f16ada8bbe7c - + https://github.com/dotnet/toolset - 30d9a11fb60ad91bf0dc89a0cb5b93f07cfabbaa + 7f6121051a79b902b8166bc23ccca762ec8c9e8c https://github.com/dotnet/sdk 357126710492d620198a60ee340ebeca9070f133 - + https://github.com/dotnet/cli - 9ab8ebd60375c33c2e10399f208eb50de84c4a1f + 5363e0119503e08b40eea53ff85b02839a86fa44 diff --git a/eng/Versions.props b/eng/Versions.props index 09f47081a..592750a0c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.100-preview2.19517.1 + 3.1.100-preview2.19517.2 @@ -45,7 +45,7 @@ - 3.1.100-preview2.19516.7 + 3.1.100-preview2.19517.1 0.2.0 From 22b4a9c0b920c8f35f37834f89e5824da3eef5c4 Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Thu, 17 Oct 2019 15:50:10 -0700 Subject: [PATCH 415/420] Update dependencies from .NET Core 5 Dev --- NuGet.config | 5 ++- eng/Version.Details.xml | 67 ++++++++++++++++++++--------------------- eng/Versions.props | 31 +++++++++---------- 3 files changed, 50 insertions(+), 53 deletions(-) diff --git a/NuGet.config b/NuGet.config index 84e92e811..c5c679e3f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,9 +6,6 @@ - - - @@ -18,6 +15,8 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 74bf980b1..eec9a5807 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,33 +2,33 @@ - + https://github.com/dotnet/windowsdesktop - 90199f6947ffff8ba397cb3d921d7fbce3958d3a + 6aa80fdf03434eaacc67388c436ffaf62cb10c50 - + https://github.com/dotnet/windowsdesktop - 90199f6947ffff8ba397cb3d921d7fbce3958d3a + 6aa80fdf03434eaacc67388c436ffaf62cb10c50 - + https://github.com/dotnet/core-setup - f88738a6c69ffcfad8784c4cd7080efb99d474a9 + 900664cfc09aebb4ec86ed2a5f9a42094409cf44 - + https://github.com/dotnet/core-setup - f88738a6c69ffcfad8784c4cd7080efb99d474a9 + 900664cfc09aebb4ec86ed2a5f9a42094409cf44 - + https://github.com/dotnet/core-setup - f88738a6c69ffcfad8784c4cd7080efb99d474a9 + 900664cfc09aebb4ec86ed2a5f9a42094409cf44 - + https://github.com/dotnet/core-setup - f88738a6c69ffcfad8784c4cd7080efb99d474a9 + 900664cfc09aebb4ec86ed2a5f9a42094409cf44 - + https://github.com/dotnet/core-setup - f88738a6c69ffcfad8784c4cd7080efb99d474a9 + 900664cfc09aebb4ec86ed2a5f9a42094409cf44 @@ -36,35 +36,34 @@ 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/corefx - d6156966c01a8a45a069fecdc68c162f94d9d58d + 3b6ec2ba944fb72f921f95b99b6ebf2e7bb3dc5a - + https://github.com/aspnet/AspNetCore - 29ad3f2b8a42a29b26e72e98c22cc913f93b17b0 + 23f3a10965fb70b1ae34c5464d497c71540c998e - + https://github.com/aspnet/AspNetCore - 29ad3f2b8a42a29b26e72e98c22cc913f93b17b0 + 23f3a10965fb70b1ae34c5464d497c71540c998e - + https://github.com/aspnet/AspNetCore - 29ad3f2b8a42a29b26e72e98c22cc913f93b17b0 + 23f3a10965fb70b1ae34c5464d497c71540c998e - + https://github.com/aspnet/AspNetCore - 29ad3f2b8a42a29b26e72e98c22cc913f93b17b0 + 23f3a10965fb70b1ae34c5464d497c71540c998e - + https://github.com/aspnet/AspNetCore - 29ad3f2b8a42a29b26e72e98c22cc913f93b17b0 + 23f3a10965fb70b1ae34c5464d497c71540c998e - + https://github.com/aspnet/AspNetCore - 29ad3f2b8a42a29b26e72e98c22cc913f93b17b0 + 23f3a10965fb70b1ae34c5464d497c71540c998e - https://github.com/dotnet/test-templates 6ae8a6e7dd862c9447771c108d43fb9028f22c22 @@ -73,17 +72,17 @@ https://github.com/dotnet/templating 6f180514b4aefc006d50c07c947da61e0ac2ed4c - + https://github.com/dotnet/toolset - 0228e76e7114adc99dcb516e9638412d4c00db26 + 4e2bc1d8eca379df488fd66c6d8b29bebe0561eb https://github.com/dotnet/sdk 419501cb5731805c7e49bae276a2938e7c1844de - - https://github.com/dotnet/cli - 3082385f24291e2f4f3bb4efe2b275e71ca6c028 + + https://github.com/dotnet/toolset + 4e2bc1d8eca379df488fd66c6d8b29bebe0561eb diff --git a/eng/Versions.props b/eng/Versions.props index 6e7b689b8..93b687ddd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 5.0.100-alpha1.19412.1 + 5.0.100-alpha1.19517.10 @@ -36,17 +36,16 @@ - 5.0.0-alpha1.19470.6 - 5.0.0-alpha1.19470.6 - 5.0.0-alpha1.19470.6 - 5.0.0-alpha1.19470.6 - 5.0.0-alpha1.19470.6 - 5.0.0-alpha1.19470.6 - + 5.0.0-alpha1.19517.10 + 5.0.0-alpha1.19517.10 + 5.0.0-alpha1.19517.10 + 5.0.0-alpha1.19517.10 + 5.0.0-alpha1.19517.10 + 5.0.0-alpha1.19517.10 - 5.0.100-alpha1.19516.8 + 5.0.100-alpha1.19517.10 0.2.0 @@ -57,21 +56,21 @@ $(MicrosoftNETSdkPackageVersion) - 5.0.0-alpha1.19507.3 - 5.0.0-alpha1.19507.3 + 5.0.0-alpha1.19517.3 + 5.0.0-alpha1.19517.3 $(MicrosoftNETCoreAppPackageVersion) - 5.0.0-alpha1.19507.3 - 5.0.0-alpha1.19507.3 + 5.0.0-alpha1.19517.3 + 5.0.0-alpha1.19517.3 $(MicrosoftNETCoreDotNetHostResolverPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) - 5.0.0-alpha1.19507.3 + 5.0.0-alpha1.19517.3 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) 2.1.0 $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 5.0.0-alpha1.19516.6 - 5.0.0-alpha1.19516.6 + 5.0.0-alpha1.19517.3 + 5.0.0-alpha1.19517.3 $(MicrosoftWindowsDesktopAppPackageVersion) $(MicrosoftWindowsDesktopAppPackageVersion) From 102266ec888381e58527313b126964e13e7ab6e5 Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Thu, 17 Oct 2019 16:05:17 -0700 Subject: [PATCH 416/420] Install 3.0 runtime for sdk tests --- test/SdkTests/SdkTests.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/test/SdkTests/SdkTests.csproj b/test/SdkTests/SdkTests.csproj index d33fe2504..f323d87b9 100644 --- a/test/SdkTests/SdkTests.csproj +++ b/test/SdkTests/SdkTests.csproj @@ -83,6 +83,7 @@ + From 8939b79a71df13d5cdfe6afdfaf82a233a431e04 Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Fri, 18 Oct 2019 14:48:44 -0700 Subject: [PATCH 417/420] Add support for netcoreapp3.1, fix netcoreapp3.0, and fix tests --- .../targets/GenerateBundledVersions.targets | 101 +++++++++++++++--- test/SdkTests/SdkTests.csproj | 1 + test/SdkTests/TestConfig.xml | 19 +++- 3 files changed, 103 insertions(+), 18 deletions(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index b277ad659..bfc43eca7 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -32,14 +32,22 @@ <_NETCoreApp30PackageVersion>3.0.0 <_NETCoreApp30TargetingPackVersion>$(_NETCoreApp30PackageVersion) + + <_NETCoreApp31PackageVersion>3.1.0-preview1.19506.1 + <_NETCoreApp31TargetingPackVersion>$(_NETCoreApp31PackageVersion) + <_MicrosoftWindowsDesktop30PackageVersion>$(_NETCoreApp30PackageVersion) <_MicrosoftWindowsDesktop30TargetingPackVersion>$(_NETCoreApp30TargetingPackVersion) - <_AspNet30PackageVersion>3.0.0-rc1.19457.4 - <_AspNet30TargetingPackVersion>$(_AspNet30PackageVersion) + + <_MicrosoftWindowsDesktop31PackageVersion>$(_NETCoreApp31PackageVersion) + <_MicrosoftWindowsDesktop31TargetingPackVersion>$(_NETCoreApp31TargetingPackVersion) <_MicrosoftAspNetCoreApp30PackageVersion>3.0.0 <_AspNet30TargetingPackVersion>$(_MicrosoftAspNetCoreApp30PackageVersion) + <_MicrosoftAspNetCoreApp31PackageVersion>3.1.0-preview1.19508.20 + <_AspNet31TargetingPackVersion>$(_MicrosoftAspNetCoreApp31PackageVersion) + <_NETCoreAppTargetFrameworkVersion>$(_NETCoreAppPackageVersion.Split('.')[0]).$(_NETCoreAppPackageVersion.Split('.')[1]) <_NETStandardTargetFrameworkVersion>$(_NETStandardLibraryPackageVersion.Split('.')[0]).$(_NETStandardLibraryPackageVersion.Split('.')[1]) @@ -90,22 +98,14 @@ linux-arm; linux-arm64" /> - + + - + - - + + + + + + + + + + + + + + + diff --git a/test/SdkTests/TestConfig.xml b/test/SdkTests/TestConfig.xml index 13c5859e5..6e32bc585 100644 --- a/test/SdkTests/TestConfig.xml +++ b/test/SdkTests/TestConfig.xml @@ -145,6 +145,23 @@ Skip="true" Issue="" Reason="Needs .NET Core 1.1"/> - + + + + + + From 39b07f54dd50d582a4416654879e40cc9e5bfa5e Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Fri, 18 Oct 2019 14:52:33 -0700 Subject: [PATCH 418/420] Update dependencies from .NET Core 5 Dev --- eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 18 +++++++++--------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index eec9a5807..188fbfa6b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,33 +2,33 @@ - + https://github.com/dotnet/windowsdesktop - 6aa80fdf03434eaacc67388c436ffaf62cb10c50 + 76ac27ec24174b4d0a7ff58e9e6e24f1d6b608d4 - + https://github.com/dotnet/windowsdesktop - 6aa80fdf03434eaacc67388c436ffaf62cb10c50 + 76ac27ec24174b4d0a7ff58e9e6e24f1d6b608d4 - + https://github.com/dotnet/core-setup - 900664cfc09aebb4ec86ed2a5f9a42094409cf44 + 346b717dc7be7f9b3c2554d883d26e8f33977b86 - + https://github.com/dotnet/core-setup - 900664cfc09aebb4ec86ed2a5f9a42094409cf44 + 346b717dc7be7f9b3c2554d883d26e8f33977b86 - + https://github.com/dotnet/core-setup - 900664cfc09aebb4ec86ed2a5f9a42094409cf44 + 346b717dc7be7f9b3c2554d883d26e8f33977b86 - + https://github.com/dotnet/core-setup - 900664cfc09aebb4ec86ed2a5f9a42094409cf44 + 346b717dc7be7f9b3c2554d883d26e8f33977b86 - + https://github.com/dotnet/core-setup - 900664cfc09aebb4ec86ed2a5f9a42094409cf44 + 346b717dc7be7f9b3c2554d883d26e8f33977b86 @@ -36,9 +36,9 @@ 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/corefx - 3b6ec2ba944fb72f921f95b99b6ebf2e7bb3dc5a + 2b92fc0930b941cd0d9146971745cd717689434c https://github.com/aspnet/AspNetCore @@ -72,17 +72,17 @@ https://github.com/dotnet/templating 6f180514b4aefc006d50c07c947da61e0ac2ed4c - + https://github.com/dotnet/toolset - 4e2bc1d8eca379df488fd66c6d8b29bebe0561eb + 32bb8ea97ad82adf82af92cce78c909f13f853f7 https://github.com/dotnet/sdk 419501cb5731805c7e49bae276a2938e7c1844de - + https://github.com/dotnet/toolset - 4e2bc1d8eca379df488fd66c6d8b29bebe0561eb + 32bb8ea97ad82adf82af92cce78c909f13f853f7 diff --git a/eng/Versions.props b/eng/Versions.props index 93b687ddd..6508683ce 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 5.0.100-alpha1.19517.10 + 5.0.100-alpha1.19518.5 @@ -45,7 +45,7 @@ - 5.0.100-alpha1.19517.10 + 5.0.100-alpha1.19518.5 0.2.0 @@ -56,21 +56,21 @@ $(MicrosoftNETSdkPackageVersion) - 5.0.0-alpha1.19517.3 - 5.0.0-alpha1.19517.3 + 5.0.0-alpha1.19518.5 + 5.0.0-alpha1.19518.5 $(MicrosoftNETCoreAppPackageVersion) - 5.0.0-alpha1.19517.3 - 5.0.0-alpha1.19517.3 + 5.0.0-alpha1.19518.5 + 5.0.0-alpha1.19518.5 $(MicrosoftNETCoreDotNetHostResolverPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) - 5.0.0-alpha1.19517.3 + 5.0.0-alpha1.19518.5 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftNETCoreDotNetAppHostPackageVersion) 2.1.0 $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 5.0.0-alpha1.19517.3 - 5.0.0-alpha1.19517.3 + 5.0.0-alpha1.19518.5 + 5.0.0-alpha1.19518.5 $(MicrosoftWindowsDesktopAppPackageVersion) $(MicrosoftWindowsDesktopAppPackageVersion) From 9cfc62b65fbffdcdfed33bb81804d7689f3ca7dd Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Fri, 18 Oct 2019 15:10:51 -0700 Subject: [PATCH 419/420] Fix test expectation to match message change --- test/EndToEnd/ProjectBuildTests.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/EndToEnd/ProjectBuildTests.cs b/test/EndToEnd/ProjectBuildTests.cs index f0f3a854a..ab3558dc8 100644 --- a/test/EndToEnd/ProjectBuildTests.cs +++ b/test/EndToEnd/ProjectBuildTests.cs @@ -36,9 +36,9 @@ namespace EndToEnd.Tests var runCommand = new RunCommand() .WithWorkingDirectory(projectDirectory) .ExecuteWithCapturedOutput() - // Templates are still at 3.0 and will not run on 5.0, revert to commented out assertion when 5.0 templates land + // Templates are still at 3.1 and will not run on 5.0, revert to commented out assertion when 5.0 templates land //.Should().Pass().And.HaveStdOutContaining("Hello World!"); - .Should().Fail().And.HaveStdErrContaining("https://aka.ms/dotnet-download"); + .Should().Fail().And.HaveStdErrContaining("https://aka.ms/dotnet-core-applaunch"); var binDirectory = new DirectoryInfo(projectDirectory).Sub("bin"); binDirectory.Should().HaveFilesMatching("*.dll", SearchOption.AllDirectories); @@ -80,9 +80,9 @@ namespace EndToEnd.Tests var runCommand = new RunCommand() .WithWorkingDirectory(projectDirectory) .ExecuteWithCapturedOutput() - // Templates are still at 3.0 and will not run on 5.0, revert to commented out assertion when 5.0 templates land + // Templates are still at 3.1 and will not run on 5.0, revert to commented out assertion when 5.0 templates land //.Should().Pass().And.HaveStdOutContaining("Hello World!"); - .Should().Fail().And.HaveStdErrContaining("https://aka.ms/dotnet-download"); + .Should().Fail().And.HaveStdErrContaining("https://aka.ms/dotnet-core-applaunch"); } From fdd459555426ae3bc88ef675a46e2846c2a4a504 Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Tue, 22 Oct 2019 11:06:07 -0700 Subject: [PATCH 420/420] Skip test with defect --- test/SdkTests/TestConfig.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/SdkTests/TestConfig.xml b/test/SdkTests/TestConfig.xml index 6e32bc585..441cc6cc7 100644 --- a/test/SdkTests/TestConfig.xml +++ b/test/SdkTests/TestConfig.xml @@ -163,5 +163,11 @@ Issue="" Reason="Assumes `dotnet new wpf`produces a netcoreapp3.1 app, will get fixed when sdk takes .NET 5 stage 0" /> + + +