Merge branch 'release/2.1' into release/2.2

2019-01-07 10:27:41 -08:00 · 2019-01-07 10:27:41 -08:00 · 2e67864995
parent 0926b93b98 375e9d2cbd
commit 2e67864995
22 changed files with 24 additions and 157 deletions
--- a/Directory.Build.props
+++ b/Directory.Build.props
@ -88,6 +88,7 @@
    <GoogleTestSubmoduleRoot>$(RepositoryRoot)src\submodules\googletest\</GoogleTestSubmoduleRoot>

    <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
+    <DisableDeterministicSourceRoot Condition="'$(IsSampleProject)' == 'true' OR '$(IsTestAssetProject)' == 'true'">true</DisableDeterministicSourceRoot>
  </PropertyGroup>

  <PropertyGroup>
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@ -61,6 +61,5 @@
  <Import Project="eng\targets\Cpp.Common.targets"  Condition="'$(MSBuildProjectExtension)' == '.vcxproj'" />
  <Import Project="eng\targets\CSharp.Common.targets"  Condition="'$(MSBuildProjectExtension)' == '.csproj'" />
  <Import Project="eng\targets\FSharp.Common.targets"  Condition="'$(MSBuildProjectExtension)' == '.fsproj'" />
-  <Import Project="eng\targets\SharedFx.Common.targets"  Condition="'$(MSBuildProjectExtension)' == '.shfxproj'" />
  <Import Project="eng\targets\Wix.Common.targets"  Condition="'$(MSBuildProjectExtension)' == '.wixproj'" />
 </Project>
--- a/build/buildorder.props
+++ b/build/buildorder.props
@ -10,7 +10,6 @@
    <RepositoryBuildOrder Include="EntityFrameworkCore" Order="8" />
    <RepositoryBuildOrder Include="MvcPrecompilation" Order="15" RootPath="$(RepositoryRoot)src\MvcPrecompilation\" />
    <RepositoryBuildOrder Include="Scaffolding" Order="15" />
-    <RepositoryBuildOrder Include="MusicStore" Order="16" RootPath="$(RepositoryRoot)src\MusicStore\" />
    <RepositoryBuildOrder Include="SignalR" Order="16" RootPath="$(RepositoryRoot)src\SignalR\" />
    <RepositoryBuildOrder Include="AuthSamples" Order="16" RootPath="$(RepositoryRoot)src\AuthSamples\" />
    <RepositoryBuildOrder Include="Templating" Order="17" RootPath="$(RepositoryRoot)src\Templating\" />
--- a/build/dependencies.props
+++ b/build/dependencies.props
@ -28,7 +28,7 @@
    <MicrosoftAspNetCoreBuildToolsApiCheckPackageVersion>$(KoreBuildVersion)</MicrosoftAspNetCoreBuildToolsApiCheckPackageVersion>
    <InternalAspNetCoreSdkPackageVersion>$(KoreBuildVersion)</InternalAspNetCoreSdkPackageVersion>
    <InternalAspNetCoreSiteExtensionSdkPackageVersion>$(KoreBuildVersion)</InternalAspNetCoreSiteExtensionSdkPackageVersion>
-    <InternalAspNetCoreSdkPackageVersion Condition=" '$(KoreBuildVersion)' == '' ">2.2.1-build-20181213.2</InternalAspNetCoreSdkPackageVersion>
+    <InternalAspNetCoreSdkPackageVersion Condition=" '$(KoreBuildVersion)' == '' ">2.2.1-build-20190104.5</InternalAspNetCoreSdkPackageVersion>
  </PropertyGroup>

  <!-- These are package versions that should not be overridden or updated by automation. -->
--- a/build/repo.props
+++ b/build/repo.props
@ -107,6 +107,7 @@
                          $(RepositoryRoot)src\Razor\**\*.*proj;
                          $(RepositoryRoot)src\Mvc\**\*.*proj;
                          $(RepositoryRoot)src\Azure\**\*.*proj;
+                          $(RepositoryRoot)src\MusicStore\**\*.*proj;
                          "
                        Exclude="
                          @(ProjectToExclude);
--- a/build/submodules.props
+++ b/build/submodules.props
@ -42,7 +42,6 @@

    <!-- Test-only repos -->
    <Repository Include="AuthSamples" RootPath="$(RepositoryRoot)src\AuthSamples\" PatchPolicy="AlwaysUpdateAndCascadeVersions" />
-    <Repository Include="MusicStore" RootPath="$(RepositoryRoot)src\MusicStore\" PatchPolicy="AlwaysUpdateAndCascadeVersions" />
  </ItemGroup>

  <ItemGroup>
