huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove Microsoft.DotNet.GlobalTools.Sdk 

These targets are now part of Microsoft.NET.Sdk
This commit is contained in:
Nate McMaster 2018-09-07 10:01:52 -07:00
parent 64a2c3ab46
commit aa93edcee2
No known key found for this signature in database
GPG Key ID: A778D9601BD78810
8 changed files with 14 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
NuGet.config
View File

@ -2,10 +2,6 @@
<configuration> <configuration>
<packageSources> <packageSources>
<clear /> <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> </packageSources>
</configuration> </configuration>

2
build/dependencies.props
View File

@ -3,7 +3,7 @@
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects> <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Label="Package Versions"> <PropertyGroup Label="Package Versions">
<InternalAspNetCoreSdkPackageVersion>2.2.0-preview1-20180821.1</InternalAspNetCoreSdkPackageVersion> <InternalAspNetCoreSdkPackageVersion>2.2.0-preview1-20180907.3</InternalAspNetCoreSdkPackageVersion>
<MicrosoftAspNetCoreCertificatesGenerationSourcesPackageVersion>2.2.0-preview2-35143</MicrosoftAspNetCoreCertificatesGenerationSourcesPackageVersion> <MicrosoftAspNetCoreCertificatesGenerationSourcesPackageVersion>2.2.0-preview2-35143</MicrosoftAspNetCoreCertificatesGenerationSourcesPackageVersion>
<MicrosoftAspNetCoreTestingPackageVersion>2.2.0-preview2-35143</MicrosoftAspNetCoreTestingPackageVersion> <MicrosoftAspNetCoreTestingPackageVersion>2.2.0-preview2-35143</MicrosoftAspNetCoreTestingPackageVersion>
<MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>2.2.0-preview2-35143</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion> <MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>2.2.0-preview2-35143</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>

4
korebuild-lock.txt
View File

@ -1,2 +1,2 @@
version:2.2.0-preview1-20180821.1 version:2.2.0-preview1-20180907.3
commithash:c8d0cc52cd1abb697be24e288ffd54f8fae8bf17 commithash:2315030c7f3de2af0f16cf64502321937b6c4315

5
src/Microsoft.HttpRepl/Microsoft.HttpRepl.csproj
View File

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk;Microsoft.DotNet.GlobalTools.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
@ -8,9 +8,8 @@
<LangVersion>latest</LangVersion> <LangVersion>latest</LangVersion>
<Description>Command line tool to for making HTTP calls and viewing their results.</Description> <Description>Command line tool to for making HTTP calls and viewing their results.</Description>
<PackageTags>dotnet;http;httprepl</PackageTags> <PackageTags>dotnet;http;httprepl</PackageTags>
<!-- This is a requirement for Microsoft tool packages only. --> <!-- This is a requirement for Microsoft tool packages only. -->
<GenerateToolShims>true</GenerateToolShims> <PackAsToolShimRuntimeIdentifiers>win-x64;win-x86</PackAsToolShimRuntimeIdentifiers>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

4
src/dotnet-dev-certs/dotnet-dev-certs.csproj
View File

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

7
src/dotnet-sql-cache/dotnet-sql-cache.csproj
View File

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

7
src/dotnet-user-secrets/dotnet-user-secrets.csproj
View File

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

7
src/dotnet-watch/dotnet-watch.csproj
View File

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