From 68add55652ce66533b68c0e23befd5c84328851d Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 20 Apr 2018 16:51:24 -0700 Subject: [PATCH 1/8] Update to ASP.NET Core 2.0.8 build 10024 --- build/DependencyVersions.props | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 75cab6558..f0d8966a3 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -59,16 +59,16 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.0.7 + 2.0.8 notimestamp - 2.0.7 + 2.0.8 rtm - 2.0.7 - 231 + 2.0.8 + 10024 $(AspNetCoreVersion) $(AspNetCoreVersion)-$(AspNetCoreRelease)-$(AspNetCoreRuntimePackageTimestamp) @@ -83,6 +83,7 @@ This list should be sorted most recent version to oldest. --> + From 0b885eee2357c678a6e7fa6a94b8bba03ea029d9 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Mon, 23 Apr 2018 20:02:08 -0700 Subject: [PATCH 2/8] Update to ASP.NET Core 2.0.8 build 10026 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index f0d8966a3..b3101dc55 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -68,7 +68,7 @@ 2.0.8 rtm 2.0.8 - 10024 + 10026 $(AspNetCoreVersion) $(AspNetCoreVersion)-$(AspNetCoreRelease)-$(AspNetCoreRuntimePackageTimestamp) From 98fa02ade48494fc86dec52be20a2fac4d8d9e2f Mon Sep 17 00:00:00 2001 From: Rainer Sigwald Date: Fri, 11 May 2018 13:15:30 -0500 Subject: [PATCH 3/8] MSBuild 15.7.179 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index f9aa20fb6..38f6a4787 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -4,7 +4,7 @@ 2.0.7 $(MicrosoftNETCoreAppPackageVersion) - 15.7.177 + 15.7.179 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) From 85aba00741bf82d7d6b3e7d380cb6201b490f307 Mon Sep 17 00:00:00 2001 From: Rainer Sigwald Date: Fri, 11 May 2018 13:18:16 -0500 Subject: [PATCH 4/8] MSBuild 15.7.179 --- build/DependencyVersions.props | 2 +- build/NugetConfigFile.targets | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index a5ade70f7..02ab2f564 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -5,7 +5,7 @@ $(MicrosoftAspNetCoreAllPackageVersion) 2.1.0-rtm-26508-02 $(MicrosoftNETCoreAppPackageVersion) - 15.7.177 + 15.7.179 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) diff --git a/build/NugetConfigFile.targets b/build/NugetConfigFile.targets index 22164fbbd..5e72d79b7 100644 --- a/build/NugetConfigFile.targets +++ b/build/NugetConfigFile.targets @@ -25,6 +25,7 @@ + ]]> From fb41e73046649e2831f3a4184328f7405e4b7ea6 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Fri, 11 May 2018 12:33:12 -0700 Subject: [PATCH 5/8] Updating the CLI branding to 201. --- build/Branding.props | 2 +- build/Version.props | 2 +- packaging/osx/clisdk/resources/cs.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/de.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/en.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/es.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/fr.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/it.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/ja.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/ko.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/pl.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/ru.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/tr.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html | 2 +- packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html | 2 +- packaging/windows/clisdk/bundle.wxl | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/build/Branding.props b/build/Branding.props index 049ee488e..0f129da74 100644 --- a/build/Branding.props +++ b/build/Branding.props @@ -1,6 +1,6 @@ - Microsoft .NET Core SDK - 2.1.200 + Microsoft .NET Core SDK - 2.1.201 .NET Standard Support for Visual Studio 2015 Microsoft .NET Core Runtime - 2.0.7 Microsoft .NET Core Host - 2.0.1 diff --git a/build/Version.props b/build/Version.props index 3797d611e..76eecf3a2 100644 --- a/build/Version.props +++ b/build/Version.props @@ -2,7 +2,7 @@ 2 1 - 200 + 201 preview $(VersionMajor).$(VersionMinor).$(VersionPatch)-$(ReleaseSuffix) diff --git a/packaging/osx/clisdk/resources/cs.lproj/conclusion.html b/packaging/osx/clisdk/resources/cs.lproj/conclusion.html index c4c20ac7e..a16d00f35 100644 --- a/packaging/osx/clisdk/resources/cs.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/cs.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.200
    • +
  • .NET Core SDK 2.1.201
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/de.lproj/conclusion.html b/packaging/osx/clisdk/resources/de.lproj/conclusion.html index c4c20ac7e..a16d00f35 100644 --- a/packaging/osx/clisdk/resources/de.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/de.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.200
    • +
  • .NET Core SDK 2.1.201
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/en.lproj/conclusion.html b/packaging/osx/clisdk/resources/en.lproj/conclusion.html index c4c20ac7e..a16d00f35 100644 --- a/packaging/osx/clisdk/resources/en.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/en.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.200
    • +
  • .NET Core SDK 2.1.201
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/es.lproj/conclusion.html b/packaging/osx/clisdk/resources/es.lproj/conclusion.html index c4c20ac7e..a16d00f35 100644 --- a/packaging/osx/clisdk/resources/es.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/es.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.200
    • +
  • .NET Core SDK 2.1.201
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/fr.lproj/conclusion.html b/packaging/osx/clisdk/resources/fr.lproj/conclusion.html index c4c20ac7e..a16d00f35 100644 --- a/packaging/osx/clisdk/resources/fr.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/fr.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.200
    • +
  • .NET Core SDK 2.1.201
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/it.lproj/conclusion.html b/packaging/osx/clisdk/resources/it.lproj/conclusion.html index c4c20ac7e..a16d00f35 100644 --- a/packaging/osx/clisdk/resources/it.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/it.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.200
    • +
  • .NET Core SDK 2.1.201
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/ja.lproj/conclusion.html b/packaging/osx/clisdk/resources/ja.lproj/conclusion.html index c4c20ac7e..a16d00f35 100644 --- a/packaging/osx/clisdk/resources/ja.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/ja.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.200
    • +
  • .NET Core SDK 2.1.201
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/ko.lproj/conclusion.html b/packaging/osx/clisdk/resources/ko.lproj/conclusion.html index c4c20ac7e..a16d00f35 100644 --- a/packaging/osx/clisdk/resources/ko.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/ko.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.200
    • +
  • .NET Core SDK 2.1.201
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/pl.lproj/conclusion.html b/packaging/osx/clisdk/resources/pl.lproj/conclusion.html index c4c20ac7e..a16d00f35 100644 --- a/packaging/osx/clisdk/resources/pl.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/pl.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.200
    • +
  • .NET Core SDK 2.1.201
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html b/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html index c4c20ac7e..a16d00f35 100644 --- a/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.200
    • +
  • .NET Core SDK 2.1.201
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/ru.lproj/conclusion.html b/packaging/osx/clisdk/resources/ru.lproj/conclusion.html index c4c20ac7e..a16d00f35 100644 --- a/packaging/osx/clisdk/resources/ru.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/ru.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.200
    • +
  • .NET Core SDK 2.1.201
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/tr.lproj/conclusion.html b/packaging/osx/clisdk/resources/tr.lproj/conclusion.html index c4c20ac7e..a16d00f35 100644 --- a/packaging/osx/clisdk/resources/tr.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/tr.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.200
    • +
  • .NET Core SDK 2.1.201
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html b/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html index c4c20ac7e..a16d00f35 100644 --- a/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.200
    • +
  • .NET Core SDK 2.1.201
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html b/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html index c4c20ac7e..a16d00f35 100644 --- a/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html @@ -7,7 +7,7 @@

