From 2a3f6f283f34f81e2cbaf7d46b470f1ef932c34a Mon Sep 17 00:00:00 2001 From: Nate McMaster <nate.mcmaster@microsoft.com> Date: Tue, 10 Jan 2017 17:57:59 -0800 Subject: [PATCH] React to aspnet/BuildTools#145 --- NuGet.config | 1 + PlatformAbstractions.sln | 3 +-- build/common.props | 11 ++++------- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0fd623f..93f1ac4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -2,6 +2,7 @@ <configuration> <packageSources> <add key="AspNetCore" value="https://dotnet.myget.org/F/aspnetcore-ci-dev/api/v3/index.json" /> + <add key="AspNetCoreTools" value="https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json" /> <add key="NuGet" value="https://api.nuget.org/v3/index.json" /> </packageSources> </configuration> diff --git a/PlatformAbstractions.sln b/PlatformAbstractions.sln index d162a65..cfa59ef 100644 --- a/PlatformAbstractions.sln +++ b/PlatformAbstractions.sln @@ -1,13 +1,12 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26009.0 +VisualStudioVersion = 15.0.26020.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{0943D1DB-D2DA-4265-AAFD-5187B88C76D7}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{BF3D2443-F06F-4668-90EA-8EB5B014E4D9}" ProjectSection(SolutionItems) = preProject - global.json = global.json NuGet.config = NuGet.config EndProjectSection EndProject diff --git a/build/common.props b/build/common.props index 2dd52e8..55cd59f 100644 --- a/build/common.props +++ b/build/common.props @@ -1,6 +1,5 @@ <Project> <Import Project="..\version.props" /> - <Import Project="..\.build\common.props" Condition="Exists('..\.build\common.props')" /> <PropertyGroup> <Product>Microsoft .NET Extensions</Product> @@ -11,10 +10,8 @@ <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign> </PropertyGroup> - <Target Name="EnsureInitialized" - BeforeTargets="Build" - Condition="!Exists('$(MSBuildThisFileDirectory)..\.build\common.props')"> - <Error File="$(MSBuildProjectFile)" - Text="Project has not been initialized. Run 'build initialize' in the solution directory '$(MSBuildThisFileDirectory)'" /> - </Target> + <ItemGroup> + <PackageReference Include="Internal.AspNetCore.Sdk" Version="1.0.0-*" PrivateAssets="All" /> + </ItemGroup> + </Project> \ No newline at end of file