Update buildtools and add properties to skip IIS tests

2018-12-13 23:36:42 -08:00 · 2018-12-13 23:36:42 -08:00 · 206db0558e
parent f0990ec531
commit 206db0558e
14 changed files with 16 additions and 11 deletions
--- 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>
--- 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. -->
--- 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"
    }
 }
--- 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
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>