--- a/eng/Dependencies.props
+++ b/eng/Dependencies.props
@ -42,6 +42,7 @@ and are generated based on the last package release.
    <LatestPackageReference Include="Microsoft.Extensions.Caching.Redis" Version="$(MicrosoftExtensionsCachingRedisPackageVersion)" />
    <LatestPackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="$(MicrosoftExtensionsCachingSqlServerPackageVersion)" />
    <LatestPackageReference Include="Microsoft.Extensions.CommandLineUtils.Sources" Version="$(MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion)" />
+    <LatestPackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="$(MicrosoftExtensionsConfigurationBinderPackageVersion)" />
    <LatestPackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="$(MicrosoftExtensionsConfigurationCommandLinePackageVersion)" />
    <LatestPackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion)" />
    <LatestPackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="$(MicrosoftExtensionsConfigurationFileExtensionsPackageVersion)" />
--- a/korebuild-lock.txt
+++ b/korebuild-lock.txt
@ -1,2 +1,2 @@
-version:2.2.1-build-20181213.2
-commithash:3a55c25b0b17b7ff51010d1b4dfe50a0295c0a4f
+version:2.2.1-build-20190104.5
+commithash:abf5766bd636c29b089ea2995ada30de00d563ff
--- a/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj
+++ b/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj
@ -14,6 +14,8 @@
    <None Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
  </ItemGroup>

+  <Import Project="$(MvcTestingTargets)" Condition="'$(MvcTestingTargets)' != ''" />
+
  <ItemGroup>
    <ProjectReference Include="..\..\testassets\Identity.DefaultUI.WebSite\Identity.DefaultUI.WebSite.csproj" />

@ -23,5 +25,4 @@
    <Reference Include="AngleSharp" />
  </ItemGroup>

-  <Import Project="$(MvcTestingTargets)" Condition="'$(MvcTestingTargets)' != ''" />
 </Project>
