From 64c572c8a58a088626d61326ba77f453e5f7199b Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 2 Sep 2018 12:09:51 -0700 Subject: [PATCH 1/3] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 16 ++++++++-------- korebuild-lock.txt | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 029957e745..cf1be76701 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -1,23 +1,23 @@ - + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.0-preview1-20180807.2 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 + 2.2.0-preview1-20180821.1 + 2.2.0-preview2-35143 + 2.2.0-preview2-35143 + 2.2.0-preview2-35143 + 2.2.0-preview2-35143 + 2.2.0-preview2-35143 2.0.9 2.1.2 2.2.0-preview1-26618-02 15.6.1 5.2.6 2.0.3 + 11.0.2 4.5.1 4.5.0 - 11.0.2 9.0.1 2.3.1 2.4.0 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 29a57027f1..524a2323d0 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-20180807.2 -commithash:11495dbd236104434e08cb1152fcb58cf2a20923 +version:2.2.0-preview1-20180821.1 +commithash:c8d0cc52cd1abb697be24e288ffd54f8fae8bf17 From 64a2c3ab46274613935a7a2a87c76b4b320d14b0 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Wed, 5 Sep 2018 16:34:06 -0700 Subject: [PATCH 2/3] Update branding to 2.2.0-preview3 --- version.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.props b/version.props index 91190966fa..07833713f2 100644 --- a/version.props +++ b/version.props @@ -2,7 +2,7 @@ 2.2.0 15.6 - preview2 + preview3 $(VersionPrefix) $(VersionPrefix)-$(VersionSuffix)-final $(VsixVersion).$(BuildNumber) From aa93edcee29acea037694d2a71ad02232836f69c Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 7 Sep 2018 10:01:52 -0700 Subject: [PATCH 3/3] Remove Microsoft.DotNet.GlobalTools.Sdk These targets are now part of Microsoft.NET.Sdk --- NuGet.config | 6 +----- build/dependencies.props | 2 +- korebuild-lock.txt | 4 ++-- src/Microsoft.HttpRepl/Microsoft.HttpRepl.csproj | 7 +++---- src/dotnet-dev-certs/dotnet-dev-certs.csproj | 4 +--- src/dotnet-sql-cache/dotnet-sql-cache.csproj | 7 ++----- src/dotnet-user-secrets/dotnet-user-secrets.csproj | 7 ++----- src/dotnet-watch/dotnet-watch.csproj | 7 ++----- 8 files changed, 14 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8c30f1c84e..e32bddfd51 100644 --- a/NuGet.config +++ b/NuGet.config @@ -2,10 +2,6 @@ - - + diff --git a/build/dependencies.props b/build/dependencies.props index cf1be76701..fbf093bdf8 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,7 +3,7 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.0-preview1-20180821.1 + 2.2.0-preview1-20180907.3 2.2.0-preview2-35143 2.2.0-preview2-35143 2.2.0-preview2-35143 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 524a2323d0..be535d1f04 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-20180821.1 -commithash:c8d0cc52cd1abb697be24e288ffd54f8fae8bf17 +version:2.2.0-preview1-20180907.3 +commithash:2315030c7f3de2af0f16cf64502321937b6c4315 diff --git a/src/Microsoft.HttpRepl/Microsoft.HttpRepl.csproj b/src/Microsoft.HttpRepl/Microsoft.HttpRepl.csproj index 99b86075c3..72f3e8fc1e 100644 --- a/src/Microsoft.HttpRepl/Microsoft.HttpRepl.csproj +++ b/src/Microsoft.HttpRepl/Microsoft.HttpRepl.csproj @@ -1,4 +1,4 @@ - + Exe @@ -8,9 +8,8 @@ latest Command line tool to for making HTTP calls and viewing their results. dotnet;http;httprepl - - true + win-x64;win-x86 @@ -20,7 +19,7 @@ - + diff --git a/src/dotnet-dev-certs/dotnet-dev-certs.csproj b/src/dotnet-dev-certs/dotnet-dev-certs.csproj index b785b60c42..343025749a 100644 --- a/src/dotnet-dev-certs/dotnet-dev-certs.csproj +++ b/src/dotnet-dev-certs/dotnet-dev-certs.csproj @@ -1,6 +1,5 @@ - netcoreapp2.2 @@ -9,9 +8,8 @@ Microsoft.AspNetCore.DeveloperCertificates.Tools dotnet;developercertificates true - - true + win-x64;win-x86 diff --git a/src/dotnet-sql-cache/dotnet-sql-cache.csproj b/src/dotnet-sql-cache/dotnet-sql-cache.csproj index 4ab0f3425c..3f9ce05717 100644 --- a/src/dotnet-sql-cache/dotnet-sql-cache.csproj +++ b/src/dotnet-sql-cache/dotnet-sql-cache.csproj @@ -1,6 +1,4 @@ - - - + netcoreapp2.2 @@ -8,9 +6,8 @@ Command line tool to create tables and indexes in a Microsoft SQL Server database for distributed caching. cache;distributedcache;sqlserver true - - true + win-x64;win-x86 diff --git a/src/dotnet-user-secrets/dotnet-user-secrets.csproj b/src/dotnet-user-secrets/dotnet-user-secrets.csproj index bcb37e37b2..ae77d9bffd 100644 --- a/src/dotnet-user-secrets/dotnet-user-secrets.csproj +++ b/src/dotnet-user-secrets/dotnet-user-secrets.csproj @@ -1,6 +1,4 @@ - - - + netcoreapp2.2 @@ -10,9 +8,8 @@ Microsoft.Extensions.SecretManager.Tools configuration;secrets;usersecrets true - - true + win-x64;win-x86 diff --git a/src/dotnet-watch/dotnet-watch.csproj b/src/dotnet-watch/dotnet-watch.csproj index c5210a0cd2..d5012267f8 100644 --- a/src/dotnet-watch/dotnet-watch.csproj +++ b/src/dotnet-watch/dotnet-watch.csproj @@ -1,6 +1,4 @@ - - - + netcoreapp2.2 @@ -9,9 +7,8 @@ Microsoft.DotNet.Watcher.Tools dotnet;watch true - - true + win-x64;win-x86