Merge branch 'release/2.2'

NuGet.config

@@ -2,10 +2,6 @@
 <configuration>
   <packageSources>
     <clear />
-    <!--
+    <!-- Restore sources should be defined in build/sources.props. -->
-      Restore sources should be defined in build/sources.props.
-      The only allowed feed here is myget.org/aspnet-tools which is required to workaround https://github.com/Microsoft/msbuild/issues/2914
-    -->
-    <add key="myget.org aspnetcore-tools" value="https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json" />
   </packageSources>
 </configuration>

build/dependencies.props

@@ -3,7 +3,7 @@
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
   <PropertyGroup Label="Package Versions">
-    <InternalAspNetCoreSdkPackageVersion>3.0.0-alpha1-20180821.3</InternalAspNetCoreSdkPackageVersion>
+    <InternalAspNetCoreSdkPackageVersion>3.0.0-alpha1-20180907.5</InternalAspNetCoreSdkPackageVersion>
     <MicrosoftAspNetCoreCertificatesGenerationSourcesPackageVersion>3.0.0-alpha1-10400</MicrosoftAspNetCoreCertificatesGenerationSourcesPackageVersion>
     <MicrosoftAspNetCoreTestingPackageVersion>3.0.0-alpha1-10400</MicrosoftAspNetCoreTestingPackageVersion>
     <MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>3.0.0-alpha1-10400</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>

korebuild-lock.txt

@@ -1,2 +1,2 @@
-version:3.0.0-alpha1-20180821.3
+version:3.0.0-alpha1-20180907.5
-commithash:0939a90812deb1c604eb9a4768869687495fc1dd
+commithash:49785528468590252ade5a7ed91f1e6de466b89f

src/Microsoft.HttpRepl/Microsoft.HttpRepl.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk;Microsoft.DotNet.GlobalTools.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -8,9 +8,8 @@
     <LangVersion>latest</LangVersion>
     <Description>Command line tool to for making HTTP calls and viewing their results.</Description>
     <PackageTags>dotnet;http;httprepl</PackageTags>
-
     <!-- This is a requirement for Microsoft tool packages only. -->
-    <GenerateToolShims>true</GenerateToolShims>
+    <PackAsToolShimRuntimeIdentifiers>win-x64;win-x86</PackAsToolShimRuntimeIdentifiers>
   </PropertyGroup>
 
   <ItemGroup>
@@ -20,7 +19,7 @@
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.Repl\Microsoft.Repl.csproj" />
   </ItemGroup>
-  
+
   <ItemGroup>
     <SignedPackageFile Include="tools/$(TargetFramework)/any/Microsoft.Repl.dll" Certificate="$(AssemblySigningCertName)" />
     <SignedPackageFile Include="tools/$(TargetFramework)/any/Newtonsoft.Json.dll" Certificate="$(AssemblySigning3rdPartyCertName)" />

src/dotnet-dev-certs/dotnet-dev-certs.csproj

@@ -1,6 +1,5 @@
 <Project>
   <Sdk Name="Microsoft.NET.Sdk" />
-  <Sdk Name="Microsoft.DotNet.GlobalTools.Sdk" />
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
@@ -9,9 +8,8 @@
     <RootNamespace>Microsoft.AspNetCore.DeveloperCertificates.Tools</RootNamespace>
     <PackageTags>dotnet;developercertificates</PackageTags>
     <PackAsTool>true</PackAsTool>
-
     <!-- This is a requirement for Microsoft tool packages only. -->
-    <GenerateToolShims>true</GenerateToolShims>
+    <PackAsToolShimRuntimeIdentifiers>win-x64;win-x86</PackAsToolShimRuntimeIdentifiers>
   </PropertyGroup>
 
   <ItemGroup>

src/dotnet-sql-cache/dotnet-sql-cache.csproj

@@ -1,6 +1,4 @@
-<Project>
+<Project Sdk="Microsoft.NET.Sdk">
-  <Sdk Name="Microsoft.NET.Sdk" />
-  <Sdk Name="Microsoft.DotNet.GlobalTools.Sdk" />
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
@@ -8,9 +6,8 @@
     <Description>Command line tool to create tables and indexes in a Microsoft SQL Server database for distributed caching.</Description>
     <PackageTags>cache;distributedcache;sqlserver</PackageTags>
     <PackAsTool>true</PackAsTool>
-
     <!-- This is a requirement for Microsoft tool packages only. -->
-    <GenerateToolShims>true</GenerateToolShims>
+    <PackAsToolShimRuntimeIdentifiers>win-x64;win-x86</PackAsToolShimRuntimeIdentifiers>
   </PropertyGroup>
 
   <ItemGroup>

src/dotnet-user-secrets/dotnet-user-secrets.csproj

@@ -1,6 +1,4 @@
-<Project>
+<Project Sdk="Microsoft.NET.Sdk">
-  <Sdk Name="Microsoft.NET.Sdk" />
-  <Sdk Name="Microsoft.DotNet.GlobalTools.Sdk" />
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
@@ -10,9 +8,8 @@
     <RootNamespace>Microsoft.Extensions.SecretManager.Tools</RootNamespace>
     <PackageTags>configuration;secrets;usersecrets</PackageTags>
     <PackAsTool>true</PackAsTool>
-
     <!-- This is a requirement for Microsoft tool packages only. -->
-    <GenerateToolShims>true</GenerateToolShims>
+    <PackAsToolShimRuntimeIdentifiers>win-x64;win-x86</PackAsToolShimRuntimeIdentifiers>
   </PropertyGroup>
 
   <ItemGroup>

src/dotnet-watch/dotnet-watch.csproj

@@ -1,6 +1,4 @@
-<Project>
+<Project Sdk="Microsoft.NET.Sdk">
-  <Sdk Name="Microsoft.NET.Sdk" />
-  <Sdk Name="Microsoft.DotNet.GlobalTools.Sdk" />
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
@@ -9,9 +7,8 @@
     <RootNamespace>Microsoft.DotNet.Watcher.Tools</RootNamespace>
     <PackageTags>dotnet;watch</PackageTags>
     <PackAsTool>true</PackAsTool>
-
     <!-- This is a requirement for Microsoft tool packages only. -->
-    <GenerateToolShims>true</GenerateToolShims>
+    <PackAsToolShimRuntimeIdentifiers>win-x64;win-x86</PackAsToolShimRuntimeIdentifiers>
   </PropertyGroup>
 
   <ItemGroup>

version.props

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <VersionPrefix>3.0.0</VersionPrefix>
     <VsixVersion>15.6</VsixVersion>
-    <VersionSuffix>preview2</VersionSuffix>
+    <VersionSuffix>preview3</VersionSuffix>
     <PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' == 'rtm' ">$(VersionPrefix)</PackageVersion>
     <PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' != 'rtm' ">$(VersionPrefix)-$(VersionSuffix)-final</PackageVersion>
     <VsixVersion Condition="'$(BuildNumber)' != ''">$(VsixVersion).$(BuildNumber)</VsixVersion>