Cleanup workaround

aspnet · Dec 13, 2016 · ae8fc23 · ae8fc23
1 parent 2cb4f74
commit ae8fc23
Show file tree

Hide file tree

Showing 15 changed files with 37 additions and 32 deletions.
diff --git a/build/common.props b/build/common.props
@@ -0,0 +1,9 @@
+<Project>
+  <Import Project="..\version.props" />
+  <Import Project="..\.build\common.props" Condition="Exists('..\.build\common.props')" />
+  <PropertyGroup>
+    <CustomAfterMicrosoftCommonTargets>$(MSBuildThisFileDirectory)common.targets</CustomAfterMicrosoftCommonTargets>
+    <RepositoryUrl>https://github.com/aspnet/BuildTools</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+  </PropertyGroup>
+</Project>
diff --git a/build/common.targets b/build/common.targets
@@ -0,0 +1,11 @@
+<Project>
+  <PropertyGroup>
+    <BuildDependsOn>$(BuildDependsOn);EnsureInitialized</BuildDependsOn>
+  </PropertyGroup>
+  <Target Name="EnsureInitialized"
+          Condition="!Exists('$(MSBuildThisFileDirectory)..\.build\common.props')">
+    <!--TODO automagically execute build initialize. Will require changes to KoreBuild to avoid race conditions if invoked multiple times-->
+    <Error File="$(MSBuildProjectFile)"
+           Text="Project has not been initialized. Run 'build initialize' in the solution directory '$(MSBuildThisFileDirectory)'" />
+  </Target>
+</Project>
diff --git a/dir.props b/dir.props
diff --git a/makefile.shade b/makefile.shade
@@ -12,12 +12,6 @@ k-standard-goals
 #xml-docs-test .clean .build-compile description='Check generated XML documentation files for errors' target='test'
   k-xml-docs-test
 
