Merge branch 'master' of github.com:aspnet/AspNetCore into rybrande/MusicStoreMaster

2018-11-19 12:34:59 -08:00 · 2018-11-19 12:34:59 -08:00 · 37399bc217
parent 6044a66a63 0b8fe9ded9
commit 37399bc217
27 changed files with 38 additions and 38 deletions
--- a/build/repo.props
+++ b/build/repo.props
@ -50,7 +50,7 @@
  </ItemGroup>

  <ItemGroup>
-    <SamplesProject Include="$(RepositoryRoot)src\samples\**\*.csproj;"/>
+    <SamplesProject Include="$(RepositoryRoot)src\**\samples\**\*.csproj;"/>

    <ProjectToExclude Include="@(SamplesProject)" Condition="'$(BuildSamples)' == 'false' "/>

--- 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-20181114.5"
+        "Internal.AspNetCore.Sdk": "3.0.0-build-20181116.1"
    }
 }
--- a/korebuild-lock.txt
+++ b/korebuild-lock.txt
@ -1,2 +1,2 @@
-version:3.0.0-build-20181114.5
-commithash:880e9a204d4ee4a18dfd83c9fb05a192a28bca60
+version:3.0.0-build-20181116.1
+commithash:9be7d79a8f7e0668f66e584aca1e962f45975511
--- a/modules/AADIntegration
+++ b/modules/AADIntegration
@ -1 +1 @@
-Subproject commit 1e26b6673d317df42db6b3a56af687ed5451c333
+Subproject commit 3c282a4f5af2601166d976261d8b862994694c81
--- a/modules/AuthSamples
+++ b/modules/AuthSamples
@ -1 +1 @@
-Subproject commit 906f316d2bef72ae9142dff54e41e7970a623822
+Subproject commit 8f471bf65bbc6a5de4425da64a64ee262aafbadb
--- a/modules/CORS
+++ b/modules/CORS
@ -1 +1 @@
-Subproject commit e790a9bb10a61bd538964c44bf2f1fa984e9559c
+Subproject commit c39d85f6df58ecb4507fd3d2a2d9f8d36054922b
--- a/modules/Diagnostics
+++ b/modules/Diagnostics
@ -1 +1 @@
-Subproject commit cfdbbdec15c2ae464e559f14c8110bf7b7522e8f
+Subproject commit 082d505977d72c75b68935c93c21feded6928e5f
--- a/modules/Hosting
+++ b/modules/Hosting
@ -1 +1 @@
-Subproject commit cfe9b26a34af15c4943240d790ee5d1a168290c9
+Subproject commit f6cda4fab73ff5d4594741cc5b34b58fa3d0e579
--- a/modules/HttpAbstractions
+++ b/modules/HttpAbstractions
@ -1 +1 @@
-Subproject commit 49d785c9343d64b93fadfb7eea36c358825cccb0
+Subproject commit 962ec07bdbb090ac2e9cd2a0e68e24c6c276a972
--- a/modules/HttpClientFactory
+++ b/modules/HttpClientFactory
@ -1 +1 @@
-Subproject commit 4dfcf7485e62819d0d73c00d7e7eb53d75abdbd3
+Subproject commit 7c4f9479b4753a37c8b0669a883002e5e448cc94
--- a/modules/Identity
+++ b/modules/Identity
@ -1 +1 @@
-Subproject commit 073b0377e8d40720009235f62466ce799f20a646
+Subproject commit 68b878f0e135f28260950fa485dcd53eae1da3a9
--- a/modules/JavaScriptServices
+++ b/modules/JavaScriptServices
@ -1 +1 @@
-Subproject commit 160d822f525f3f14cd55ff53bd9dac503947cf79
+Subproject commit e657e7d79aa11ced73a0a2e0f4d3fbbb609ca507
--- a/modules/Localization
+++ b/modules/Localization
@ -1 +1 @@
-Subproject commit b8747c8b6b6e9e0e015f2a9dffa81a0247ab8125
+Subproject commit 60a3d57a3e8b8b6d69232815a9596b5a495a7d0b
--- a/modules/MetaPackages
+++ b/modules/MetaPackages
@ -1 +1 @@
-Subproject commit 62d9794c633a9a2c502334d525d81c454ac29264
+Subproject commit 501dd3924b8e738adfb525876c7af5a477314626
--- a/modules/Mvc
+++ b/modules/Mvc
@ -1 +1 @@
-Subproject commit 7c6823312540c72a0579f4a4b2e8357b1df42de8
+Subproject commit 2414db256f32a047770326d14d8b0e2afd49ba49
--- a/modules/Razor
+++ b/modules/Razor
@ -1 +1 @@
-Subproject commit b2e93650842cbf3e00598ede40a67a432eaf6c25
+Subproject commit 6c8e900d11c0ed2d2b459a3c24fe84414ca9d35e
--- a/modules/Routing
+++ b/modules/Routing
@ -1 +1 @@
-Subproject commit b6a1de56769f4c6e446ae65c4a75c699393eba46
+Subproject commit aed55d4517ac86a639724b9d1a10cbd04b92f503
--- a/modules/Security
+++ b/modules/Security
@ -1 +1 @@
-Subproject commit 7e14b052ea9cb935ec4f5cb0485b4edb5d41297a
+Subproject commit e0538784647990905f9c5fdc5bc2f0e5c7388909
--- a/modules/ServerTests
+++ b/modules/ServerTests
@ -1 +1 @@
-Subproject commit 880dd2b70697f1d6298f9cfde3c090a8635995d0
+Subproject commit 619d3585854ac311986c44715012d10e45a932a6
--- a/modules/Session
+++ b/modules/Session
@ -1 +1 @@
-Subproject commit a4af62e77446c0edd44f5711666ce9687e0ca17e
+Subproject commit abbdfb72ef54a77623c01d517c85eb8b28c70bc0
--- a/modules/SignalR
+++ b/modules/SignalR
@ -1 +1 @@
-Subproject commit 05b0d41533f921ec9d2027ac651f2f6581cb037c
+Subproject commit 2c3ebd1648a480ca180c77f123a10f4dcc591c3b
--- a/modules/Templating
+++ b/modules/Templating
@ -1 +1 @@
-Subproject commit 0af2acd6fff0f51ec42183f5a5b01f8f0712af5f
+Subproject commit 514fcdcba533eb70a670b9ccc2073d67f6c6f9ca
--- a/src/SiteExtensions/Directory.Build.props
+++ b/src/SiteExtensions/Directory.Build.props
@ -5,4 +5,9 @@
  <Import Project="build\dependencies.props" />
  <Import Project="version.props" />

