From 5854e03ddc0941b9b749757a70720eb3cc799bbd Mon Sep 17 00:00:00 2001
From: Sourabh Shirhatti <shirhatti@outlook.com>
Date: Mon, 3 Apr 2017 16:06:25 -0700
Subject: [PATCH] Update Korebuild and dependency versions (#85)

Merging
---
 .gitignore                                    |   3 +-
 Build/Key.snk                                 | Bin 0 -> 596 bytes
 Build/common.props                            |  23 ++++++++++++++
 Build/dependencies.props                      |  11 +++++++
 NuGet.config                                  |   4 +--
 build.ps1                                     |  16 +++++-----
 .../aspnetcoremodule.test.csproj              |  28 ++++++++----------
 version.props                                 |   7 +++++
 8 files changed, 65 insertions(+), 27 deletions(-)
 create mode 100644 Build/Key.snk
 create mode 100644 Build/common.props
 create mode 100644 Build/dependencies.props
 create mode 100644 version.props

diff --git a/.gitignore b/.gitignore
index 9d24973eeb..03944b51ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,4 +48,5 @@ src/AspNetCore/aspnetcore_msg.rc
 src/AspNetCore/version.h
 .build
 
-*.VC.*db
\ No newline at end of file
+*.VC.*db
+global.json
\ No newline at end of file
diff --git a/Build/Key.snk b/Build/Key.snk
new file mode 100644
index 0000000000000000000000000000000000000000..e10e4889c125d3120cd9e81582243d70f7cbb806
GIT binary patch
literal 596
zcmV-a0;~N80ssI2Bme+XQ$aES1ONa50098=Iw=HCsn<ZsvmrW@<$Q#+a>z~#iVhm&
zj%TU(_THUee?3yHBjk$37y<Fzl?uL)9ivSuo;#}B6dD)De)Gj;-CpGdOOelGyF6;R
zKXR)&ujxGx!@@L+c2BRcvA}aZ<rG=2t43G@guk71#NvTux6R^5_>sB?i5#7WD$={H
zV4B!OxRPrb|8)HPg~A}8P>^=#y<)56#=E&NzcjOtPK~<4n6GHt=K$ro*T(lhby_@U
zEk(hLzk1H)0yXj<Uf8HnEtBu!TuA*PmAf$cXle6YkpNq+@Z60ghGtVxe6)1Ajj1}d
ztgvi4bgJz|V`P;etzc8pF-FM#N`%JUpHzaYX*mMNIn*G};u}`O51u$`rvZggFup%y
z5Uu>{A_5>fk-TgNoP|q6(tP2xo8zt8i%212CWM#AeCd?`hS|4~L({h~Moo(~vy&3Z
z1uI}`fd^*>o=rwbAGymj6RM^pZm(*Kfhs+Y1#`-2JPWZMK8@;ZW<LR4v7CQcE4@!q
z)U49ij|+<|%~kIOLZlXjf9x6h%%!xHcL2a{5I|b;$2l^>Ck2+9bX4YP);~fj-BU*R
zQPvW<DAZ8Z6e#YE!zCp+7M)hVxqP}{4}~6lG=>v$89!{R<a!lIoEa{Dc+j_%E<}+-
z!)tmG_q8@!i7JE*V%)C;o#1~$Q2B~A145=eCJ9-fwL>l9wM+zR>_TSkn^voYxA?2G
iKnV#iZ6Ah`K>b=@=IjYJXrxL124zR(38)nxe+&q_$QXwJ

literal 0
HcmV?d00001

diff --git a/Build/common.props b/Build/common.props
new file mode 100644
index 0000000000..c87cc995fa
--- /dev/null
+++ b/Build/common.props
@@ -0,0 +1,23 @@
+<Project>
+  <Import Project="dependencies.props" />
+  <Import Project="..\version.props" />
+
+  <PropertyGroup>
+    <Product>Microsoft ASP.NET Core</Product>
+    <RepositoryUrl>https://github.com/aspnet/AspNetCoreModule</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)Key.snk</AssemblyOriginatorKeyFile>
+    <SignAssembly>true</SignAssembly>
+    <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
+    <VersionSuffix Condition="'$(VersionSuffix)'!='' AND '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Internal.AspNetCore.Sdk" Version="$(InternalAspNetCoreSdkVersion)" PrivateAssets="All" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFrameworkIdentifier)'=='.NETFramework' AND '$(OutputType)'=='library'">
+    <PackageReference Include="NETStandard.Library" Version="$(NetStandardImplicitPackageVersion)" />
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/Build/dependencies.props b/Build/dependencies.props
new file mode 100644
index 0000000000..8c81df7f34
--- /dev/null
+++ b/Build/dependencies.props
@@ -0,0 +1,11 @@
+<Project>
+  <PropertyGroup>
+    <AspNetCoreVersion>1.2.0-*</AspNetCoreVersion>
+    <CoreFxVersion>4.3.0</CoreFxVersion>
+    <InternalAspNetCoreSdkVersion>2.0.0-*</InternalAspNetCoreSdkVersion>
+    <NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
+    <RuntimeFrameworkVersion>2.0.0-*</RuntimeFrameworkVersion>
+    <TestSdkVersion>15.0.0</TestSdkVersion>
+    <XunitVersion>2.2.0</XunitVersion>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/NuGet.config b/NuGet.config
index 4e531e985d..6f9f028ca1 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -2,7 +2,7 @@
 <configuration>
   <packageSources>
     <add key="AspNetCore" value="https://dotnet.myget.org/F/aspnetcore-ci-dev/api/v3/index.json" />
