Upgrade to RC.3

BuildTools.sln

@@ -1,7 +1,6 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26009.0
+VisualStudioVersion = 15.0.26116.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A4F4353B-C3D2-40B0-909A-5B48A748EA76}"
 EndProject
@@ -34,6 +33,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NuGetPackageVerifier.Task",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PackageCacheUploader", "src\PackageCacheUploader\PackageCacheUploader.csproj", "{EBC0BF3F-14B4-4595-980D-D4D738043D59}"
 EndProject
+Project("{13B669BE-BB05-4DDF-9536-439F39A36129}") = "Internal.AspNetCore.Sdk", "src\Internal.AspNetCore.Sdk\Internal.AspNetCore.Sdk.csproj", "{F0E4CF2B-29B9-432B-BF27-195996CA24FD}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -176,6 +177,18 @@ Global
 		{EBC0BF3F-14B4-4595-980D-D4D738043D59}.Release|x64.Build.0 = Release|x64
 		{EBC0BF3F-14B4-4595-980D-D4D738043D59}.Release|x86.ActiveCfg = Release|x86
 		{EBC0BF3F-14B4-4595-980D-D4D738043D59}.Release|x86.Build.0 = Release|x86
+		{F0E4CF2B-29B9-432B-BF27-195996CA24FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F0E4CF2B-29B9-432B-BF27-195996CA24FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F0E4CF2B-29B9-432B-BF27-195996CA24FD}.Debug|x64.ActiveCfg = Debug|x64
+		{F0E4CF2B-29B9-432B-BF27-195996CA24FD}.Debug|x64.Build.0 = Debug|x64
+		{F0E4CF2B-29B9-432B-BF27-195996CA24FD}.Debug|x86.ActiveCfg = Debug|x86
+		{F0E4CF2B-29B9-432B-BF27-195996CA24FD}.Debug|x86.Build.0 = Debug|x86
+		{F0E4CF2B-29B9-432B-BF27-195996CA24FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F0E4CF2B-29B9-432B-BF27-195996CA24FD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F0E4CF2B-29B9-432B-BF27-195996CA24FD}.Release|x64.ActiveCfg = Release|x64
+		{F0E4CF2B-29B9-432B-BF27-195996CA24FD}.Release|x64.Build.0 = Release|x64
+		{F0E4CF2B-29B9-432B-BF27-195996CA24FD}.Release|x86.ActiveCfg = Release|x86
+		{F0E4CF2B-29B9-432B-BF27-195996CA24FD}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -192,5 +205,6 @@ Global
 		{AEFC7985-27C8-468E-8EF8-E1D589C9053F} = {A4F4353B-C3D2-40B0-909A-5B48A748EA76}
 		{EF38C1CA-8A2E-4C8E-B478-7072C0140514} = {A4F4353B-C3D2-40B0-909A-5B48A748EA76}
 		{EBC0BF3F-14B4-4595-980D-D4D738043D59} = {A4F4353B-C3D2-40B0-909A-5B48A748EA76}
+		{F0E4CF2B-29B9-432B-BF27-195996CA24FD} = {A4F4353B-C3D2-40B0-909A-5B48A748EA76}
 	EndGlobalSection
 EndGlobal

build.ps1