+  <PropertyGroup>
+    <EnableApiCheck>false</EnableApiCheck>
+    <GenerateSourceLinkFile>false</GenerateSourceLinkFile>
+  </PropertyGroup>
+
 </Project>
--- a/src/SiteExtensions/build/dependencies.props
+++ b/src/SiteExtensions/build/dependencies.props
@ -3,14 +3,11 @@
    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
  </PropertyGroup>

+  <Import Project="..\..\..\build\dependencies.props" />
+
  <PropertyGroup Label="Package Versions">
-    <InternalAspNetCoreSdkPackageVersion>3.0.0-build-20181114.5</InternalAspNetCoreSdkPackageVersion>
    <MicrosoftAspNetCoreAzureAppServicesSiteExtension21PackageVersion>2.1.1-rtm-31076</MicrosoftAspNetCoreAzureAppServicesSiteExtension21PackageVersion>
    <MicrosoftAspNetCoreAzureAppServicesSiteExtension22PackageVersion>2.2.0-rtm-35515</MicrosoftAspNetCoreAzureAppServicesSiteExtension22PackageVersion>
-    <MicrosoftNETTestSdkPackageVersion>15.6.1</MicrosoftNETTestSdkPackageVersion>
-    <MicrosoftWebXdtPackageVersion>1.4.0</MicrosoftWebXdtPackageVersion>
-    <XunitPackageVersion>2.4.0</XunitPackageVersion>
-    <XunitRunnerVisualStudioPackageVersion>2.4.0</XunitRunnerVisualStudioPackageVersion>
  </PropertyGroup>

 </Project>
--- a/src/SiteExtensions/build/repo.props
+++ b/src/SiteExtensions/build/repo.props
@ -1,8 +1,7 @@
 <Project>

-
-  <ItemGroup>
-    <ExcludeFromPack Include="$(RepositoryRoot)src\Microsoft.Web.Xdt.Extensions\*.csproj" />
-  </ItemGroup>
-
+  <PropertyGroup>
+    <!-- Disable KoreBuild restrictions while we re-work dependency management. -->
+    <DisablePackageReferenceRestrictions>true</DisablePackageReferenceRestrictions>
+  </PropertyGroup>
 </Project>
--- a/src/SiteExtensions/global.json
+++ b/src/SiteExtensions/global.json
@ -1,8 +1,8 @@
 {
    "sdk": {
-        "version": "2.2.100-preview3-009430"
+        "version": "3.0.100-preview-009750"
    },
    "msbuild-sdks": {
-        "Internal.AspNetCore.Sdk": "3.0.0-alpha1-20181018.6"
+        "Internal.AspNetCore.Sdk": "3.0.0-build-20181114.5"
    }
 }
--- a/src/SiteExtensions/src/Microsoft.Web.Xdt.Extensions/Microsoft.Web.Xdt.Extensions.csproj
+++ b/src/SiteExtensions/src/Microsoft.Web.Xdt.Extensions/Microsoft.Web.Xdt.Extensions.csproj
@ -3,8 +3,7 @@
  <PropertyGroup>
    <Description>Additional functionality for Xdt transforms.</Description>
    <TargetFramework>net461</TargetFramework>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <PackageTags>xdt</PackageTags>
+    <IsPackable>false</IsPackable>
  </PropertyGroup>

  <ItemGroup>