From dc88bac18fcddd0260cef3386e2c18976dfc2d19 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Wed, 16 Aug 2017 14:22:25 -0700 Subject: [PATCH 01/25] Update version to 2.0.2-vspre --- build/BranchInfo.props | 4 ++-- build/Branding.props | 2 +- build/Version.props | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/BranchInfo.props b/build/BranchInfo.props index 0d146ab2a..a439784b3 100644 --- a/build/BranchInfo.props +++ b/build/BranchInfo.props @@ -1,6 +1,6 @@ - release/2.0.0 - release/2.0.0 + release/2.0.2 + release/2.0.2 diff --git a/build/Branding.props b/build/Branding.props index 6608a3ea5..52a37c621 100644 --- a/build/Branding.props +++ b/build/Branding.props @@ -1,6 +1,6 @@ - Microsoft .NET Core SDK - 2.0.1 + Microsoft .NET Core SDK - 2.0.2 .NET Standard Support for Visual Studio 2015 Microsoft .NET Core Runtime - 2.0.0 Microsoft .NET Core Host - 2.0.0 diff --git a/build/Version.props b/build/Version.props index 156ece688..49a490286 100644 --- a/build/Version.props +++ b/build/Version.props @@ -2,8 +2,8 @@ 2 0 - 1 - servicing + 2 + vspre $(VersionMajor).$(VersionMinor).$(VersionPatch)-$(ReleaseSuffix) $(VersionMajor).$(VersionMinor).$(VersionPatch).$(CommitCount) From 030dfc9945ac43c3ca841c724083aa0c4c5eadbd Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Wed, 16 Aug 2017 14:40:06 -0700 Subject: [PATCH 02/25] Update branch in README.md to release/2.0.2 --- README.md | 66 +++++++++++++++++++++++++++---------------------------- 1 file changed, 32 insertions(+), 34 deletions(-) diff --git a/README.md b/README.md index 0220c75b7..0b20b1f71 100644 --- a/README.md +++ b/README.md @@ -7,10 +7,8 @@ This repo contains the source code for cross-platform [.NET Core](http://github. Looking for V1 of the .NET Core tooling? ---------------------------------------- -If you are looking for the v1.0.1 release of the .NET Core tools (CLI, MSBuild and the new csproj), head over to https://dot.net/core and download! - -> **Note:** the release/2.0.0 branch of the CLI repo is based on the upcoming v2 of .NET Core and is considered pre-release. For production-level usage, please use the -> v1 of the tools. +> **Note:** the release/2.0.2 branch of the CLI repo is based on an upcoming update of the SDK and is considered pre-release. For production-level usage, please use the +> released version of the tools available at https://dot.net/core Found an issue? --------------- @@ -66,7 +64,7 @@ In order to download just the .NET Core runtime without the SDK, please visit ht -| Platform | Latest Daily Build
*release/2.0.0*
[![][version-badge]][version] | +| Platform | Latest Daily Build
*release/2.0.2*
[![][version-badge]][version] | | -------- | :-------------------------------------: | | **Windows x64** | [Installer][win-x64-installer] - [Checksum][win-x64-installer-checksum]
[zip][win-x64-zip] - [Checksum][win-x64-zip-checksum] | | **Windows x86** | [Installer][win-x86-installer] - [Checksum][win-x86-installer-checksum]
[zip][win-x86-zip] - [Checksum][win-x86-zip-checksum] | @@ -82,7 +80,7 @@ In order to download just the .NET Core runtime without the SDK, please visit ht | **OpenSUSE 42.1** | tar.gz - See **Linux x64** | -| Latest Coherent Build2
*release/2.0.0* | +| Latest Coherent Build2
*release/2.0.2* | |:------:| | [![][coherent-version-badge]][coherent-version] | @@ -91,44 +89,44 @@ Reference notes: >

**2**: *A 'coherent' build is defined as a build where the Runtime version matches between the CLI and Asp.NET.* -[version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/latest.version -[coherent-version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/latest.coherent.version +[version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.2/latest.version +[coherent-version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.2/latest.coherent.version [comment]: # (The latest versions are always the same across all platforms. Just need one to show, so picking win-x64's svg.) -[version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/win_x64_Release_version_badge.svg -[coherent-version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/win_x86_Release_coherent_badge.svg +[version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.2/win_x64_Release_version_badge.svg +[coherent-version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.2/win_x86_Release_coherent_badge.svg -[win-x64-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-win-x64.exe -[win-x64-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-win-x64.exe.sha -[win-x64-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-win-x64.zip -[win-x64-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-win-x64.zip.sha +[win-x64-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.2/dotnet-sdk-latest-win-x64.exe +[win-x64-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.2/dotnet-sdk-latest-win-x64.exe.sha +[win-x64-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.2/dotnet-sdk-latest-win-x64.zip +[win-x64-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.2/dotnet-sdk-latest-win-x64.zip.sha -[win-x86-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-win-x86.exe -[win-x86-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-win-x86.exe.sha -[win-x86-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-win-x86.zip -[win-x86-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-win-x86.zip.sha +[win-x86-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.2/dotnet-sdk-latest-win-x86.exe +[win-x86-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.2/dotnet-sdk-latest-win-x86.exe.sha +[win-x86-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.2/dotnet-sdk-latest-win-x86.zip +[win-x86-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.2/dotnet-sdk-latest-win-x86.zip.sha -[osx-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-osx-x64.pkg -[osx-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-osx-x64.pkg.sha -[osx-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-osx-x64.tar.gz -[osx-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-osx-x64.tar.gz.sha +[osx-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.2/dotnet-sdk-latest-osx-x64.pkg +[osx-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.2/dotnet-sdk-latest-osx-x64.pkg.sha +[osx-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.2/dotnet-sdk-latest-osx-x64.tar.gz +[osx-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.2/dotnet-sdk-latest-osx-x64.tar.gz.sha -[linux-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-linux-x64.tar.gz -[linux-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-linux-x64.tar.gz.sha +[linux-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.2/dotnet-sdk-latest-linux-x64.tar.gz +[linux-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.2/dotnet-sdk-latest-linux-x64.tar.gz.sha -[ubuntu-14.04-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-ubuntu-x64.deb -[ubuntu-14.04-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-ubuntu-x64.deb.sha +[ubuntu-14.04-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.2/dotnet-sdk-latest-ubuntu-x64.deb +[ubuntu-14.04-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.2/dotnet-sdk-latest-ubuntu-x64.deb.sha -[ubuntu-16.04-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-ubuntu.16.04-x64.deb -[ubuntu-16.04-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-ubuntu.16.04-x64.deb.sha +[ubuntu-16.04-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.2/dotnet-sdk-latest-ubuntu.16.04-x64.deb +[ubuntu-16.04-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.2/dotnet-sdk-latest-ubuntu.16.04-x64.deb.sha -[ubuntu-16.10-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-ubuntu.16.10-x64.deb -[ubuntu-16.10-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-ubuntu.16.10-x64.deb.sha +[ubuntu-16.10-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.2/dotnet-sdk-latest-ubuntu.16.10-x64.deb +[ubuntu-16.10-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.2/dotnet-sdk-latest-ubuntu.16.10-x64.deb.sha -[debian-8-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-debian-x64.deb -[debian-8-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-debian-x64.deb.sha +[debian-8-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.2/dotnet-sdk-latest-debian-x64.deb +[debian-8-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.2/dotnet-sdk-latest-debian-x64.deb.sha -[rhel-7-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-rhel-x64.rpm -[rhel-7-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-rhel-x64.rpm.sha +[rhel-7-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.2/dotnet-sdk-latest-rhel-x64.rpm +[rhel-7-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.2/dotnet-sdk-latest-rhel-x64.rpm.sha # Debian daily feed From cf657095abd4ed9f5b4b285ac3045016bc509dc6 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Wed, 16 Aug 2017 15:35:54 -0700 Subject: [PATCH 03/25] Insert NuGet Build 4.4.0-preview1-4365 into cli --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index d7186931f..20f4172b6 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -15,7 +15,7 @@ 2.0.0-preview3-20170804-1 $(CLI_NETSDK_Version) - 4.3.0-rtm-4382 + 4.4.0-preview1-4365 2.0.0-preview3-25514-04 2.0.0-rel-20170629-588 15.3.0-preview-20170628-02 From acd690f7dafc81fd186c4a11c9d5066696c90a35 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Wed, 16 Aug 2017 18:51:36 -0700 Subject: [PATCH 04/25] Update to SDK build which includes NuGet 4.4.0-preview1-4365 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 20f4172b6..74a1bb940 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -12,7 +12,7 @@ - 2.0.0-preview3-20170804-1 + 2.0.2-vspre-20170817-4 $(CLI_NETSDK_Version) 4.4.0-preview1-4365 From 069d94cbe48e78fdd100571cbc660fc2755e4899 Mon Sep 17 00:00:00 2001 From: NuGet Team Bot Date: Tue, 22 Aug 2017 16:55:48 -0700 Subject: [PATCH 05/25] Insert NuGet Build 4.4.0-preview1-4434 into cli --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 74a1bb940..0f86fb988 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -15,7 +15,7 @@ 2.0.2-vspre-20170817-4 $(CLI_NETSDK_Version) - 4.4.0-preview1-4365 + 4.4.0-preview1-4434 2.0.0-preview3-25514-04 2.0.0-rel-20170629-588 15.3.0-preview-20170628-02 From f9b798b11904cdece37d6eeaa0005cd619b4210e Mon Sep 17 00:00:00 2001 From: William Li Date: Thu, 24 Aug 2017 12:20:28 -0700 Subject: [PATCH 06/25] Dummy commit to trigger CI due to 20170824.1 publish nuget time out 20170824.1 From 1a369405492cc9fd6f8cbf5c5312f5251a53064a Mon Sep 17 00:00:00 2001 From: William Li Date: Fri, 25 Aug 2017 11:12:34 -0700 Subject: [PATCH 07/25] Update CLI_NETSDK_Version SDK to 2.0.2-vspre-20170825-1 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 0f86fb988..64e767dd2 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -12,7 +12,7 @@ - 2.0.2-vspre-20170817-4 + 2.0.2-vspre-20170825-1 $(CLI_NETSDK_Version) 4.4.0-preview1-4434 From d7665ea316f96aafe1b2206f1b3a659c7c6d0a2b Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Tue, 29 Aug 2017 13:51:35 -0700 Subject: [PATCH 08/25] Sign additional files Some files that get their signature invalidated by crossgen were missing from the Signing.proj list. --- build/Signing.proj | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/build/Signing.proj b/build/Signing.proj index e3bef0122..d3eebb140 100644 --- a/build/Signing.proj +++ b/build/Signing.proj @@ -38,14 +38,23 @@ $(InternalCertificateId) From 0024199cfdf3db6a18958f9ad27fc5ee5af8c04f Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Tue, 29 Aug 2017 17:19:22 -0700 Subject: [PATCH 09/25] Trigger build --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 0b20b1f71..dadc1c611 100644 --- a/README.md +++ b/README.md @@ -88,7 +88,6 @@ Reference notes: > **1**: *Our Debian packages are put together slightly differently than the other OS specific installers. Instead of combining everything, we have separate component packages that depend on each other. If you're installing these directly from the .deb files (via dpkg or similar), then you'll need to install the [corresponding Host, Host FX Resolver, and Shared Framework packages](https://github.com/dotnet/core-setup#daily-builds) before installing the Sdk package.* >

**2**: *A 'coherent' build is defined as a build where the Runtime version matches between the CLI and Asp.NET.* - [version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.2/latest.version [coherent-version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.2/latest.coherent.version [comment]: # (The latest versions are always the same across all platforms. Just need one to show, so picking win-x64's svg.) From eb6767a7ccd4cc52856d5ea9114a106eb1f7e0bf Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Wed, 30 Aug 2017 08:31:42 -0700 Subject: [PATCH 10/25] Trigger build --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index dadc1c611..0b20b1f71 100644 --- a/README.md +++ b/README.md @@ -88,6 +88,7 @@ Reference notes: > **1**: *Our Debian packages are put together slightly differently than the other OS specific installers. Instead of combining everything, we have separate component packages that depend on each other. If you're installing these directly from the .deb files (via dpkg or similar), then you'll need to install the [corresponding Host, Host FX Resolver, and Shared Framework packages](https://github.com/dotnet/core-setup#daily-builds) before installing the Sdk package.* >

**2**: *A 'coherent' build is defined as a build where the Runtime version matches between the CLI and Asp.NET.* + [version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.2/latest.version [coherent-version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.2/latest.coherent.version [comment]: # (The latest versions are always the same across all platforms. Just need one to show, so picking win-x64's svg.) From 4854b27cf803707f9d7e49752a24e948ceadbd80 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Wed, 30 Aug 2017 10:13:30 -0700 Subject: [PATCH 11/25] Remove EOL openSuSE 42.1 --- netci.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netci.groovy b/netci.groovy index f41a78758..51fe2f60e 100644 --- a/netci.groovy +++ b/netci.groovy @@ -9,7 +9,7 @@ def project = GithubProject def branch = GithubBranchName def isPR = true -def platformList = ['Linux:x64:Release', 'Debian8.2:x64:Debug', 'Ubuntu:x64:Release', 'Ubuntu16.04:x64:Debug', 'Ubuntu16.10:x64:Debug', 'OSX10.12:x64:Release', 'Windows_NT:x64:Release', 'Windows_NT:x86:Debug', 'RHEL7.2:x64:Release', 'CentOS7.1:x64:Debug', 'OpenSUSE42.1:x64:Debug'] +def platformList = ['Linux:x64:Release', 'Debian8.2:x64:Debug', 'Ubuntu:x64:Release', 'Ubuntu16.04:x64:Debug', 'Ubuntu16.10:x64:Debug', 'OSX10.12:x64:Release', 'Windows_NT:x64:Release', 'Windows_NT:x86:Debug', 'RHEL7.2:x64:Release', 'CentOS7.1:x64:Debug'] def static getBuildJobName(def configuration, def os, def architecture) { return configuration.toLowerCase() + '_' + os.toLowerCase() + '_' + architecture.toLowerCase() From 7a918997a0a22c6fc572a242aa46fe601508dc18 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Wed, 30 Aug 2017 12:35:11 -0700 Subject: [PATCH 12/25] Push the 'VS.Redist.Common.Net.Core.SDK*.nupkg' packages to blob storage. --- build/Publish.targets | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build/Publish.targets b/build/Publish.targets index 2fb513838..4003e181c 100644 --- a/build/Publish.targets +++ b/build/Publish.targets @@ -35,6 +35,10 @@ Condition=" '$(IsLinuxDistroSpecific)' != 'true' "/> + + From 71fe48fa43ae4c18d167ca7e4e53c3768a717384 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Wed, 30 Aug 2017 13:29:17 -0700 Subject: [PATCH 13/25] Trivial change to start a VSO build --- README.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 0b20b1f71..fcbc7ae5b 100644 --- a/README.md +++ b/README.md @@ -63,7 +63,6 @@ In order to download just the .NET Core runtime without the SDK, please visit ht > want to install the latest released versions, please check out the [section above](#looking-for-v1-of-the-net-core-tooling). - | Platform | Latest Daily Build
*release/2.0.2*
[![][version-badge]][version] | | -------- | :-------------------------------------: | | **Windows x64** | [Installer][win-x64-installer] - [Checksum][win-x64-installer-checksum]
[zip][win-x64-zip] - [Checksum][win-x64-zip-checksum] | @@ -88,11 +87,10 @@ Reference notes: > **1**: *Our Debian packages are put together slightly differently than the other OS specific installers. Instead of combining everything, we have separate component packages that depend on each other. If you're installing these directly from the .deb files (via dpkg or similar), then you'll need to install the [corresponding Host, Host FX Resolver, and Shared Framework packages](https://github.com/dotnet/core-setup#daily-builds) before installing the Sdk package.* >

**2**: *A 'coherent' build is defined as a build where the Runtime version matches between the CLI and Asp.NET.* - -[version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.2/latest.version -[coherent-version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.2/latest.coherent.version [comment]: # (The latest versions are always the same across all platforms. Just need one to show, so picking win-x64's svg.) +[version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.2/latest.version [version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.2/win_x64_Release_version_badge.svg +[coherent-version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.2/latest.coherent.version [coherent-version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.2/win_x86_Release_coherent_badge.svg [win-x64-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.2/dotnet-sdk-latest-win-x64.exe From 4a6d5a94d04db01c2f10b872d0c38a78779bd086 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Wed, 30 Aug 2017 15:19:41 -0700 Subject: [PATCH 14/25] The enumeration of the nupkg packages depends on that the creation of packages has already occurred. --- build/Publish.targets | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/build/Publish.targets b/build/Publish.targets index 4003e181c..89d41afb6 100644 --- a/build/Publish.targets +++ b/build/Publish.targets @@ -26,8 +26,11 @@ UploadChecksumsToAzure; PublishDebFilesToDebianRepo; PublishCliVersionBadge" /> - - + + + From fd8f3e7ebe73e3789e4a44e1bbc0cc7c69b2e633 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Wed, 30 Aug 2017 16:14:15 -0700 Subject: [PATCH 15/25] Turning on the NuPkg publishing from Win x86 --- build/Publish.targets | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/build/Publish.targets b/build/Publish.targets index 89d41afb6..446996b31 100644 --- a/build/Publish.targets +++ b/build/Publish.targets @@ -28,16 +28,14 @@ PublishCliVersionBadge" /> - + + Condition=" '$(PUBLISH_NUPKG_TO_AZURE_BLOB)' != '' AND '$(OS)' == 'Windows_NT' And '$(Architecture)' == 'x64' "/> Date: Wed, 30 Aug 2017 16:16:08 -0700 Subject: [PATCH 16/25] Removing extra line feeds... --- build/Publish.targets | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build/Publish.targets b/build/Publish.targets index 446996b31..bc9a387b6 100644 --- a/build/Publish.targets +++ b/build/Publish.targets @@ -26,8 +26,7 @@ UploadChecksumsToAzure; PublishDebFilesToDebianRepo; PublishCliVersionBadge" /> - - + Date: Thu, 31 Aug 2017 16:59:17 -0700 Subject: [PATCH 17/25] Remove out of support ubuntu1610 --- .../dotnet-cli-build/CheckIfAllBuildsHavePublished.cs | 1 - netci.groovy | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/build_projects/dotnet-cli-build/CheckIfAllBuildsHavePublished.cs b/build_projects/dotnet-cli-build/CheckIfAllBuildsHavePublished.cs index 67b3ec6fe..1dfb0b3de 100644 --- a/build_projects/dotnet-cli-build/CheckIfAllBuildsHavePublished.cs +++ b/build_projects/dotnet-cli-build/CheckIfAllBuildsHavePublished.cs @@ -56,7 +56,6 @@ namespace Microsoft.DotNet.Cli.Build { "rhel_7_x64", false }, { "ubuntu_14_04_x64", false }, { "ubuntu_16_04_x64", false }, - { "ubuntu_16_10_x64", false }, { "linux_x64", false } }; diff --git a/netci.groovy b/netci.groovy index 51fe2f60e..ca09235d7 100644 --- a/netci.groovy +++ b/netci.groovy @@ -9,7 +9,7 @@ def project = GithubProject def branch = GithubBranchName def isPR = true -def platformList = ['Linux:x64:Release', 'Debian8.2:x64:Debug', 'Ubuntu:x64:Release', 'Ubuntu16.04:x64:Debug', 'Ubuntu16.10:x64:Debug', 'OSX10.12:x64:Release', 'Windows_NT:x64:Release', 'Windows_NT:x86:Debug', 'RHEL7.2:x64:Release', 'CentOS7.1:x64:Debug'] +def platformList = ['Linux:x64:Release', 'Debian8.2:x64:Debug', 'Ubuntu:x64:Release', 'Ubuntu16.04:x64:Debug', 'OSX10.12:x64:Release', 'Windows_NT:x64:Release', 'Windows_NT:x86:Debug', 'RHEL7.2:x64:Release', 'CentOS7.1:x64:Debug'] def static getBuildJobName(def configuration, def os, def architecture) { return configuration.toLowerCase() + '_' + os.toLowerCase() + '_' + architecture.toLowerCase() From 5ce59a61792548b1e7119a0b79a4a0b552a662a0 Mon Sep 17 00:00:00 2001 From: NuGet Team Bot Date: Wed, 13 Sep 2017 17:27:51 -0700 Subject: [PATCH 18/25] Insert NuGet Build 4.4.0-preview3-4475 into cli --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 64e767dd2..f8aa051bb 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -15,7 +15,7 @@ 2.0.2-vspre-20170825-1 $(CLI_NETSDK_Version) - 4.4.0-preview1-4434 + 4.4.0-preview3-4475 2.0.0-preview3-25514-04 2.0.0-rel-20170629-588 15.3.0-preview-20170628-02 From c6482b89193af3e9bd5928c03add1848a4851c31 Mon Sep 17 00:00:00 2001 From: Vijay Ramakrishnan Date: Thu, 14 Sep 2017 10:39:42 -0700 Subject: [PATCH 19/25] Updating the websdk version to 2.0.0-rel-20170908-653 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 64e767dd2..6843aa1a5 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -17,7 +17,7 @@ 4.4.0-preview1-4434 2.0.0-preview3-25514-04 - 2.0.0-rel-20170629-588 + 2.0.0-rel-20170908-653 15.3.0-preview-20170628-02 $(CLI_SharedFrameworkVersion) $(CLI_SharedFrameworkVersion) From f71eecfdd3e45a968aa10fef53790f7bb8994796 Mon Sep 17 00:00:00 2001 From: Andy Gerlicher Date: Thu, 14 Sep 2017 11:04:59 -0700 Subject: [PATCH 20/25] MSBuild 15.4.7 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 64e767dd2..864b317aa 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -2,7 +2,7 @@ 2.0.0 - 15.3.409 + 15.4.7 2.3.2-beta1-61921-05 2.3.0-pre-20170727-1 1.6.0-beta2-25304 From ba1c8eda24d7b1d52e91b8af1fb20c763fa3698a Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Fri, 15 Sep 2017 14:14:25 -0700 Subject: [PATCH 21/25] Insert SDK 2.0.2-vspre-20170915-1 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index ffdd7a70f..327e0be28 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -12,7 +12,7 @@ - 2.0.2-vspre-20170825-1 + 2.0.2-vspre-20170915-1 $(CLI_NETSDK_Version) 4.4.0-preview3-4475 From ce885f76c465b9d7080fa46ff4c3854b95c5f8fa Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Thu, 21 Sep 2017 15:21:29 -0700 Subject: [PATCH 22/25] Insert SDK 2.0.2-vspre-20170921-5 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 327e0be28..0b028d79e 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -12,7 +12,7 @@ - 2.0.2-vspre-20170915-1 + 2.0.2-vspre-20170921-5 $(CLI_NETSDK_Version) 4.4.0-preview3-4475 From 442011ea6430620a8b07ec7aa91df5827ed5dae7 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Mon, 25 Sep 2017 09:49:46 -0700 Subject: [PATCH 23/25] Changing ItAddsFxVersionAsAParamWhenTheToolHasThePrefercliruntimeFile to expect 2.0.0 as the runtime version. --- .../GivenAProjectToolsCommandResolver.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs index 7fe281b5d..83a877151 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs @@ -309,7 +309,7 @@ namespace Microsoft.DotNet.Tests result.Should().NotBeNull(); - result.Args.Should().Contain("--fx-version 2.0.1"); + result.Args.Should().Contain("--fx-version 2.0.0"); } [Fact] From 2669306319f24fbb908f0b443cc37741918a87e2 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Mon, 25 Sep 2017 10:42:40 -0700 Subject: [PATCH 24/25] Fixing merges. --- README.md | 69 ++++++++----------- build/BranchInfo.props | 4 +- build/DependencyVersions.props | 4 +- .../GivenAProjectToolsCommandResolver.cs | 2 +- 4 files changed, 35 insertions(+), 44 deletions(-) diff --git a/README.md b/README.md index 73d3b490b..b7981d26c 100644 --- a/README.md +++ b/README.md @@ -7,15 +7,10 @@ This repo contains the source code for cross-platform [.NET Core](http://github. Looking for V1 of the .NET Core tooling? ---------------------------------------- -<<<<<<< HEAD If you are looking for the v1.0.1 release of the .NET Core tools (CLI, MSBuild and the new csproj), see https://dot.net/core. -> **Note:** the release/2.0.0 branch of the CLI repo is based on the upcoming v2 of .NET Core and is considered pre-release. For production-level usage, use -> v1 of the tools. -======= -> **Note:** the release/2.0.2 branch of the CLI repo is based on an upcoming update of the SDK and is considered pre-release. For production-level usage, please use the +> **Note:** the release/2.0.0 branch of the CLI repo is based on an upcoming update of the SDK and is considered pre-release. For production-level usage, please use the > released version of the tools available at https://dot.net/core ->>>>>>> release/2.0-vs Found an issue? --------------- @@ -66,14 +61,10 @@ You can download the .NET Core SDK as either an installer (MSI, PKG) or a zip (z To download the .NET Core runtime **without** the SDK, visit https://github.com/dotnet/core-setup#daily-builds. -<<<<<<< HEAD > **Note:** Be aware that the following installers are the **latest bits**. If you > want to install the latest released versions, check out the [preceding section](#looking-for-v1-of-the-net-core-tooling). | Platform | Latest Daily Build
*release/2.0.0*
[![][version-badge]][version] | -======= -| Platform | Latest Daily Build
*release/2.0.2*
[![][version-badge]][version] | ->>>>>>> release/2.0-vs | -------- | :-------------------------------------: | | **Windows x64** | [Installer][win-x64-installer] - [Checksum][win-x64-installer-checksum]
[zip][win-x64-zip] - [Checksum][win-x64-zip-checksum] | | **Windows x86** | [Installer][win-x86-installer] - [Checksum][win-x86-installer-checksum]
[zip][win-x86-zip] - [Checksum][win-x86-zip-checksum] | @@ -89,7 +80,7 @@ To download the .NET Core runtime **without** the SDK, visit https://github.com/ | **OpenSUSE 42.1** | tar.gz - See **Linux x64** | -| Latest Coherent Build2
*release/2.0.2* | +| Latest Coherent Build2
*release/2.0.0* | |:------:| | [![][coherent-version-badge]][coherent-version] | @@ -98,43 +89,43 @@ Reference notes: >

**2**: *A 'coherent' build is defined as a build where the Runtime version matches between the CLI and Asp.NET.* [comment]: # (The latest versions are always the same across all platforms. Just need one to show, so picking win-x64's svg.) -[version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.2/latest.version -[version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.2/win_x64_Release_version_badge.svg -[coherent-version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.2/latest.coherent.version -[coherent-version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.2/win_x86_Release_coherent_badge.svg +[version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/latest.version +[version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/win_x64_Release_version_badge.svg +[coherent-version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/latest.coherent.version +[coherent-version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/win_x86_Release_coherent_badge.svg -[win-x64-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.2/dotnet-sdk-latest-win-x64.exe -[win-x64-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.2/dotnet-sdk-latest-win-x64.exe.sha -[win-x64-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.2/dotnet-sdk-latest-win-x64.zip -[win-x64-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.2/dotnet-sdk-latest-win-x64.zip.sha +[win-x64-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-win-x64.exe +[win-x64-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-win-x64.exe.sha +[win-x64-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-win-x64.zip +[win-x64-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-win-x64.zip.sha -[win-x86-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.2/dotnet-sdk-latest-win-x86.exe -[win-x86-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.2/dotnet-sdk-latest-win-x86.exe.sha -[win-x86-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.2/dotnet-sdk-latest-win-x86.zip -[win-x86-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.2/dotnet-sdk-latest-win-x86.zip.sha +[win-x86-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-win-x86.exe +[win-x86-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-win-x86.exe.sha +[win-x86-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-win-x86.zip +[win-x86-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-win-x86.zip.sha -[osx-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.2/dotnet-sdk-latest-osx-x64.pkg -[osx-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.2/dotnet-sdk-latest-osx-x64.pkg.sha -[osx-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.2/dotnet-sdk-latest-osx-x64.tar.gz -[osx-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.2/dotnet-sdk-latest-osx-x64.tar.gz.sha +[osx-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-osx-x64.pkg +[osx-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-osx-x64.pkg.sha +[osx-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-osx-x64.tar.gz +[osx-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-osx-x64.tar.gz.sha -[linux-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.2/dotnet-sdk-latest-linux-x64.tar.gz -[linux-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.2/dotnet-sdk-latest-linux-x64.tar.gz.sha +[linux-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-linux-x64.tar.gz +[linux-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-linux-x64.tar.gz.sha -[ubuntu-14.04-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.2/dotnet-sdk-latest-ubuntu-x64.deb -[ubuntu-14.04-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.2/dotnet-sdk-latest-ubuntu-x64.deb.sha +[ubuntu-14.04-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-ubuntu-x64.deb +[ubuntu-14.04-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-ubuntu-x64.deb.sha -[ubuntu-16.04-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.2/dotnet-sdk-latest-ubuntu.16.04-x64.deb -[ubuntu-16.04-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.2/dotnet-sdk-latest-ubuntu.16.04-x64.deb.sha +[ubuntu-16.04-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-ubuntu.16.04-x64.deb +[ubuntu-16.04-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-ubuntu.16.04-x64.deb.sha -[ubuntu-16.10-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.2/dotnet-sdk-latest-ubuntu.16.10-x64.deb -[ubuntu-16.10-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.2/dotnet-sdk-latest-ubuntu.16.10-x64.deb.sha +[ubuntu-16.10-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-ubuntu.16.10-x64.deb +[ubuntu-16.10-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-ubuntu.16.10-x64.deb.sha -[debian-8-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.2/dotnet-sdk-latest-debian-x64.deb -[debian-8-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.2/dotnet-sdk-latest-debian-x64.deb.sha +[debian-8-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-debian-x64.deb +[debian-8-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-debian-x64.deb.sha -[rhel-7-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.2/dotnet-sdk-latest-rhel-x64.rpm -[rhel-7-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.2/dotnet-sdk-latest-rhel-x64.rpm.sha +[rhel-7-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-rhel-x64.rpm +[rhel-7-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-rhel-x64.rpm.sha # Debian daily feed diff --git a/build/BranchInfo.props b/build/BranchInfo.props index a439784b3..0d146ab2a 100644 --- a/build/BranchInfo.props +++ b/build/BranchInfo.props @@ -1,6 +1,6 @@ - release/2.0.2 - release/2.0.2 + release/2.0.0 + release/2.0.0 diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index b4c96b351..3c43151c8 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,7 +1,7 @@ - 2.0.0 + 2.0.1 15.4.7 2.3.2-beta1-61921-05 2.3.0-pre-20170727-1 @@ -12,7 +12,7 @@ - 2.0.2-vspre-20170921-5 + 2.0.1-servicing-20170926-1 $(CLI_NETSDK_Version) 4.4.0-preview3-4475 diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs index 83a877151..7fe281b5d 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs @@ -309,7 +309,7 @@ namespace Microsoft.DotNet.Tests result.Should().NotBeNull(); - result.Args.Should().Contain("--fx-version 2.0.0"); + result.Args.Should().Contain("--fx-version 2.0.1"); } [Fact] From 84c56a8a926b4cb22765f13b41e0a628501e6cee Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Tue, 26 Sep 2017 15:39:02 -0700 Subject: [PATCH 25/25] Updating the CLI branding to 2.0.3 --- build/Branding.props | 2 +- build/Version.props | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/Branding.props b/build/Branding.props index 0f2120db1..9a66fdc2d 100644 --- a/build/Branding.props +++ b/build/Branding.props @@ -1,6 +1,6 @@ - Microsoft .NET Core SDK - 2.0.2 + Microsoft .NET Core SDK - 2.0.3 .NET Standard Support for Visual Studio 2015 Microsoft .NET Core Runtime - 2.0.1 Microsoft .NET Core Host - 2.0.1 diff --git a/build/Version.props b/build/Version.props index 49a490286..2f7ba1395 100644 --- a/build/Version.props +++ b/build/Version.props @@ -2,8 +2,8 @@ 2 0 - 2 - vspre + 3 + servicing $(VersionMajor).$(VersionMinor).$(VersionPatch)-$(ReleaseSuffix) $(VersionMajor).$(VersionMinor).$(VersionPatch).$(CommitCount)