Merge branch 'release/2.2'

dougbu · Jan 10, 2019 · a474a05 · a474a05
2 parents 7ae4817 + 2e67864
commit a474a05
Show file tree

Hide file tree

Showing 30 changed files with 107 additions and 300 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -104,6 +104,7 @@
     <IsTestProject Condition="$(MSBuildProjectName.EndsWith('Tests')) OR $(MSBuildProjectName.EndsWith('.Test'))">true</IsTestProject>
     <IsTestAssetProject Condition="$(RepoRelativeProjectDir.Contains('testassets'))">true</IsTestAssetProject>
     <IsSampleProject Condition="$(RepoRelativeProjectDir.Contains('sample'))">true</IsSampleProject>
+    <DisableDeterministicSourceRoot Condition="'$(IsSampleProject)' == 'true' OR '$(IsTestAssetProject)' == 'true'">true</DisableDeterministicSourceRoot>
   </PropertyGroup>
 
   <Import Project="build\tasks\RepoTasks.tasks" Condition="'$(MSBuildProjectName)' != 'RepoTasks' AND '$(DesignTimeBuild)' != 'true'" />

diff --git a/build/buildorder.props b/build/buildorder.props
@@ -7,7 +7,6 @@
   </ItemDefinitionGroup>
 
   <ItemGroup>
-    <RepositoryBuildOrder Include="MusicStore" Order="16" />
     <RepositoryBuildOrder Include="SignalR" Order="16" />
     <RepositoryBuildOrder Include="AuthSamples" Order="16" />
     <RepositoryBuildOrder Include="Components" Order="17" />

diff --git a/build/dependencies.props b/build/dependencies.props
@@ -119,7 +119,7 @@
     <!-- Determined by build tools -->
     <InternalAspNetCoreSdkPackageVersion>$(KoreBuildVersion)</InternalAspNetCoreSdkPackageVersion>
     <InternalAspNetCoreSiteExtensionSdkPackageVersion>$(KoreBuildVersion)</InternalAspNetCoreSiteExtensionSdkPackageVersion>
-    <InternalAspNetCoreSdkPackageVersion Condition=" '$(KoreBuildVersion)' == '' ">3.0.0-build-20181214.1</InternalAspNetCoreSdkPackageVersion>
+    <InternalAspNetCoreSdkPackageVersion Condition=" '$(KoreBuildVersion)' == '' ">3.0.0-build-20190105.1</InternalAspNetCoreSdkPackageVersion>
   </PropertyGroup>
 
   <!-- These are package versions that should not be overridden or updated by automation. -->

diff --git a/build/repo.props b/build/repo.props
@@ -120,6 +120,7 @@
                           $(RepositoryRoot)src\Razor\**\*.*proj;
                           $(RepositoryRoot)src\Mvc\**\*.*proj;
                           $(RepositoryRoot)src\Azure\**\*.*proj;
+                          $(RepositoryRoot)src\MusicStore\**\*.*proj;
                           "
                         Exclude="
                           @(ProjectToExclude);

diff --git a/build/submodules.props b/build/submodules.props
@@ -42,6 +42,5 @@
 
     <!-- Test-only repos -->
     <Repository Include="AuthSamples" PatchPolicy="AlwaysUpdateAndCascadeVersions" />
-    <Repository Include="MusicStore"  PatchPolicy="AlwaysUpdateAndCascadeVersions" />
   </ItemGroup>
 </Project>
diff --git a/global.json b/global.json
@@ -3,6 +3,6 @@
         "version": "3.0.100-preview-009750"
     },
     "msbuild-sdks": {
-        "Internal.AspNetCore.Sdk": "3.0.0-build-20190104.3"
+        "Internal.AspNetCore.Sdk": "3.0.0-build-20190105.1"
     }
 }
diff --git a/korebuild-lock.txt b/korebuild-lock.txt
@@ -1,2 +1,2 @@
-version:3.0.0-build-20190104.3
-commithash:1cc7b8211d23fd469ad03c73ff45e4d291b24be7
+version:3.0.0-build-20190105.1
+commithash:f61a6ea29c9697719acc53326726dfbe7acee915
diff --git a/...entity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj b/...entity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj
@@ -13,6 +13,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" />
 
@@ -22,5 +24,4 @@
     <Reference Include="AngleSharp" />
   </ItemGroup>
 
-  <Import Project="$(MvcTestingTargets)" Condition="'$(MvcTestingTargets)' != ''" />
 </Project>
diff --git a/src/MusicStore/.gitignore b/src/MusicStore/.gitignore
diff --git a/src/MusicStore/Directory.Build.props b/src/MusicStore/Directory.Build.props
diff --git a/src/MusicStore/Directory.Build.targets b/src/MusicStore/Directory.Build.targets
diff --git 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

diff --git a/src/MusicStore/README.md b/src/MusicStore/README.md
@@ -1,20 +1,9 @@
 MusicStore (test application)
 =============================
 
-AppVeyor: [![AppVeyor][appveyor-badge]][appveyor-build]
+This project is part of ASP.NET Core. You can find samples, documentation and getting started instructions for ASP.NET Core at the [Home](https://github.com/aspnet/aspnetcore) repo.
 
-Travis:   [![Travis][travis-badge]][travis-build]
-
-[appveyor-badge]: https://ci.appveyor.com/api/projects/status/ja8a7j6jscj7k3xa/branch/dev?svg=true
-[appveyor-build]: https://ci.appveyor.com/project/aspnetci/MusicStore/branch/dev
-[travis-badge]: https://travis-ci.org/aspnet/MusicStore.svg?branch=dev
-[travis-build]: https://travis-ci.org/aspnet/MusicStore
-
-This project is part of ASP.NET Core. You can find samples, documentation and getting started instructions for ASP.NET Core at the [Home](https://github.com/aspnet/home) repo.
-
-## About this repo
-
-This repository is a test application used for ASP.NET Core internal test processes.
+This is a test application used for ASP.NET Core internal test processes.
 It is not intended to be a representative sample of how to use ASP.NET Core.
 
 Samples and docs for ASP.NET Core can be found here: <https://docs.asp.net>.
diff --git a/src/MusicStore/build.cmd b/src/MusicStore/build.cmd
@@ -0,0 +1,3 @@
+@ECHO OFF
+SET RepoRoot=%~dp0..\..
+%RepoRoot%\build.cmd -projects %~dp0\**\*.*proj %*
diff --git a/src/MusicStore/build/dependencies.props b/src/MusicStore/build/dependencies.props
diff --git a/src/MusicStore/build/repo.props b/src/MusicStore/build/repo.props
diff --git a/src/MusicStore/build/repo.targets b/src/MusicStore/build/repo.targets
diff --git a/src/MusicStore/build/sources.props b/src/MusicStore/build/sources.props