The following was installed at /usr/local/share/dotnet

    -
  • .NET Core SDK 2.1.200
    • +
  • .NET Core SDK 2.1.201
  • .NET Core Runtime 2.0.7
  • Runtime Package Store
diff --git a/packaging/windows/clisdk/bundle.wxl b/packaging/windows/clisdk/bundle.wxl index c7cb4dbd0..9e5751518 100644 --- a/packaging/windows/clisdk/bundle.wxl +++ b/packaging/windows/clisdk/bundle.wxl @@ -50,7 +50,7 @@ The installation was successful The following were installed at [DOTNETHOME] - • .NET Core SDK 2.1.200 + • .NET Core SDK 2.1.201 • .NET Core Runtime 2.0.7 • Runtime Package Store From 1fd2a6aa9012c571a52d1eac38b56bc7d72db342 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Mon, 14 May 2018 15:46:02 +0000 Subject: [PATCH 6/8] Update clicommandlineparser, climigrate, coresetup, coresetup, coresetup, fsharp, roslyn, sdk, templating, templating, templating, websdk to rtm-62914-01, rtm-62914-02, rtm-26514-02, rtm-26514-02, rtm-26514-02, rtm-180513-0, beta6-62911-06, rtm-62914-01, beta3-20180513-1683966, beta3-20180513-1683966, beta3-20180513-1683966, rtm-20180513-1683962, respectively --- build/DependencyVersions.props | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 61d510cb8..7ddcc1bc3 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -3,36 +3,36 @@ 2.1.0-rtm-30752 $(MicrosoftAspNetCoreAllPackageVersion) - 2.1.0-rtm-26508-02 + 2.1.0-rtm-26514-02 $(MicrosoftNETCoreAppPackageVersion) 15.7.177 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 10.1.4-rtm-180508-0 - 2.8.1-beta6-62904-04 + 10.1.4-rtm-180513-0 + 2.8.1-beta6-62911-06 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) - 2.1.300-rtm-62908-02 + 2.1.300-rtm-62914-01 $(MicrosoftNETSdkPackageVersion) $(MicrosoftAspNetCoreAppPackageVersion) - 2.1.300-rtm-20180508-1667423 + 2.1.300-rtm-20180513-1683962 $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) - 1.0.2-beta3-20180508-1667431 + 1.0.2-beta3-20180513-1683966 $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 1.0.2-beta3-20180508-1667431 - 1.0.2-beta3-20180508-1667431 + 1.0.2-beta3-20180513-1683966 + 1.0.2-beta3-20180513-1683966 $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) - 2.1.0-rtm-26508-02 - 2.1.0-rtm-26508-02 - 0.1.1-rtm-62908-03 - 1.3.1-alpha-62908-03 + 2.1.0-rtm-26514-02 + 2.1.0-rtm-26514-02 + 0.1.1-rtm-62914-01 + 1.3.1-rtm-62914-02 $(MicrosoftDotNetProjectJsonMigrationPackageVersion) 0.2.0-beta-62628-01 4.8.0-preview1.5116 From ada66f28967113db3d5dcd84807c55ca3159d152 Mon Sep 17 00:00:00 2001 From: Livar Date: Mon, 14 May 2018 10:44:26 -0700 Subject: [PATCH 7/8] Reverting the asp.net store changes as they are not needed for 3xx --- build/DependencyVersions.props | 30 +----------------------------- 1 file changed, 1 insertion(+), 29 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 272889601..a5ade70f7 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -59,37 +59,9 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - - 2.0.8 - - notimestamp - - - 2.0.8 - rtm - 2.0.8 - 10026 - $(AspNetCoreVersion) - $(AspNetCoreVersion)-$(AspNetCoreRelease)-$(AspNetCoreRuntimePackageTimestamp) - - aspnetcore-store - $(AspNetCoreBranchName)-$(AspNetCoreRuntimePackageTimestamp) + $(MicrosoftAspNetCoreAppPackageVersion) - - - - - - - - - - 2.1.0-prerelease-02430-04 From 1aae04f316c14d2d57e71962b6df15c757de1d23 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Mon, 14 May 2018 13:43:09 -0700 Subject: [PATCH 8/8] Accept DropSuffix as a boolean --- build/MSBuildExtensions.targets | 2 +- build/Version.props | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/MSBuildExtensions.targets b/build/MSBuildExtensions.targets index 567c31fe4..1ada841ca 100644 --- a/build/MSBuildExtensions.targets +++ b/build/MSBuildExtensions.targets @@ -122,7 +122,7 @@ <_AspNetCoreAllTargetFrameworkVersion>$(_NETCoreAppTargetFrameworkVersion) <_AspNetCoreAppTargetFrameworkVersion>$(_AspNetCoreAllTargetFrameworkVersion) - <_NETCoreSdkIsPreview Condition=" '$(DropSuffix)' == '' ">true + <_NETCoreSdkIsPreview Condition=" '$(DropSuffix)' != 'true' ">true diff --git a/build/Version.props b/build/Version.props index c0ef71eeb..7fb3c5fff 100644 --- a/build/Version.props +++ b/build/Version.props @@ -9,14 +9,14 @@ $(VersionMajor).$(VersionMinor).$(VersionPatch) $(CliVersionNoSuffix)-$(ReleaseSuffix) $(CliVersionNoSuffix) - $(ReleaseSuffix) - $(CliVersionNoSuffix).$(CommitCount) + $(CliVersionNoSuffix).$(CommitCount) $(CliVersionNoSuffix) - $(ReleaseSuffix)-$(CommitCount) + $(ReleaseSuffix)-$(CommitCount) $(CliVersionNoSuffix)-$(ReleaseSuffix)-$(CommitCount) - $(FullNugetVersion) + $(FullNugetVersion) $(CliVersionNoSuffix) $(NugetVersion)