From d59b0ef38c3732a728c8f26de65e522fc0fcc002 Mon Sep 17 00:00:00 2001
From: Justin Kotalik <jukotali@microsoft.com>
Date: Fri, 29 Dec 2017 11:38:30 -0800
Subject: [PATCH] Adds universe manifest and signing info

---
 build/repo.targets                        | 22 ++++++++++++++++------
 korebuild-lock.txt                        |  4 ++--
 nuget/AspNetCore.csproj                   |  9 ---------
 nuget/AspNetCore.nuspec                   | 16 ++++++++--------
 src/AspNetCore/AspNetCore.vcxproj         | 10 ++--------
 src/RequestHandler/RequestHandler.vcxproj | 19 +------------------
 6 files changed, 29 insertions(+), 51 deletions(-)
 delete mode 100644 nuget/AspNetCore.csproj

diff --git a/build/repo.targets b/build/repo.targets
index bbd0f38607..bacff89696 100644
--- a/build/repo.targets
+++ b/build/repo.targets
@@ -6,8 +6,8 @@
 
   <Target Name="BuildNativeAssets" DependsOnTargets="GetToolsets" BeforeTargets="Compile" >
     <ItemGroup>
-      <BuildConfigurations Include="/p:Configuration=Release /p:platform=Win32" />
-      <BuildConfigurations Include="/p:Configuration=Release /p:platform=x64" />
+      <BuildConfigurations Include="/p:Configuration=$(Configuration) /p:platform=Win32" />
+      <BuildConfigurations Include="/p:Configuration=$(Configuration) /p:platform=x64" />
     </ItemGroup>
 
     <Error
@@ -20,11 +20,21 @@
       Condition="'$(VisualStudioMSBuildx86Path)' != ''" />
   </Target>
 
+  <ItemGroup>
+    <ArtifactInfo Include="$(BuildDir)Microsoft.AspNetCore.AspNetCoreModule.$(PackageVersion).nupkg">
+      <ArtifactType>NuGetPackage</ArtifactType>
+      <PackageId>Microsoft.AspNetCore.AspNetCoreModule</PackageId>
+      <Version>$(PackageVersion)</Version>
+    </ArtifactInfo>
+    <FilesToExcludeFromSigning Include="$(BuildDir)Microsoft.AspNetCore.AspNetCoreModule.$(PackageVersion).nupkg" />
+  </ItemGroup>
+
+
   <Target Name="PackageNativeProjects">
-    <MSBuild
-      Projects="$(MSBuildThisFileDirectory)../nuget/AspNetCore.csproj"
-      Targets="Restore;Pack"
-      Properties="PackageVersion=$(PackageVersion);PackageOutputPath=$(BuildDir);BuildNumber=$(BuildNumber)" />
+    <PackNuspec NuspecPath="$(MSBuildThisFileDirectory)..\nuget\AspNetCore.nuspec"
+      DestinationFolder="$(BuildDir)"
+      Properties="version=$(PackageVersion);Configuration=$(Configuration)"
+      BasePath="$(RepositoryRoot)" />
   </Target>
   
 </Project>
\ No newline at end of file
diff --git a/korebuild-lock.txt b/korebuild-lock.txt
index 2e540bdffd..48af1771f8 100644
--- a/korebuild-lock.txt
+++ b/korebuild-lock.txt
@@ -1,2 +1,2 @@
-version:2.1.0-preview1-15638
-commithash:1d3a0c725dc6b8ae6b0e47800fd6b4d8f8b8d545
+version:2.1.0-preview1-15652
+commithash:ab2d4a4d4e6946875ed0ce608716e91950edd18c
diff --git a/nuget/AspNetCore.csproj b/nuget/AspNetCore.csproj
deleted file mode 100644
index 65727b5103..0000000000
--- a/nuget/AspNetCore.csproj
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard1.0</TargetFramework>
-    <NuspecFile>$(MSBuildThisFileDirectory)AspNetCore.nuspec</NuspecFile>
-    <NuspecProperties>version=$(PackageVersion)</NuspecProperties>
-  </PropertyGroup>
-
-</Project>
diff --git a/nuget/AspNetCore.nuspec b/nuget/AspNetCore.nuspec
index bb3c627b3e..40216d42ce 100644
--- a/nuget/AspNetCore.nuspec
+++ b/nuget/AspNetCore.nuspec
@@ -18,13 +18,13 @@
     </contentFiles>
   </metadata>
   <files>
