From af6b9ab12e75855a7ab24e13893c4ed29bf56d39 Mon Sep 17 00:00:00 2001 From: jbeisner Date: Tue, 12 Jun 2018 22:15:53 +0000 Subject: [PATCH 1/4] Correct the 'Channel' and 'BranchName' to "release/2.1.3xx" --- build/BranchInfo.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/BranchInfo.props b/build/BranchInfo.props index f62c8fd00..961d6d290 100644 --- a/build/BranchInfo.props +++ b/build/BranchInfo.props @@ -1,6 +1,6 @@ - master - master + release/2.1.3xx + release/2.1.3xx From e45766ca1e5641ee819be31e21477c12ea46540c Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Wed, 13 Jun 2018 02:47:33 +0000 Subject: [PATCH 2/4] Update coresetup, msbuild, nugetclient, roslyn to preview1-26216-03, 15.7.177, preview1.5116, beta6-62923-07, respectively --- build/DependencyVersions.props | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index e45de7425..54f139040 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -9,15 +9,15 @@ 2.1.0 2.1.0 2.1.0 - 2.1.1-servicing-26605-02 + 2.1.1 $(MicrosoftNETCoreAppPackageVersion) - 15.7.179 + 15.7.177 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) 10.1.4-rtm-180515-0 - 2.8.1-beta6-62915-07 + 2.8.3-beta6-62923-07 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) @@ -42,7 +42,7 @@ 1.3.1 $(MicrosoftDotNetProjectJsonMigrationPackageVersion) 0.2.0-beta-62628-01 - 4.7.0-rtm.5148 + 4.8.0-preview1.5116 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From 7f0765eb33819d25a4504599493c04806c86f721 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Tue, 12 Jun 2018 20:34:32 -0700 Subject: [PATCH 3/4] Revert undesired changes --- build/DependencyVersions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 54f139040..3be1d13b8 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -11,13 +11,13 @@ 2.1.0 2.1.1 $(MicrosoftNETCoreAppPackageVersion) - 15.7.177 + 15.7.179 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) 10.1.4-rtm-180515-0 - 2.8.3-beta6-62923-07 + 2.8.1-beta6-62915-07 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) @@ -42,7 +42,7 @@ 1.3.1 $(MicrosoftDotNetProjectJsonMigrationPackageVersion) 0.2.0-beta-62628-01 - 4.8.0-preview1.5116 + 4.7.0-rtm.5148 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From 7f29a9063518eafc128473c0b57e648d867e19c7 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Wed, 13 Jun 2018 13:24:47 -0700 Subject: [PATCH 4/4] Update SDK/WebSDK dependencies to 2.1.1 --- build/DependencyVersions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 3be1d13b8..e5d4f098f 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -22,10 +22,10 @@ $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) - 2.1.300 + 2.1.301 $(MicrosoftNETSdkPackageVersion) $(MicrosoftAspNetCoreAppPackageVersion) - 2.1.300 + 2.1.301 $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) 1.0.2-beta3