--- a/src/MusicStore/.gitignore
+++ b/src/MusicStore/.gitignore
@ -1,43 +0,0 @@
-[Oo]bj/
-[Bb]in/
-.vs/
-*.xap
-*.user
-/TestResults
-*.vspscc
-*.vssscc
-*.suo
-*.cache
-*.docstates
-*.log
-_ReSharper.*
-*.csproj.user
-*[Rr]e[Ss]harper.user
-_ReSharper.*/
-packages/*
-artifacts/*
-PublishProfiles/
-*.psess
-*.vsp
-*.pidb
-*.userprefs
-*DS_Store
-*.ncrunchsolution
-*.log
-*.vspx
-/.symbols
-nuget.exe
-*net45.csproj
-*k10.csproj
-App_Data/
-bower_components
-node_modules
-*.sln.ide
-*.ng.ts
-*.sln.ide
-.build/
-.testpublish/
-launchSettings.json
-.vscode/
-TestResults/
-global.json
--- a/src/MusicStore/Directory.Build.props
+++ b/src/MusicStore/Directory.Build.props
@ -1,12 +0,0 @@
-<Project>
-  <Import
-    Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), AspNetCoreSettings.props))\AspNetCoreSettings.props"
-    Condition=" '$(CI)' != 'true' AND '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), AspNetCoreSettings.props))' != '' " />
-
-  <Import Project="build\dependencies.props" />
-  <Import Project="build\sources.props" />
-
-  <PropertyGroup>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-  </PropertyGroup>
-</Project>
--- a/src/MusicStore/MusicStore.sln
+++ b/src/MusicStore/MusicStore.sln
@ -36,12 +36,9 @@ Global
 		RuntimeStore|Any CPU = RuntimeStore|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{3CFBED5D-2ED8-49DB-96FB-BDAA748DC5A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3CFBED5D-2ED8-49DB-96FB-BDAA748DC5A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3CFBED5D-2ED8-49DB-96FB-BDAA748DC5A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3CFBED5D-2ED8-49DB-96FB-BDAA748DC5A0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3CFBED5D-2ED8-49DB-96FB-BDAA748DC5A0}.RuntimeStore|Any CPU.ActiveCfg = RuntimeStore|Any CPU
-		{3CFBED5D-2ED8-49DB-96FB-BDAA748DC5A0}.RuntimeStore|Any CPU.Build.0 = RuntimeStore|Any CPU
+		{3CFBED5D-2ED8-49DB-96FB-BDAA748DC5A0}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{3CFBED5D-2ED8-49DB-96FB-BDAA748DC5A0}.Release|Any CPU.ActiveCfg = Release|x86
+		{3CFBED5D-2ED8-49DB-96FB-BDAA748DC5A0}.RuntimeStore|Any CPU.ActiveCfg = RuntimeStore|x86
 		{CA663205-77DE-4E55-B300-85594181B5A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CA663205-77DE-4E55-B300-85594181B5A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CA663205-77DE-4E55-B300-85594181B5A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
--- a/src/MusicStore/build/repo.targets
+++ b/src/MusicStore/build/repo.targets
@ -1,39 +0,0 @@
-<Project>
-
-  <ItemGroup>
-    <Solutions Update="$(RepositoryRoot)MusicStore.sln" Condition="'$(RUN_RUNTIME_STORE_TESTS)' == 'true'">
-      <AdditionalProperties>Configuration=RuntimeStore</AdditionalProperties>
-    </Solutions>
-  </ItemGroup>
-
-  <PropertyGroup>
-    <MusicStoreE2ETestProject>$(RepositoryRoot)test\MusicStore.E2ETests\MusicStore.E2ETests.csproj</MusicStoreE2ETestProject>
-  </PropertyGroup>
-
-  <Target Name="_FilterTestProjects" BeforeTargets="TestProjects"
-    Condition="'$(RUN_TESTS_ON_NANO)'=='true' Or '$(RUN_RUNTIME_STORE_TESTS)'=='true'">
-
-    <Warning Text="Updated test projects to run only the project '$(MusicStoreE2ETestProject)' as the variable 'RUN_TESTS_ON_NANO' is set to '$(RUN_TESTS_ON_NANO)'" Condition="'$(RUN_TESTS_ON_NANO)'=='true'" />
-
-    <Warning Text="Updated test projects to run only the project '$(MusicStoreE2ETestProject)' as the variable 'RUN_RUNTIME_STORE_TESTS' is set to '$(RUN_RUNTIME_STORE_TESTS)'" Condition="'$(RUN_RUNTIME_STORE_TESTS)'=='true'" />
-
-    <ItemGroup>
-      <ProjectsToTest Remove="@(ProjectsToTest)" />
-      <ProjectsToTest Include="$(MusicStoreE2ETestProject)" />
-    </ItemGroup>
-
-    <Error Text="Could not find test projects to run" Condition="@(ProjectsToTest->Count()) == 0" />
-
-    <ItemGroup Condition="'$(RUN_TESTS_ON_NANO)'=='true'">
-      <ProjectsToTest Update="$(MusicStoreE2ETestProject)">
-        <AdditionalProperties>VSTestTestCaseFilter=E2ETests=NanoServer</AdditionalProperties>
-      </ProjectsToTest>
-    </ItemGroup>
-
-    <ItemGroup Condition="'$(RUN_RUNTIME_STORE_TESTS)'=='true'">
-      <ProjectsToTest Update="$(MusicStoreE2ETestProject)">
-        <AdditionalProperties>VSTestTestCaseFilter=smoketests=usestore</AdditionalProperties>
-      </ProjectsToTest>
-    </ItemGroup>
-  </Target>
-</Project>
--- a/src/MusicStore/build/sources.props
+++ b/src/MusicStore/build/sources.props
@ -1,17 +0,0 @@
-<Project>
-  <Import Project="$(DotNetRestoreSourcePropsPath)" Condition="'$(DotNetRestoreSourcePropsPath)' != ''"/>
-
-  <PropertyGroup Label="RestoreSources">
-    <RestoreSources>$(DotNetRestoreSources)</RestoreSources>
-    <RestoreSources Condition="'$(DotNetBuildOffline)' != 'true' AND '$(AspNetUniverseBuildOffline)' != 'true' ">
-      $(RestoreSources);
-      https://dotnet.myget.org/F/dotnet-core/api/v3/index.json;
-      https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json;
-      https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json;
-    </RestoreSources>
-    <RestoreSources Condition="'$(DotNetBuildOffline)' != 'true'">
-      $(RestoreSources);
-      https://api.nuget.org/v3/index.json;
-    </RestoreSources>
-  </PropertyGroup>
-</Project>
--- a/src/MusicStore/samples/MusicStore/MusicStore.csproj
+++ b/src/MusicStore/samples/MusicStore/MusicStore.csproj
@ -10,17 +10,19 @@
    <DebugType Condition="'$(TargetFramework)' == 'net461'">full</DebugType>
  </PropertyGroup>

+  <Import Project="$(RepositoryRoot)src\Servers\IIS\build\testsite.props" />
+
  <ItemGroup>
    <Content Update="ForTesting\**\*" CopyToPublishDirectory="Never" Condition=" '$(PublishForTesting)' != 'true' " />
  </ItemGroup>

  <ItemGroup Condition="'$(OS)' == 'Windows_NT'">
-    <PackageReference Include="Microsoft.AspNetCore.AspNetCoreModule" Version="$(MicrosoftAspNetCoreAspNetCoreModulePackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.AspNetCoreModuleV2" Version="$(MicrosoftAspNetCoreAspNetCoreModuleV2PackageVersion)" />
+    <NativeProjectReference Include="$(RepositoryRoot)src\Servers\IIS\AspNetCoreModule\AspNetCore\AspNetCore.vcxproj" />
+    <NativeProjectReference Include="$(RepositoryRoot)src\Servers\IIS\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj" />
  </ItemGroup>

  <ItemGroup Condition="'$(TargetFrameworkIdentifier)'=='.NETCoreApp' AND '$(Configuration)' == 'RuntimeStore' ">
-    <PackageReference Include="Microsoft.AspNetCore.All" Version="$(MicrosoftAspNetCoreAllPackageVersion)" />
+    <Reference Include="Microsoft.AspNetCore.All" />
  </ItemGroup>

  <ItemGroup Condition="'$(TargetFrameworkIdentifier)'=='.NETFramework' OR '$(Configuration)' != 'RuntimeStore' ">
--- a/src/MusicStore/test/Directory.Build.props
+++ b/src/MusicStore/test/Directory.Build.props
@ -1,16 +0,0 @@
-<Project>
-  <Import Project="..\Directory.Build.props" />
-
-  <PropertyGroup>
-    <DeveloperBuildTestTfms>netcoreapp2.1</DeveloperBuildTestTfms>
-    <StandardTestTfms>$(DeveloperBuildTestTfms)</StandardTestTfms>
-    <StandardTestTfms Condition=" '$(DeveloperBuild)' != 'true' ">netcoreapp2.1;netcoreapp2.0</StandardTestTfms>
-    <StandardTestTfms Condition=" '$(DeveloperBuild)' != 'true' AND '$(OS)' == 'Windows_NT' ">$(StandardTestTfms);net461</StandardTestTfms>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />
-    <PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualStudioPackageVersion)" />
-  </ItemGroup>
-</Project>
--- a/src/MusicStore/test/MusicStore.E2ETests/Implementation/Validator.cs
+++ b/src/MusicStore/test/MusicStore.E2ETests/Implementation/Validator.cs
@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
@ -114,9 +114,6 @@ namespace E2ETests
            {
                //Helpers.ThrowIfResponseStatusNotOk(runtimeResponse, _logger);
            }
-
-            // Verify the app is using precompiled views
-            Assert.Contains("MusicStore.Views, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null", responseContent);
        }

        public void VerifyArchitecture(HttpResponseMessage response, RuntimeArchitecture arch)
--- a/src/MusicStore/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj
+++ b/src/MusicStore/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj
@ -1,8 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
    <TargetFrameworks>netcoreapp2.2</TargetFrameworks>
    <UserSecretsId>MusicStore.E2ETests</UserSecretsId>
+    <TestGroupName>MusicStore.E2ETests</TestGroupName>
    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
    <ServerGarbageCollection>true</ServerGarbageCollection>
    <WarningsNotAsErrors>$(WarningsNotAsErrors);xUnit1004</WarningsNotAsErrors>
--- a/src/MusicStore/test/MusicStore.Test/MusicStore.Test.csproj
+++ b/src/MusicStore/test/MusicStore.Test/MusicStore.Test.csproj
@ -9,8 +9,8 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.Core" Version="$(MicrosoftAspNetCoreAuthenticationCorePackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Testing" Version="$(MicrosoftExtensionsLoggingTestingPackageVersion)" />
+    <Reference Include="Microsoft.AspNetCore.Authentication.Core" />
+    <Reference Include="Microsoft.Extensions.Logging.Testing" />
  </ItemGroup>

 </Project>
--- a/src/Servers/IIS/.gitignore
+++ b/src/Servers/IIS/.gitignore
@ -50,10 +50,8 @@ x64/
 *.res
 *.pch
 aspnetcoremodule.h
-AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.h
-AspNetCoreModuleV2/CommonLib/aspnetcore_msg.h
-AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.rc
-AspNetCoreModuleV2/CommonLib/aspnetcore_msg.rc
+aspnetcore_msg.h
+aspnetcore_msg.rc
 version.h
 test/*/Debug
 test/*/Release
--- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.rc
+++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.rc
@ -1,2 +0,0 @@
-LANGUAGE 0x9,0x1
-1 11 "MSG00001.bin"
--- a/src/Servers/IIS/build/testsite.props
+++ b/src/Servers/IIS/build/testsite.props
@ -1,7 +1,7 @@
 <Project>

  <PropertyGroup>
-    <RuntimeIdentifiers>win7-x64;win7-x86</RuntimeIdentifiers>
+    <RuntimeIdentifiers>$(RuntimeIdentifiers);win7-x64;win7-x86</RuntimeIdentifiers>
    <Platforms>x64;x86</Platforms>
    <IISExpressAppHostConfig>$(MSBuildThisFileDirectory)applicationhost.config</IISExpressAppHostConfig>
    <IISAppHostConfig>$(MSBuildThisFileDirectory)applicationhost.iis.config</IISAppHostConfig>