-    <file src="..\artifacts\build\AspNetCore\bin\Release\Win32\aspnetcore.dll" target="contentFiles\any\any\x86\aspnetcore.dll" />
-    <file src="..\artifacts\build\AspNetCore\bin\Release\x64\aspnetcore.dll" target="contentFiles\any\any\x64\aspnetcore.dll" />
-    <file src="..\artifacts\build\AspNetCore\bin\Release\Win32\aspnetcorerh.dll" target="contentFiles\any\any\x86\aspnetcorerh.dll" />
-    <file src="..\artifacts\build\AspNetCore\bin\Release\x64\aspnetcorerh.dll" target="contentFiles\any\any\x64\aspnetcorerh.dll" />
-    <file src="..\artifacts\build\AspNetCore\bin\Release\x64\*.xml"/>
-    <file src="..\tools\installancm.ps1"/>
-    <file src="..\LICENSE.txt"/>
-    <file src="Microsoft.AspNetCore.AspNetCoreModule.props" target="build\" />
+    <file src="src\AspNetCore\bin\$Configuration$\Win32\aspnetcore.dll" target="contentFiles\any\any\x86\aspnetcore.dll" />
+    <file src="src\AspNetCore\bin\$Configuration$\x64\aspnetcore.dll" target="contentFiles\any\any\x64\aspnetcore.dll" />
+    <file src="src\RequestHandler\bin\$Configuration$\Win32\aspnetcorerh.dll" target="contentFiles\any\any\x86\aspnetcorerh.dll" />
+    <file src="src\RequestHandler\bin\$Configuration$\x64\aspnetcorerh.dll" target="contentFiles\any\any\x64\aspnetcorerh.dll" />
+    <file src="src\AspNetCore\bin\$Configuration$\x64\*.xml"/>
+    <file src="tools\installancm.ps1"/>
+    <file src="LICENSE.txt"/>
+    <file src="nuget\Microsoft.AspNetCore.AspNetCoreModule.props" target="build\" />
   </files>
 </package>
\ No newline at end of file
diff --git a/src/AspNetCore/AspNetCore.vcxproj b/src/AspNetCore/AspNetCore.vcxproj
index 4af4211f2e..43acff071d 100644
--- a/src/AspNetCore/AspNetCore.vcxproj
+++ b/src/AspNetCore/AspNetCore.vcxproj
@@ -71,14 +71,8 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)'=='Release'">
-    <OutDir>$(SolutionDir)artifacts\build\$(ProjectName)\bin\$(Configuration)\$(Platform)\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)artifacts\build\$(ProjectName)\bin\$(Configuration)\$(Platform)\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)artifacts\build\$(ProjectName)\bin\$(Configuration)\$(Platform)\</OutDir>
+  <PropertyGroup>
+    <OutDir>$(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
diff --git a/src/RequestHandler/RequestHandler.vcxproj b/src/RequestHandler/RequestHandler.vcxproj
index d3ffaac1cc..25d4b28ee4 100644
--- a/src/RequestHandler/RequestHandler.vcxproj
+++ b/src/RequestHandler/RequestHandler.vcxproj
@@ -72,25 +72,8 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
+  <PropertyGroup>
     <TargetName>aspnetcorerh</TargetName>
-    <OutDir>$(SolutionDir)artifacts\build\AspNetCore\bin\$(Configuration)\$(Platform)\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <TargetName>aspnetcorerh</TargetName>
-    <OutDir>$(SolutionDir)artifacts\build\AspNetCore\bin\$(Configuration)\$(Platform)\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <TargetName>aspnetcorerh</TargetName>
-    <OutDir>$(SolutionDir)artifacts\build\AspNetCore\bin\$(Configuration)\$(Platform)\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <TargetName>aspnetcorerh</TargetName>
-    <OutDir>$(SolutionDir)artifacts\build\AspNetCore\bin\$(Configuration)\$(Platform)\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>