-    <add key="AspNetCore-Patch" value="https://dotnet.myget.org/F/aspnetcore-rel-1-0-3/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>
+</configuration>
\ No newline at end of file
diff --git a/build.ps1 b/build.ps1
index 0605b59c01..dc220d733f 100644
--- a/build.ps1
+++ b/build.ps1
@@ -1,6 +1,6 @@
 $ErrorActionPreference = "Stop"
 
-function DownloadWithRetry([string] $url, [string] $downloadLocation, [int] $retries) 
+function DownloadWithRetry([string] $url, [string] $downloadLocation, [int] $retries)
 {
     while($true)
     {
@@ -19,7 +19,7 @@ function DownloadWithRetry([string] $url, [string] $downloadLocation, [int] $ret
                 Start-Sleep -Seconds 10
 
             }
-            else 
+            else
             {
                 $exception = $_.Exception
                 throw $exception
@@ -33,7 +33,7 @@ cd $PSScriptRoot
 $repoFolder = $PSScriptRoot
 $env:REPO_FOLDER = $repoFolder
 
-$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/feature/msbuild.zip"
+$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/dev.zip"
 if ($env:KOREBUILD_ZIP)
 {
     $koreBuildZip=$env:KOREBUILD_ZIP
@@ -43,18 +43,18 @@ $buildFolder = ".build"
 $buildFile="$buildFolder\KoreBuild.ps1"
 
 if (!(Test-Path $buildFolder)) {
-    Write-Host "Downloading KoreBuild from $koreBuildZip"    
-    
+    Write-Host "Downloading KoreBuild from $koreBuildZip"
+
     $tempFolder=$env:TEMP + "\KoreBuild-" + [guid]::NewGuid()
     New-Item -Path "$tempFolder" -Type directory | Out-Null
 
     $localZipFile="$tempFolder\korebuild.zip"
-    
+
     DownloadWithRetry -url $koreBuildZip -downloadLocation $localZipFile -retries 6
 
     Add-Type -AssemblyName System.IO.Compression.FileSystem
     [System.IO.Compression.ZipFile]::ExtractToDirectory($localZipFile, $tempFolder)
-    
+
     New-Item -Path "$buildFolder" -Type directory | Out-Null
     copy-item "$tempFolder\**\build\*" $buildFolder -Recurse
 
@@ -64,4 +64,4 @@ if (!(Test-Path $buildFolder)) {
     }
 }
 
-&"$buildFile" $args
\ No newline at end of file
+&"$buildFile" @args
\ No newline at end of file
diff --git a/test/AspNetCoreModule.Test/aspnetcoremodule.test.csproj b/test/AspNetCoreModule.Test/aspnetcoremodule.test.csproj
index 58bcdc9a21..9da583a52b 100644
--- a/test/AspNetCoreModule.Test/aspnetcoremodule.test.csproj
+++ b/test/AspNetCoreModule.Test/aspnetcoremodule.test.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+  <Import Project="..\..\build\common.props" />
   <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
+    <TargetFramework>net46</TargetFramework>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
   </PropertyGroup>
@@ -14,22 +15,17 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Testing" Version="1.2.0-*" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="Microsoft.TestPlatform.TestHost" Version="15.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
+    <PackageReference Include="xunit" Version="$(XunitVersion)" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)" />
     <PackageReference Include="Microsoft.Web.Administration" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.2.0-*" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.2.0-*" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="1.2.0-*" />
-    <PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="1.1.0" />
-    <PackageReference Include="Microsoft.Net.Http.Headers" Version="1.1.0" />
-    <PackageReference Include="System.Management.Automation.dll" Version="10.0.10586" />
-    <PackageReference Include="xunit" Version="2.2.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />    
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
-    <Reference Include="System.Management.Automation" />    
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.Net.Http.Headers" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="System.Management.Automation.dll" Version="10.0.10586" />   
   </ItemGroup>
 
   <ItemGroup>
diff --git a/version.props b/version.props
new file mode 100644
index 0000000000..38c93687ab
--- /dev/null
+++ b/version.props
@@ -0,0 +1,7 @@
+<!-- This file may be overwritten by automation. Only values allowed here are VersionPrefix and VersionSuffix.  -->
+<Project>
+  <PropertyGroup>
+    <VersionPrefix>1.2.0</VersionPrefix>
+    <VersionSuffix>preview1</VersionSuffix>
+  </PropertyGroup>
+</Project>
\ No newline at end of file