From 206db0558e56bae216ba94636692c5be899b69c8 Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@gmail.com>
Date: Thu, 13 Dec 2018 23:36:42 -0800
Subject: [PATCH] Update buildtools and add properties to skip IIS tests

---
 build/dependencies.folderbuilds.props                         | 2 +-
 build/dependencies.props                                      | 2 +-
 global.json                                                   | 2 +-
 korebuild-lock.txt                                            | 4 ++--
 .../Microsoft.AspNetCore.Hosting.FunctionalTests.csproj       | 2 +-
 .../Directory.Build.targets                                   | 4 ++--
 .../Microsoft.AspNetCore.AspNetCoreModule.pkgproj             | 1 +
 .../Directory.Build.targets                                   | 3 +--
 .../Microsoft.AspNetCore.AspNetCoreModuleV2.pkgproj           | 1 +
 .../IIS.BackwardsCompatibility.FunctionalTests.csproj         | 1 +
 .../IIS.ForwardsCompatibility.FunctionalTests.csproj          | 1 +
 .../IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj   | 1 +
 .../IISExpress.FunctionalTests.csproj                         | 1 +
 src/SiteExtensions/build/dependencies.props                   | 2 +-
 14 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/build/dependencies.folderbuilds.props b/build/dependencies.folderbuilds.props
index 4b79b9ef4f..ce3cf06ac9 100644
--- a/build/dependencies.folderbuilds.props
+++ b/build/dependencies.folderbuilds.props
@@ -1,7 +1,7 @@
 <!-- This file is temporary while we rework dependencies management. It is used when building individual folders as if they were repos. -->
 <Project>
   <PropertyGroup>
-    <InternalAspNetCoreSdkPackageVersion>2.2.1-build-20181114.3</InternalAspNetCoreSdkPackageVersion>
+    <InternalAspNetCoreSdkPackageVersion>2.2.1-build-20181213.2</InternalAspNetCoreSdkPackageVersion>
     <MicrosoftAspNetCoreAspNetCoreModulePackageVersion>2.2.0</MicrosoftAspNetCoreAspNetCoreModulePackageVersion>
     <MicrosoftAspNetCoreAuthenticationCorePackageVersion>2.2.0</MicrosoftAspNetCoreAuthenticationCorePackageVersion>
     <MicrosoftAspNetCoreConnectionsAbstractionsPackageVersion>2.2.0</MicrosoftAspNetCoreConnectionsAbstractionsPackageVersion>
diff --git a/build/dependencies.props b/build/dependencies.props
index 0f81352533..6b0d8fcf9b 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -26,7 +26,7 @@
     <MicrosoftAspNetCoreBuildToolsApiCheckPackageVersion>$(KoreBuildVersion)</MicrosoftAspNetCoreBuildToolsApiCheckPackageVersion>
     <InternalAspNetCoreSdkPackageVersion>$(KoreBuildVersion)</InternalAspNetCoreSdkPackageVersion>
     <InternalAspNetCoreSiteExtensionSdkPackageVersion>$(KoreBuildVersion)</InternalAspNetCoreSiteExtensionSdkPackageVersion>
-    <InternalAspNetCoreSdkPackageVersion Condition=" '$(KoreBuildVersion)' == '' ">2.2.1-build-20181114.3</InternalAspNetCoreSdkPackageVersion>
+    <InternalAspNetCoreSdkPackageVersion Condition=" '$(KoreBuildVersion)' == '' ">2.2.1-build-20181213.2</InternalAspNetCoreSdkPackageVersion>
   </PropertyGroup>
 
   <!-- These are package versions that should not be overridden or updated by automation. -->
diff --git a/global.json b/global.json
index 9997b00a1d..fdc8dcb766 100644
--- a/global.json
+++ b/global.json
@@ -3,6 +3,6 @@
         "version": "2.2.100"
     },
     "msbuild-sdks": {
-        "Internal.AspNetCore.Sdk": "2.2.1-build-20181207.6"
+        "Internal.AspNetCore.Sdk": "2.2.1-build-20181213.2"
     }
 }
diff --git a/korebuild-lock.txt b/korebuild-lock.txt
index df21be17c2..0ced696eb0 100644
--- a/korebuild-lock.txt
+++ b/korebuild-lock.txt
@@ -1,2 +1,2 @@
-version:2.2.1-build-20181207.6
-commithash:d1a9489a535083be907f761827b4b44f4de3c92b
+version:2.2.1-build-20181213.2
+commithash:3a55c25b0b17b7ff51010d1b4dfe50a0295c0a4f
diff --git a/src/Hosting/test/FunctionalTests/Microsoft.AspNetCore.Hosting.FunctionalTests.csproj b/src/Hosting/test/FunctionalTests/Microsoft.AspNetCore.Hosting.FunctionalTests.csproj
index 138043764a..9549fb0a47 100644
--- a/src/Hosting/test/FunctionalTests/Microsoft.AspNetCore.Hosting.FunctionalTests.csproj
+++ b/src/Hosting/test/FunctionalTests/Microsoft.AspNetCore.Hosting.FunctionalTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModule/Directory.Build.targets b/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModule/Directory.Build.targets
index 8a8fe2dfeb..9837fe8fd4 100644
--- a/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModule/Directory.Build.targets
+++ b/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModule/Directory.Build.targets
@@ -18,6 +18,8 @@
     <!-- There is no documentation  -->
     <RunPackageAnalysis>false</RunPackageAnalysis>
 
+    <PackageId>$(MSBuildProjectName)</PackageId>
+    <TargetPath>$(PackageOutputPath)$(PackageId).$(PackageVersion).nupkg</TargetPath>
   </PropertyGroup>
 
   <Target Name="GetArtifactInfo" Returns="@(ArtifactInfo)" Condition=" '$(IsPackable)' != 'false' ">