@@ -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/feature/msbuild-rc3.zip"
 if ($env:KOREBUILD_ZIP)
 {
     $koreBuildZip=$env:KOREBUILD_ZIP

build.sh

@@ -2,7 +2,7 @@
 repoFolder="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 cd $repoFolder
 
-koreBuildZip="https://github.com/aspnet/KoreBuild/archive/feature/msbuild.zip"
+koreBuildZip="https://github.com/aspnet/KoreBuild/archive/feature/msbuild-rc3.zip"
 if [ ! -z $KOREBUILD_ZIP ]; then
     koreBuildZip=$KOREBUILD_ZIP
 fi

build/common.props

@@ -6,12 +6,30 @@
     <_AspNetToolsSdkPath>$([MSBuild]::GetDirectoryNameOfFileAbove($(MsBuildThisFileDirectory), NuGet.config))\src\Internal.AspNetCore.Sdk</_AspNetToolsSdkPath>
     <CustomBeforeMicrosoftCommonProps>$(_AspNetToolsSdkPath)\build\Internal.AspNetCore.Sdk.props</CustomBeforeMicrosoftCommonProps>
     <CustomAfterMicrosoftCommonTargets>$(_AspNetToolsSdkPath)\build\Internal.AspNetCore.Sdk.targets</CustomAfterMicrosoftCommonTargets>
-    <CustomAfterMicrosoftCommonCrossTargetingTargets>$(_AspNetToolsSdkPath)\buildCrossTargeting\Internal.AspNetCore.Sdk.targets</CustomAfterMicrosoftCommonCrossTargetingTargets>
+    <CustomAfterMicrosoftCommonCrossTargetingTargets>$(_AspNetToolsSdkPath)\buildMultiTargeting\Internal.AspNetCore.Sdk.targets</CustomAfterMicrosoftCommonCrossTargetingTargets>
   </PropertyGroup>
 
   <PropertyGroup>
     <RepositoryUrl>https://github.com/aspnet/BuildTools</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
+    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
   </PropertyGroup>
 
+  <!-- workaround https://github.com/NuGet/Home/issues/3953 -->
+  <!-- version options -->
+  <PropertyGroup>
+    <!--
+      Create second-based build number for local builds.
+      635556672000000000 is Jan 1, 2015.
+    -->
+    <_SecondBasedTimeStamp>$([System.DateTime]::UtcNow.Subtract($([System.DateTime]::FromBinary(635556672000000000))).TotalSeconds.ToString("F0"))</_SecondBasedTimeStamp>
+    <_SecondBasedTimeStamp>t$([System.Int64]::Parse($(_SecondBasedTimeStamp)).ToString("x9"))</_SecondBasedTimeStamp>
+
+    <!-- fallback build number if not set by KoreBuild-->
+    <BuildNumber Condition="'$(BuildNumber)'==''">$(_SecondBasedTimeStamp)</BuildNumber>
+    <VersionSuffix Condition="'$(VersionSuffix)'!='' AND '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
+    <VersionSuffix Condition="'$(VersionSuffix)'=='' AND '$(PackageVersion)'==''">$(BuildNumber)</VersionSuffix>
+  </PropertyGroup>
+  <!-- end workaround -->
+
 </Project>

makefile.shade

@@ -13,15 +13,6 @@ k-standard-goals
 #xml-docs-test .clean .build-compile description='Check generated XML documentation files for errors' target='test'
   k-xml-docs-test
 
-#pack-sdk target='package'
-    @{
-        var buildNumber = E("BuildNumber") ?? BuildNumber;
-        NugetPack(E("KOREBUILD_NUGET_EXE") ?? ".build/NuGet.exe",
-            "src/Internal.AspNetCore.Sdk/Internal.AspNetCore.Sdk.nuspec",
-            BUILD_DIR,
-            "-Verbosity Detailed -Properties versionsuffix=alpha-" + buildNumber);
-    }
-
 #pack-nuspecs target='package'
   @{
     var configuration = E("Configuration");

src/DependenciesPackager/DependenciesPackager.csproj

@@ -9,11 +9,6 @@
     <OutputType>exe</OutputType>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-    <EmbeddedResource Include="**\*.resx" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.DotNet.ProjectModel" Version="1.0.0-*" />
     <PackageReference Include="Microsoft.Extensions.CommandLineUtils" Version="1.0.0" />

src/Internal.AspNetCore.Sdk/Internal.AspNetCore.Sdk.csproj

@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
+
+  <Import Project="..\..\build\common.props" />
+
+  <PropertyGroup>
+    <VersionPrefix>1.0.1</VersionPrefix>
+    <TargetFramework>netstandard1.0</TargetFramework>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+    <Serviceable>false</Serviceable>
+    <Description>Build targets and extensions to Microsoft.NET.Sdk. This package is intended for Microsoft use only.</Description>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Content Include="**\*.targets;**\*.props" Exclude="$(DefaultItemExcludes)" PackagePath="%(Identity)" />
+    <PackageReference Include="NETStandard.Library" Version="1.6.1" PrivateAssets="All" />
+  </ItemGroup>
+
+</Project>

src/Internal.AspNetCore.Sdk/build/GenerateAssemblyInfo.targets

@@ -0,0 +1,44 @@
+<Project ToolsVersion="15.0">
+
+  <PropertyGroup>
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <GeneratedInternalAspNetCoreAttributeFile Condition="'$(GeneratedInternalAspNetCoreAttributeFile)'==''">$(IntermediateOutputPath)Internal.AspNetCore.Sdk.AssemblyInfo$(DefaultLanguageSourceExtension)</GeneratedInternalAspNetCoreAttributeFile>
+    <GenerateInternalAspNetCoreAttributes Condition="'$(GenerateInternalAspNetCoreAttributes)'==''">true</GenerateInternalAspNetCoreAttributes>
+  </PropertyGroup>
+
+<!--
+********************************************************************************************
+Target: GenerateInternalAspNetCoreAttributes
+
+Generates assembly attributes for ASP.NET Core binaries
+********************************************************************************************
+-->
+  <Target Name="GenerateInternalAspNetCoreAttributes"
+          BeforeTargets="CoreCompile"
+          DependsOnTargets="PrepareForBuild;CoreGenerateInternalAspNetCoreAttributes"
+          Condition="'$(GenerateInternalAspNetCoreAttributes)'=='true' and '$(DesignTimeBuild)'!='true'" />
+
+  <Target Name="CoreGenerateInternalAspNetCoreAttributes"
+          Inputs="$(MSBuildAllProjects)"
+          Outputs="$(GeneratedInternalAspNetCoreAttributeFile)" >
+
+    <ItemGroup>
+      <_InternalAspNetCoreAttributes Remove="@(_InternalAspNetCoreAttributes)" />
+      <_InternalAspNetCoreAttributes Include="System.Reflection.AssemblyMetadata" Condition="'$(Serviceable)'!='false'">
+        <_Parameter1>Serviceable</_Parameter1>
+        <_Parameter2>true</_Parameter2>
+      </_InternalAspNetCoreAttributes>
+      <!-- TODO embed commit hash -->
+    </ItemGroup>
+
+    <ItemGroup>
+      <!--Ensure generated file is not already in compile sources-->
+      <Compile Remove="$(GeneratedInternalAspNetCoreAttributeFile)"  />
+    </ItemGroup>
+
+    <WriteCodeFragment AssemblyAttributes="@(_InternalAspNetCoreAttributes)" Language="$(Language)" OutputFile="$(GeneratedInternalAspNetCoreAttributeFile)">
+      <Output TaskParameter="OutputFile" ItemName="Compile" />
+      <Output TaskParameter="OutputFile" ItemName="FileWrites" />
+    </WriteCodeFragment>
+  </Target>
+</Project>

src/Internal.AspNetCore.Sdk/build/Internal.AspNetCore.Sdk.targets

@@ -3,8 +3,6 @@ WARNING: These targets are intended for building Microsoft's ASP.NET Core repos,
 for use outside of Microsoft.
 -->
 <Project ToolsVersion="15.0">
-
-  <Import Project="$(MSBuildThisFileDirectory)Workarounds.targets" />
   <Import Project="$(MSBuildThisFileDirectory)..\targets\BuildNumber.targets" />
-
+  <Import Project="$(MSBuildThisFileDirectory)GenerateAssemblyInfo.targets" />
 </Project>

src/Internal.AspNetCore.Sdk/buildMultiTargeting/Internal.AspNetCore.Sdk.targets

@@ -0,0 +1,7 @@
+<!--
+WARNING: These targets are intended for building Microsoft's ASP.NET Core repos, and is not intended
+for use outside of Microsoft.
+-->
+<Project ToolsVersion="15.0">
+  <Import Project="$(MSBuildThisFileDirectory)..\targets\BuildNumber.targets" />
+</Project>

src/Internal.AspNetCore.Sdk/targets/BuildNumber.targets

@@ -10,23 +10,7 @@ For single-tfm projects, this will be imported from build/Internal.AspNetCore.Sd
 -->
 <Project ToolsVersion="15.0">
   <!-- version options -->
-  <PropertyGroup>
-    <!--
-      Create second-based build number for local builds.
-      635556672000000000 is Jan 1, 2015.
-    -->
-    <_SecondBasedTimeStamp>$([System.DateTime]::UtcNow.Subtract($([System.DateTime]::FromBinary(635556672000000000))).TotalSeconds.ToString("F0"))</_SecondBasedTimeStamp>
-    <_SecondBasedTimeStamp>t$([System.Int64]::Parse($(_SecondBasedTimeStamp)).ToString("x9"))</_SecondBasedTimeStamp>
-
-    <!-- for aspnet CI -->
-    <!-- TODO can be removed when we retire project.json from all repos -->
-    <BuildNumber Condition="'$(BuildNumber)'==''">$(KOREBUILD_BUILD_NUMBER)</BuildNumber>
-
-    <!-- fallback build number if not set by KoreBuild-->
-    <BuildNumber Condition="'$(BuildNumber)'==''">$(_SecondBasedTimeStamp)</BuildNumber>
-    <VersionSuffix Condition="'$(VersionSuffix)'!='' AND '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
-    <VersionSuffix Condition="'$(VersionSuffix)'=='' AND '$(PackageVersion)'==''">$(BuildNumber)</VersionSuffix>
-  </PropertyGroup>
+  <!-- TODO determine build number here instead of inside individual repos when https://github.com/NuGet/Home/issues/3953 is resolved-->
 
   <Target Name="ShowBuildVersion" BeforeTargets="PrepareForBuild">
     <Message Text="Build version: $(AssemblyName)/$(TargetFramework)/$(Version)" Importance="normal" />

src/Microsoft.AspNetCore.BuildTools.ApiCheck/Microsoft.AspNetCore.BuildTools.ApiCheck.csproj

@@ -10,11 +10,6 @@
     <OutputType>exe</OutputType>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-    <EmbeddedResource Include="**\*.resx" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.DotNet.ProjectModel" Version="1.0.0-rc3-003121" />
     <PackageReference Include="Microsoft.Extensions.CommandLineUtils" Version="1.0.0" />

src/NuGetPackageVerifier.Task/NuGetPackageVerifier.Task.csproj

@@ -9,8 +9,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="**\*.cs" />
-    <EmbeddedResource Include="**\*.resx" />
     <Content Include="build\**\*.targets">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>