From 864dd694e0ded877e2ebfa2a8df02bdc5161c93f Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Thu, 19 Jan 2017 17:05:24 -0800
Subject: [PATCH] Use a branch that lets us produce packages with a specific
 build number

---
 build.ps1                                                    | 2 +-
 build.sh                                                     | 2 +-
 build/common.props                                           | 2 ++
 .../Properties/AssemblyInfo.cs                               | 4 ++++
 ...icrosoft.AspNetCore.Mvc.Razor.ViewCompilation.Test.csproj | 2 +-
 version.props                                                | 5 ++---
 6 files changed, 11 insertions(+), 6 deletions(-)
 create mode 100644 src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Properties/AssemblyInfo.cs

diff --git a/build.ps1 b/build.ps1
index f55974f3e6..0605b59c01 100644
--- a/build.ps1
+++ b/build.ps1
@@ -33,7 +33,7 @@ cd $PSScriptRoot
 $repoFolder = $PSScriptRoot
 $env:REPO_FOLDER = $repoFolder
 
-$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/rel/1.0.0-msbuild3.zip"
+$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/feature/msbuild.zip"
 if ($env:KOREBUILD_ZIP)
 {
     $koreBuildZip=$env:KOREBUILD_ZIP
diff --git a/build.sh b/build.sh
index 2f6c7fe68e..07997d6c83 100755
--- a/build.sh
+++ b/build.sh
@@ -2,7 +2,7 @@
 repoFolder="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 cd $repoFolder
 
-koreBuildZip="https://github.com/aspnet/KoreBuild/archive/rel/1.0.0-msbuild3.zip"
+koreBuildZip="https://github.com/aspnet/KoreBuild/archive/feature/msbuild.zip"
 if [ ! -z $KOREBUILD_ZIP ]; then
     koreBuildZip=$KOREBUILD_ZIP
 fi
diff --git a/build/common.props b/build/common.props
index 50550ebaf4..a56db90e38 100644
--- a/build/common.props
+++ b/build/common.props
@@ -9,6 +9,8 @@
     <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)../build/Key.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
     <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
+    <Copyright Condition="'$(Copyright)'==''">© Microsoft Corporation. All rights reserved.</Copyright>
+    <NeutralLanguage Condition="'$(NeutralLanguage)'==''">en-US</NeutralLanguage>
   </PropertyGroup>
 
    <!-- Workaround for RC3 VS -->
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..0715293428
--- /dev/null
+++ b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Properties/AssemblyInfo.cs
@@ -0,0 +1,4 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+[assembly: System.Reflection.AssemblyMetadata("Serviceable", "True")]
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test.csproj b/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test.csproj
index 39e0f7835a..cf0d82d06a 100644
--- a/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test.csproj
+++ b/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test.csproj
@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20161123-03" />
-    <PackageReference Include="Microsoft.NETCore.App" Version="1.1.0" />
+    <PackageReference Include="Microsoft.NETCore.App" Version="1.2.0-*" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta4-build1194" />
     <PackageReference Include="xunit" Version="2.2.0-beta4-build3444" />
   </ItemGroup>
diff --git a/version.props b/version.props
index a1285c53c6..3b55ecf128 100644
--- a/version.props
+++ b/version.props
@@ -1,8 +1,7 @@
 <!-- This file may be overwritten by automation. Only values allowed here are VersionPrefix and VersionSuffix.  -->
 <Project>
     <PropertyGroup>
-        <Version>1.1.0-rtm</Version>
-        <Version Condition="'$(BuildNumber)'!=''">$(Version)-$(BuildNumber)</Version>
-        <PackageVersion>1.1.0</PackageVersion>
+        <Version>1.1.0-msbuild3-update1</Version>
+        <PackageVersion>1.1.0-msbuild3-update1</PackageVersion>
     </PropertyGroup>
 </Project>
\ No newline at end of file