-@{/* Workaround https://github.com/dotnet/sdk/issues/423 */}
-#re-restore target='initialize'
-    dotnet command='msbuild src/SplitPackages/SplitPackages.csproj /t:Restore /p:TargetFramework=net451'
-    dotnet command='msbuild test/ApiCheck.Test/ApiCheck.Test.csproj /t:Restore /p:TargetFramework=net452'
-    dotnet command='msbuild src/Microsoft.AspNetCore.BuildTools.ApiCheck/Microsoft.AspNetCore.BuildTools.ApiCheck.csproj /t:Restore /p:TargetFramework=net451'
-
 #nuget-pack target='package'
   @{
     var configuration = E("Configuration");

diff --git a/src/DependenciesPackager/DependenciesPackager.csproj b/src/DependenciesPackager/DependenciesPackager.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="..\..\build\common.props" />
 
   <PropertyGroup>
     <Description>Creates a zip package with the expanded version of our nuget packages that can be used as a local cache</Description>

diff --git a/src/Microsoft.AspNetCore.BuildTools.ApiCheck/Microsoft.AspNetCore.BuildTools.ApiCheck.csproj b/src/Microsoft.AspNetCore.BuildTools.ApiCheck/Microsoft.AspNetCore.BuildTools.ApiCheck.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="..\..\build\common.props" />
   <PropertyGroup>
     <VersionPrefix>1.0.1</VersionPrefix>
     <TargetFrameworks>netcoreapp1.0;net451</TargetFrameworks>
-    <RuntimeIdentifier Condition="'$(TargetFramework)'=='net451'">win7-x64</RuntimeIdentifier>
+    <RuntimeIdentifier Condition=" '$(TargetFramework)'!='netcoreapp1.0' ">win7-x64</RuntimeIdentifier>
     <OutputType>exe</OutputType>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/NuGetPackageVerifier.Task/NuGetPackageVerifier.Task.csproj b/src/NuGetPackageVerifier.Task/NuGetPackageVerifier.Task.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
 
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="..\..\build\common.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard1.6</TargetFramework>

diff --git a/src/NuGetPackageVerifier/NuGetPackageVerifier.csproj b/src/NuGetPackageVerifier/NuGetPackageVerifier.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="..\..\build\common.props" />
 
   <PropertyGroup>
     <Description>Verifies Asp.Net Core NuGet packages.</Description>

diff --git a/src/PackageCacheUploader/PackageCacheUploader.csproj b/src/PackageCacheUploader/PackageCacheUploader.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="..\..\build\common.props" />
 
   <PropertyGroup>
     <Description>Creates a zip package with the expanded version of our nuget packages that can be used as a local cache</Description>

diff --git a/src/PackageClassifier/PackageClassifier.csproj b/src/PackageClassifier/PackageClassifier.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="..\..\build\common.props" />
 
   <PropertyGroup>
     <Description>Classifies a set of packages from several directories based on information from a csv file</Description>
     <VersionPrefix>1.0.1</VersionPrefix>
     <TargetFrameworks>netstandard1.6;net451</TargetFrameworks>
-    <RuntimeIdentifier Condition="'$(TargetFramework)'=='net451'">win7-x64</RuntimeIdentifier>
+    <OutputType>library</OutputType>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/SplitPackages/SplitPackages.csproj b/src/SplitPackages/SplitPackages.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="..\..\build\common.props" />
   <PropertyGroup>
     <Description>Copies NuGet packages form a given source folder into a specific set of folders based on a CSV file.</Description>
     <VersionPrefix>1.0.1</VersionPrefix>
     <TargetFrameworks>netcoreapp1.0;net451</TargetFrameworks>
-    <RuntimeIdentifier Condition="'$(TargetFramework)'=='net451'">win7-x64</RuntimeIdentifier>
+    <RuntimeIdentifier Condition=" '$(TargetFramework)'!='netcoreapp1.0' ">win7-x64</RuntimeIdentifier>
     <DebugType>portable</DebugType>
     <OutputType>exe</OutputType>
   </PropertyGroup>

diff --git a/src/VersionTool/VersionTool.csproj b/src/VersionTool/VersionTool.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="..\..\build\common.props" />
 
   <PropertyGroup>
     <TargetFramework>netcoreapp1.0</TargetFramework>

diff --git a/test/ApiCheck.Test/ApiCheck.Test.csproj b/test/ApiCheck.Test/ApiCheck.Test.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="..\..\build\common.props" />
   <PropertyGroup>
     <TargetFrameworks>netcoreapp1.0;net452</TargetFrameworks>
-    <RuntimeIdentifier Condition="'$(TargetFramework)'=='net452'">win7-x64</RuntimeIdentifier>
+    <RuntimeIdentifier Condition=" '$(TargetFramework)'!='netcoreapp1.0' ">win7-x64</RuntimeIdentifier>
     <OutputType>exe</OutputType>
   </PropertyGroup>
   <ItemGroup>

diff --git a/test/ApiCheckBaseline.V1/ApiCheckBaseline.V1.csproj b/test/ApiCheckBaseline.V1/ApiCheckBaseline.V1.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="..\..\build\common.props" />
 
   <PropertyGroup>
     <TargetFrameworks>netstandard1.6;net452</TargetFrameworks>
-    <RuntimeIdentifier Condition="'$(TargetFramework)' == 'net452'">win7-x64</RuntimeIdentifier>
+    <RuntimeIdentifier Condition=" '$(TargetFramework)'!='netcoreapp1.0' ">win7-x64</RuntimeIdentifier>
     <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
   </PropertyGroup>
 

diff --git a/test/ApiCheckBaseline.V2/ApiCheckBaseline.V2.csproj b/test/ApiCheckBaseline.V2/ApiCheckBaseline.V2.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="..\..\build\common.props" />
 
   <PropertyGroup>
     <TargetFrameworks>netstandard1.6;net452</TargetFrameworks>
-    <RuntimeIdentifier Condition=" '$(TargetFramework)' == 'net452' ">win7-x64</RuntimeIdentifier>
+    <RuntimeIdentifier Condition=" '$(TargetFramework)'!='netcoreapp1.0' ">win7-x64</RuntimeIdentifier>
     <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
   </PropertyGroup>