@@ -29,6 +31,4 @@
       </ArtifactInfo>
     </ItemGroup>
   </Target>
-
-  <Import Project="$(RepositoryRoot)build\tasks\RepoTasks.tasks" />
 </Project>
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModule/Microsoft.AspNetCore.AspNetCoreModule.pkgproj b/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModule/Microsoft.AspNetCore.AspNetCoreModule.pkgproj
index 29465aecb3..97b177aabb 100644
--- a/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModule/Microsoft.AspNetCore.AspNetCoreModule.pkgproj
+++ b/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModule/Microsoft.AspNetCore.AspNetCoreModule.pkgproj
@@ -2,6 +2,7 @@
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
 
   <PropertyGroup>
+    <PackageId>$(MSBuildProjectName)</PackageId>
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <TargetFramework>netcoreapp2.2</TargetFramework>
     <PackageTags>aspnetcore</PackageTags>
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModuleV2/Directory.Build.targets b/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModuleV2/Directory.Build.targets
index 8a8fe2dfeb..7163fff522 100644
--- a/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModuleV2/Directory.Build.targets
+++ b/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModuleV2/Directory.Build.targets
@@ -18,6 +18,7 @@
     <!-- There is no documentation  -->
     <RunPackageAnalysis>false</RunPackageAnalysis>
 
+    <TargetPath>$(PackageOutputPath)$(PackageId).$(PackageVersion).nupkg</TargetPath>
   </PropertyGroup>
 
   <Target Name="GetArtifactInfo" Returns="@(ArtifactInfo)" Condition=" '$(IsPackable)' != 'false' ">
@@ -29,6 +30,4 @@
       </ArtifactInfo>
     </ItemGroup>
   </Target>
-
-  <Import Project="$(RepositoryRoot)build\tasks\RepoTasks.tasks" />
 </Project>
diff --git a/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2.pkgproj b/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2.pkgproj
index 617d35fe82..2cc6e089fd 100644
--- a/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2.pkgproj
+++ b/src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2.pkgproj
@@ -2,6 +2,7 @@
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
 
   <PropertyGroup>
+    <PackageId>$(MSBuildProjectName)</PackageId>
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <TargetFramework>netcoreapp2.2</TargetFramework>
     <PackageTags>aspnetcore</PackageTags>
diff --git a/src/Servers/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj b/src/Servers/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj
index b86e9482c6..57a12c2e1c 100644
--- a/src/Servers/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj
+++ b/src/Servers/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj
@@ -4,6 +4,7 @@
     <TargetFrameworks>netcoreapp2.2</TargetFrameworks>
     <TestGroupName>IISBackwardsCompatibility.FunctionalTests</TestGroupName>
     <DisableFastUpToDateCheck>True</DisableFastUpToDateCheck>
+    <SkipTests Condition=" '$(SkipIISBackwardsCompatibilityTests)' == 'true' ">true</SkipTests>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Servers/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj b/src/Servers/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj
index 27208537e3..70e9db7bc0 100644
--- a/src/Servers/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj
+++ b/src/Servers/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj
@@ -4,6 +4,7 @@
     <TargetFrameworks>netcoreapp2.2</TargetFrameworks>
     <TestGroupName>IISForwardsCompatibility.FunctionalTests</TestGroupName>
     <DisableFastUpToDateCheck>True</DisableFastUpToDateCheck>
+    <SkipTests Condition=" '$(SkipIISForwardsCompatibilityTests)' == 'true' ">true</SkipTests>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Servers/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj b/src/Servers/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj
index b6a113cb7f..9714018f13 100644
--- a/src/Servers/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj
+++ b/src/Servers/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj
@@ -4,6 +4,7 @@
     <TargetFrameworks>netcoreapp2.2</TargetFrameworks>
     <TestGroupName>IIS.FunctionalTests</TestGroupName>
     <DisableFastUpToDateCheck>True</DisableFastUpToDateCheck>
+    <SkipTests Condition=" '$(SkipIISTests)' == 'true' ">true</SkipTests>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Servers/IIS/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj b/src/Servers/IIS/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj
index 1eea688532..cfeed6eca7 100644
--- a/src/Servers/IIS/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj
+++ b/src/Servers/IIS/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFrameworks>netcoreapp2.2</TargetFrameworks>
     <DisableFastUpToDateCheck>True</DisableFastUpToDateCheck>
+    <SkipTests Condition=" '$(SkipIISExpressTests)' == 'true' ">true</SkipTests>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/SiteExtensions/build/dependencies.props b/src/SiteExtensions/build/dependencies.props
index 509b6df59d..e78dbcf3ba 100644
--- a/src/SiteExtensions/build/dependencies.props
+++ b/src/SiteExtensions/build/dependencies.props
@@ -4,7 +4,7 @@
   </PropertyGroup>
 
   <PropertyGroup Label="Package Versions">
-    <InternalAspNetCoreSdkPackageVersion>2.2.1-build-20181114.3</InternalAspNetCoreSdkPackageVersion>
+    <InternalAspNetCoreSdkPackageVersion>2.2.1-build-20181213.2</InternalAspNetCoreSdkPackageVersion>
     <MicrosoftAspNetCoreAzureAppServicesSiteExtension21PackageVersion>2.1.1</MicrosoftAspNetCoreAzureAppServicesSiteExtension21PackageVersion>
     <MicrosoftAspNetCoreAzureAppServicesSiteExtension22PackageVersion>2.2.0</MicrosoftAspNetCoreAzureAppServicesSiteExtension22PackageVersion>
     <MicrosoftNETTestSdkPackageVersion>15.6.1</MicrosoftNETTestSdkPackageVersion>