From d59551bc8aa7b553fd97b63469c11c882a688884 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Tue, 4 Sep 2018 21:03:43 +0000 Subject: [PATCH 1/6] Updating submodule(s) SignalR => 753c3da852028df97087c7e30ec40dc87892530b [auto-updated: submodules] --- modules/SignalR | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/SignalR b/modules/SignalR index 04c606d55f..753c3da852 160000 --- a/modules/SignalR +++ b/modules/SignalR @@ -1 +1 @@ -Subproject commit 04c606d55f8dc62c2965223b261cb2c4392c4ceb +Subproject commit 753c3da852028df97087c7e30ec40dc87892530b From 19eff3f83e990930bd5ef22c86eb1c646ea5fbe8 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Tue, 4 Sep 2018 21:22:51 +0000 Subject: [PATCH 2/6] Updating submodule(s) IISIntegration => b5ff991eb95c71915aff1eb6283388dc02e9c67e [auto-updated: submodules] --- modules/IISIntegration | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/IISIntegration b/modules/IISIntegration index 922298bc90..b5ff991eb9 160000 --- a/modules/IISIntegration +++ b/modules/IISIntegration @@ -1 +1 @@ -Subproject commit 922298bc902e4deccd766c0e3bed84b3b3e40b74 +Subproject commit b5ff991eb95c71915aff1eb6283388dc02e9c67e From e23e8fff9586659f98dfea0b33734972d9991bfe Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 5 Sep 2018 12:50:34 -0700 Subject: [PATCH 3/6] Install MicroBuild code signing plugin and set SignType = real (#1376) --- .vsts/builds/ci-official.yml | 20 ++++++++++ eng/targets/MicroBuild.Plugin.props | 37 +++++-------------- eng/targets/Wix.Common.props | 1 + src/Installers/Windows/build.ps1 | 4 +- .../Windows/clone_and_build_ancm.ps1 | 7 +++- 5 files changed, 39 insertions(+), 30 deletions(-) diff --git a/.vsts/builds/ci-official.yml b/.vsts/builds/ci-official.yml index 62ae37606b..8d48c71221 100644 --- a/.vsts/builds/ci-official.yml +++ b/.vsts/builds/ci-official.yml @@ -18,11 +18,26 @@ phases: variables: CI: true DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true + + # This variable is required by MicroBuildSigningPlugin to determine permissions for codesigning. + TeamName: AspNetCore + + # SignType = { test, real } + # This is prefixed underscore because variables automatically become environment variables (and therefore MSBuild properties), + # and this one was causing issues in MSBuild projects which use the $(SignType) MSbuild prop. + _SignType: real + steps: - task: NodeTool@0 displayName: Install Node 10.x inputs: versionSpec: 10.x + - task: MicroBuildSigningPlugin@1 + displayName: Install MicroBuild plugin + condition: and(succeeded(), in(variables['_SignType'], 'test', 'real')) + inputs: + signType: $(_SignType) + zipSources: false # TODO: configure build.cmd to build both x64 and x86 in one invocation # TODO build.cmd -ci - script: build.cmd /p:SkipTests=true /p:Configuration=$(BuildConfiguration) /p:BuildNumber=$(Build.BuildNumber) /t:Build /t:BuildSharedFx /p:SharedFxRID=win-x64 /t:BuildFallbackArchive @@ -34,6 +49,7 @@ phases: -GitCredential '$(dn-bot-devdiv-build-rw-code-rw)' -Config $(BuildConfiguration) -BuildNumber $(Build.BuildNumber) + -SignType $(_SignType) displayName: Build ANCM installers # TODO: configure harvesting to run as a part of build.cmd - powershell: > @@ -42,6 +58,7 @@ phases: -x86 artifacts/runtime/aspnetcore-runtime-internal-2.2.0-preview2-$(Build.BuildNumber)-win-x86.zip -Config $(BuildConfiguration) -BuildNumber $(Build.BuildNumber) + -SignType $(_SignType) displayName: Build Windows installers - task: PublishTestResults@2 displayName: Publish test results @@ -56,6 +73,9 @@ phases: pathtoPublish: ./artifacts/ artifactName: artifacts-Windows-Release artifactType: Container + - task: MicroBuildCleanup@1 + displayName: Cleanup MicroBuild tasks + condition: always() - phase: macOS dependsOn: Windows diff --git a/eng/targets/MicroBuild.Plugin.props b/eng/targets/MicroBuild.Plugin.props index 2d75c7dc4b..0101904811 100644 --- a/eng/targets/MicroBuild.Plugin.props +++ b/eng/targets/MicroBuild.Plugin.props @@ -1,29 +1,12 @@ - - - + $(MicroBuildOverridePluginDirectory) - Note: All MicroBuild plugins must be installed to the same directory (under the same packages folder). If plugins - are installed to different directories, the plugins which are in the directories closest to the executing project - up the hierarchy will be discovered, and the ones higher up the tree will be ignored. - --> - packages\MicroBuild.Core.Sentinel.1.0.0\sentinel.txt - MicroBuild.Core.Sentinel\1.0.0\sentinel.txt - - $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), $(MicroBuildSentinelFile))) - $(MicroBuildPluginDirectory)\packages - - - $(NUGET_PACKAGES) - $(USERPROFILE)\.nuget\packages - - - $(MicroBuildOverridePluginDirectory) - - \ No newline at end of file + + $(NuGetPackageRoot) + $(NUGET_PACKAGES) + $(USERPROFILE)\.nuget\packages + + diff --git a/eng/targets/Wix.Common.props b/eng/targets/Wix.Common.props index 5c66285a6e..d958514aba 100644 --- a/eng/targets/Wix.Common.props +++ b/eng/targets/Wix.Common.props @@ -22,6 +22,7 @@ + true $(WixExtDir)dark.exe diff --git a/src/Installers/Windows/build.ps1 b/src/Installers/Windows/build.ps1 index 1c81d92339..edba84e35e 100644 --- a/src/Installers/Windows/build.ps1 +++ b/src/Installers/Windows/build.ps1 @@ -13,6 +13,7 @@ param( [Alias("x64")] [string]$Runtime64Zip, [string]$BuildNumber = 't000', + [string]$SignType = '', [string]$AccessTokenSuffix = $null, [string]$AssetRootUrl = $null, @@ -80,7 +81,8 @@ try { "-p:SharedFrameworkHarvestRootPath=$repoRoot/obj/sfx/" ` "-p:Configuration=$Configuration" ` "-p:BuildNumber=$BuildNumber" ` - -bl ` + "-p:SignType=$SignType" ` + "-bl:$repoRoot/artifacts/logs/installers.msbuild.binlog" ` @msbuildArgs } } diff --git a/src/Installers/Windows/clone_and_build_ancm.ps1 b/src/Installers/Windows/clone_and_build_ancm.ps1 index 8cffdbe3f2..8978b22d39 100644 --- a/src/Installers/Windows/clone_and_build_ancm.ps1 +++ b/src/Installers/Windows/clone_and_build_ancm.ps1 @@ -9,7 +9,8 @@ param( [string]$Configuration = 'Release', [string]$DepsZip, [string]$BuildNumber = 't000', - [string]$AncmSourceBranch = 'release/2.2' + [string]$AncmSourceBranch = 'release/2.2', + [string]$SignType = '' ) $ErrorActionPreference = 'Stop' @@ -102,7 +103,9 @@ try { "-p:WixTasksPath=$wixToolSetRoot\wixtasks.dll" ` "-p:WixNativeCATargetsPath=$wixToolSetRoot\sdk\wix.nativeca.targets" ` "-p:Configuration=$Configuration" ` - "-p:BuildNumber=$BuildNumber" + "-p:BuildNumber=$BuildNumber" ` + "-p:SignType=$SignType" ` + "-bl:$repoRoot/artifacts/logs/ancn.msbuild.binlog" } $outputPath = "$repoRoot/artifacts/bin/$Configuration/installers/en-US/" From e9b0415bb9ba704a9ae9408142beea4eddeda678 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 5 Sep 2018 15:20:11 -0700 Subject: [PATCH 4/6] Make System.IO.Pipelines a direct dependency of Microsoft.AspNetCore.App --- build/external-dependencies.props | 2 +- build/tasks/AddMetapackageReferences.cs | 5 ++++- build/tools/templates/Archive/Archive.csproj | 14 -------------- 3 files changed, 5 insertions(+), 16 deletions(-) delete mode 100644 build/tools/templates/Archive/Archive.csproj diff --git a/build/external-dependencies.props b/build/external-dependencies.props index f0261d2212..8f8858d98c 100644 --- a/build/external-dependencies.props +++ b/build/external-dependencies.props @@ -129,7 +129,7 @@ - + diff --git a/build/tasks/AddMetapackageReferences.cs b/build/tasks/AddMetapackageReferences.cs index 57a9675061..3cb11666ab 100644 --- a/build/tasks/AddMetapackageReferences.cs +++ b/build/tasks/AddMetapackageReferences.cs @@ -89,7 +89,10 @@ namespace RepoTasks continue; } - var packageVersionValue = GetDependencyVersion(dependencyVersionType, packageName, packageVersion); + var packageVersionValue = + Enum.TryParse(package.GetMetadata("MetapackageVersionRangeType"), out var packageVersionType) + ? GetDependencyVersion(packageVersionType, packageName, packageVersion) + : GetDependencyVersion(dependencyVersionType, packageName, packageVersion); Log.LogMessage(MessageImportance.High, $" - Package: {packageName} Version: {packageVersionValue}"); diff --git a/build/tools/templates/Archive/Archive.csproj b/build/tools/templates/Archive/Archive.csproj deleted file mode 100644 index e2843be0e0..0000000000 --- a/build/tools/templates/Archive/Archive.csproj +++ /dev/null @@ -1,14 +0,0 @@ - - - - netcoreapp2.1 - false - true - true - - - - - - - From fc04b2c073c6e4d8a2e3f4df22f66f55539607c3 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 5 Sep 2018 16:35:59 -0700 Subject: [PATCH 5/6] Update branding to 2.2.0-preview3 --- .vsts/builds/ci-official.yml | 4 ++-- modules/AADIntegration | 2 +- modules/Antiforgery | 2 +- modules/AzureIntegration | 2 +- modules/BasicMiddleware | 2 +- modules/BrowserLink | 2 +- modules/CORS | 2 +- modules/Caching | 2 +- modules/Common | 2 +- modules/Configuration | 2 +- modules/DataProtection | 2 +- modules/DependencyInjection | 2 +- modules/Diagnostics | 2 +- modules/DotNetTools | 2 +- modules/EntityFrameworkCore | 2 +- modules/EventNotification | 2 +- modules/FileSystem | 2 +- modules/Hosting | 2 +- modules/HtmlAbstractions | 2 +- modules/HttpAbstractions | 2 +- modules/HttpClientFactory | 2 +- modules/HttpSysServer | 2 +- modules/IISIntegration | 2 +- modules/Identity | 2 +- modules/JavaScriptServices | 2 +- modules/JsonPatch | 2 +- modules/KestrelHttpServer | 2 +- modules/Localization | 2 +- modules/Logging | 2 +- modules/MetaPackages | 2 +- modules/Microsoft.Data.Sqlite | 2 +- modules/Mvc | 2 +- modules/MvcPrecompilation | 2 +- modules/Options | 2 +- modules/Proxy | 2 +- modules/Razor | 2 +- modules/ResponseCaching | 2 +- modules/Routing | 2 +- modules/Scaffolding | 2 +- modules/Security | 2 +- modules/ServerTests | 2 +- modules/Session | 2 +- modules/SignalR | 2 +- modules/StaticFiles | 2 +- modules/Templating | 2 +- modules/WebSockets | 2 +- version.props | 6 +++--- 47 files changed, 50 insertions(+), 50 deletions(-) diff --git a/.vsts/builds/ci-official.yml b/.vsts/builds/ci-official.yml index 8d48c71221..6f305965ba 100644 --- a/.vsts/builds/ci-official.yml +++ b/.vsts/builds/ci-official.yml @@ -54,8 +54,8 @@ phases: # TODO: configure harvesting to run as a part of build.cmd - powershell: > src/Installers/Windows/build.ps1 - -x64 artifacts/runtime/aspnetcore-runtime-internal-2.2.0-preview2-$(Build.BuildNumber)-win-x64.zip - -x86 artifacts/runtime/aspnetcore-runtime-internal-2.2.0-preview2-$(Build.BuildNumber)-win-x86.zip + -x64 artifacts/runtime/aspnetcore-runtime-internal-2.2.0-preview3-$(Build.BuildNumber)-win-x64.zip + -x86 artifacts/runtime/aspnetcore-runtime-internal-2.2.0-preview3-$(Build.BuildNumber)-win-x86.zip -Config $(BuildConfiguration) -BuildNumber $(Build.BuildNumber) -SignType $(_SignType) diff --git a/modules/AADIntegration b/modules/AADIntegration index d552792215..320751e465 160000 --- a/modules/AADIntegration +++ b/modules/AADIntegration @@ -1 +1 @@ -Subproject commit d5527922151cfda1b96f67a6afc1b14f9de59328 +Subproject commit 320751e4650a8d81305ec829737cd111609c9d28 diff --git a/modules/Antiforgery b/modules/Antiforgery index 8f162f31f7..6b7cb74342 160000 --- a/modules/Antiforgery +++ b/modules/Antiforgery @@ -1 +1 @@ -Subproject commit 8f162f31f711fa68cdfcb12b61bd2857a6182a9c +Subproject commit 6b7cb743429ec86976c95f757579ece76ca1eff6 diff --git a/modules/AzureIntegration b/modules/AzureIntegration index 5dba26f8fb..0bed1326d1 160000 --- a/modules/AzureIntegration +++ b/modules/AzureIntegration @@ -1 +1 @@ -Subproject commit 5dba26f8fbe5c4979ee6a7b6a13cf30fc4c4c270 +Subproject commit 0bed1326d158ab5e8e8a5d7f4d135b45283f36b8 diff --git a/modules/BasicMiddleware b/modules/BasicMiddleware index 2aea3298ae..b0d334af1c 160000 --- a/modules/BasicMiddleware +++ b/modules/BasicMiddleware @@ -1 +1 @@ -Subproject commit 2aea3298ae2604656df4d8a55a5503a82fc816c0 +Subproject commit b0d334af1c1aadab3cbebc5208f64622da5e85f0 diff --git a/modules/BrowserLink b/modules/BrowserLink index 48a23453d4..f61226fc84 160000 --- a/modules/BrowserLink +++ b/modules/BrowserLink @@ -1 +1 @@ -Subproject commit 48a23453d40216cd824242d9dcfbf5d9e875000c +Subproject commit f61226fc84e17c42ee7181d853429af51541b651 diff --git a/modules/CORS b/modules/CORS index 6eb5ead012..46ca34ef52 160000 --- a/modules/CORS +++ b/modules/CORS @@ -1 +1 @@ -Subproject commit 6eb5ead0126e4640e551b7cd060967888a13daf1 +Subproject commit 46ca34ef525866c1d327ce857910dd670e0f196e diff --git a/modules/Caching b/modules/Caching index a3063f41bc..8927e4326a 160000 --- a/modules/Caching +++ b/modules/Caching @@ -1 +1 @@ -Subproject commit a3063f41bce093b3465a241ce0e3670f60f8d33e +Subproject commit 8927e4326a67030b67ff4df6264296c661e18c56 diff --git a/modules/Common b/modules/Common index aed11e1178..ee3bb6ecc8 160000 --- a/modules/Common +++ b/modules/Common @@ -1 +1 @@ -Subproject commit aed11e1178801d28ea8b6681384861d8fbd6d67f +Subproject commit ee3bb6ecc8403ea03fd9bca237a69ac96b0df1b8 diff --git a/modules/Configuration b/modules/Configuration index fd1c65b7e6..804b12792e 160000 --- a/modules/Configuration +++ b/modules/Configuration @@ -1 +1 @@ -Subproject commit fd1c65b7e6b5aba9cfd0211634eb2322a386b349 +Subproject commit 804b12792ef0ec45fb9b3d487b936bfab40c6355 diff --git a/modules/DataProtection b/modules/DataProtection index a1a5237613..acde45cf31 160000 --- a/modules/DataProtection +++ b/modules/DataProtection @@ -1 +1 @@ -Subproject commit a1a52376131406735c9ab9d3c65b2dfa185f63dc +Subproject commit acde45cf311d0f3b8f26a6ab10a829a6cf190c99 diff --git a/modules/DependencyInjection b/modules/DependencyInjection index dcffb02def..52aedb58e3 160000 --- a/modules/DependencyInjection +++ b/modules/DependencyInjection @@ -1 +1 @@ -Subproject commit dcffb02def2676c02116814a7e21092a3eefb999 +Subproject commit 52aedb58e36d3aeef9d7a1dd0d5d6fbcb219ea8c diff --git a/modules/Diagnostics b/modules/Diagnostics index dd07e6743c..b3e163e44f 160000 --- a/modules/Diagnostics +++ b/modules/Diagnostics @@ -1 +1 @@ -Subproject commit dd07e6743c9a9cdd45d48017a4a5ee932ea3188e +Subproject commit b3e163e44fa51de3388658b0f80c73e8692893c6 diff --git a/modules/DotNetTools b/modules/DotNetTools index 64c572c8a5..64a2c3ab46 160000 --- a/modules/DotNetTools +++ b/modules/DotNetTools @@ -1 +1 @@ -Subproject commit 64c572c8a58a088626d61326ba77f453e5f7199b +Subproject commit 64a2c3ab46274613935a7a2a87c76b4b320d14b0 diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore index cbd2a2074d..e2d4eb4246 160000 --- a/modules/EntityFrameworkCore +++ b/modules/EntityFrameworkCore @@ -1 +1 @@ -Subproject commit cbd2a2074d908673195abbb14de5a460acaa2aea +Subproject commit e2d4eb42469b45d166f746cb42bd851ca15e2c14 diff --git a/modules/EventNotification b/modules/EventNotification index 4f7dc2428e..0c803724fe 160000 --- a/modules/EventNotification +++ b/modules/EventNotification @@ -1 +1 @@ -Subproject commit 4f7dc2428e09eebc6103ccb89fbe45145fe23136 +Subproject commit 0c803724feb6af8db22f5f49524a48089c3c0537 diff --git a/modules/FileSystem b/modules/FileSystem index 2a90067e76..18615a04fb 160000 --- a/modules/FileSystem +++ b/modules/FileSystem @@ -1 +1 @@ -Subproject commit 2a90067e767141e0793444698d7c0b3638bf4f47 +Subproject commit 18615a04fba3f9dea717dbec7877fc0cad6208a8 diff --git a/modules/Hosting b/modules/Hosting index c3edce8e8a..795a2238eb 160000 --- a/modules/Hosting +++ b/modules/Hosting @@ -1 +1 @@ -Subproject commit c3edce8e8a19a1e2e58fd21a986271b88071e6ba +Subproject commit 795a2238eb146e733a337afb2ded7b88f49fa635 diff --git a/modules/HtmlAbstractions b/modules/HtmlAbstractions index 8d5b123c61..eade194b39 160000 --- a/modules/HtmlAbstractions +++ b/modules/HtmlAbstractions @@ -1 +1 @@ -Subproject commit 8d5b123c611a6df427624e5c7499f14061646577 +Subproject commit eade194b39088b91c84c8c1aebd46d2ce7c85507 diff --git a/modules/HttpAbstractions b/modules/HttpAbstractions index 14076d94c3..b43bc0cb8a 160000 --- a/modules/HttpAbstractions +++ b/modules/HttpAbstractions @@ -1 +1 @@ -Subproject commit 14076d94c38960787772ea7999c7aa159afbba2b +Subproject commit b43bc0cb8ac9a6a55e92b65eb31408d3a2b41b5c diff --git a/modules/HttpClientFactory b/modules/HttpClientFactory index 5eee107798..6ab313329b 160000 --- a/modules/HttpClientFactory +++ b/modules/HttpClientFactory @@ -1 +1 @@ -Subproject commit 5eee107798893b583eafdb7e6e35a663801e5657 +Subproject commit 6ab313329bbd3050103e589cdddb28fe8952513b diff --git a/modules/HttpSysServer b/modules/HttpSysServer index 85a8aa21f1..5b8a1ab329 160000 --- a/modules/HttpSysServer +++ b/modules/HttpSysServer @@ -1 +1 @@ -Subproject commit 85a8aa21f17abc3d9e017b4ba37ce5c6a5cdec7c +Subproject commit 5b8a1ab329058da136367d8c130f73e04f57bccc diff --git a/modules/IISIntegration b/modules/IISIntegration index 1b87f1e913..9b5e34e197 160000 --- a/modules/IISIntegration +++ b/modules/IISIntegration @@ -1 +1 @@ -Subproject commit 1b87f1e913d29c600e7190b187632874807ecda5 +Subproject commit 9b5e34e197f2c614573884f9b6c4e0c48fe2717a diff --git a/modules/Identity b/modules/Identity index 8304283fb1..fae6cb0b51 160000 --- a/modules/Identity +++ b/modules/Identity @@ -1 +1 @@ -Subproject commit 8304283fb1bbbed64c7c4715a25c19b5f2d41097 +Subproject commit fae6cb0b5171f83ee63230045cecab6a417fbb67 diff --git a/modules/JavaScriptServices b/modules/JavaScriptServices index 15884cbadb..24ebd9ff3e 160000 --- a/modules/JavaScriptServices +++ b/modules/JavaScriptServices @@ -1 +1 @@ -Subproject commit 15884cbadb94d880c77111017e76e8d37d8d4a72 +Subproject commit 24ebd9ff3eee47a94c7ab2300e2612782d65eec6 diff --git a/modules/JsonPatch b/modules/JsonPatch index cb569de672..bb31ceee59 160000 --- a/modules/JsonPatch +++ b/modules/JsonPatch @@ -1 +1 @@ -Subproject commit cb569de67201c566b680f71a7a0bb7f0cac34600 +Subproject commit bb31ceee59fa27b52908bef651636247e1fce481 diff --git a/modules/KestrelHttpServer b/modules/KestrelHttpServer index 991cfa8bd8..0256019979 160000 --- a/modules/KestrelHttpServer +++ b/modules/KestrelHttpServer @@ -1 +1 @@ -Subproject commit 991cfa8bd8ed940be32ffeda39f8beeb992c9c02 +Subproject commit 02560199792284b54b1d2a49e2bc77e98ffa6334 diff --git a/modules/Localization b/modules/Localization index d6a783ae52..9309edf994 160000 --- a/modules/Localization +++ b/modules/Localization @@ -1 +1 @@ -Subproject commit d6a783ae523c85943131f420269b1f7a4bef563a +Subproject commit 9309edf9945a886ea2823da482c31c011deb8e63 diff --git a/modules/Logging b/modules/Logging index f6c988d6a4..8e21b58576 160000 --- a/modules/Logging +++ b/modules/Logging @@ -1 +1 @@ -Subproject commit f6c988d6a421e2fc6a927204de563e64a24fa1f6 +Subproject commit 8e21b58576193f7a18616038055fa2dbf18bcefd diff --git a/modules/MetaPackages b/modules/MetaPackages index d022ce775b..16eb603cb2 160000 --- a/modules/MetaPackages +++ b/modules/MetaPackages @@ -1 +1 @@ -Subproject commit d022ce775b3dc178f66965ef7fe6d502aaed1fcd +Subproject commit 16eb603cb216ab4c58c5da3fa12e3ba349daad77 diff --git a/modules/Microsoft.Data.Sqlite b/modules/Microsoft.Data.Sqlite index 8f36bc6f64..0990637dd6 160000 --- a/modules/Microsoft.Data.Sqlite +++ b/modules/Microsoft.Data.Sqlite @@ -1 +1 @@ -Subproject commit 8f36bc6f641f98f253318fad30cbe2f2d0ff24ff +Subproject commit 0990637dd6c97a9d7d7c33e3f6563790fc57152e diff --git a/modules/Mvc b/modules/Mvc index b9793f0a1d..6498c89f88 160000 --- a/modules/Mvc +++ b/modules/Mvc @@ -1 +1 @@ -Subproject commit b9793f0a1d9a75940c50e31e956d09397a5d1876 +Subproject commit 6498c89f880d65681e61e1bdd86c755fb5136f7e diff --git a/modules/MvcPrecompilation b/modules/MvcPrecompilation index 50e71c4585..77c2ab8595 160000 --- a/modules/MvcPrecompilation +++ b/modules/MvcPrecompilation @@ -1 +1 @@ -Subproject commit 50e71c4585fabc3bdbc874df770bc77274ca66a2 +Subproject commit 77c2ab8595c0e75a2970da225a3e66247a4e80b2 diff --git a/modules/Options b/modules/Options index a310a92364..a2dc9b9462 160000 --- a/modules/Options +++ b/modules/Options @@ -1 +1 @@ -Subproject commit a310a923647d28331705895c1b4d7186895f2f79 +Subproject commit a2dc9b9462b9d194a58fd7b534ecf5be26a4b7ce diff --git a/modules/Proxy b/modules/Proxy index b026137d60..c1b868c6c3 160000 --- a/modules/Proxy +++ b/modules/Proxy @@ -1 +1 @@ -Subproject commit b026137d60f9837dd74e200bccca9382ef78f2a1 +Subproject commit c1b868c6c3821cbb2d2a372ac9c140eac9786210 diff --git a/modules/Razor b/modules/Razor index d1f2b5cfc4..45adbe5f7c 160000 --- a/modules/Razor +++ b/modules/Razor @@ -1 +1 @@ -Subproject commit d1f2b5cfc499dfee114f1ac8dfe9b619ced76874 +Subproject commit 45adbe5f7c2701b03f69423f3777ff6056045017 diff --git a/modules/ResponseCaching b/modules/ResponseCaching index 4e07ea7672..d86229b813 160000 --- a/modules/ResponseCaching +++ b/modules/ResponseCaching @@ -1 +1 @@ -Subproject commit 4e07ea7672919d80717010440d0424b592ae07bd +Subproject commit d86229b8135816f92c6d204966ebbd5891c48dab diff --git a/modules/Routing b/modules/Routing index f9f80e3d80..35163566a9 160000 --- a/modules/Routing +++ b/modules/Routing @@ -1 +1 @@ -Subproject commit f9f80e3d80d14684ed2c77b1913cf4bd3c5a4692 +Subproject commit 35163566a96642cc67ac330f578ab56814239994 diff --git a/modules/Scaffolding b/modules/Scaffolding index 0768244018..3b863fb05c 160000 --- a/modules/Scaffolding +++ b/modules/Scaffolding @@ -1 +1 @@ -Subproject commit 07682440180c2c9424c4a55a719b2a25fc4dd1b5 +Subproject commit 3b863fb05cb5ace32905b93ee4d9d847722ac455 diff --git a/modules/Security b/modules/Security index c6f5786418..ff479de7b1 160000 --- a/modules/Security +++ b/modules/Security @@ -1 +1 @@ -Subproject commit c6f5786418c2478dfc7f5a604d8b65911f9f0c1b +Subproject commit ff479de7b185269bd3dc8310a0ef46c3c539e02b diff --git a/modules/ServerTests b/modules/ServerTests index 0b2afdcead..d88d3e48ac 160000 --- a/modules/ServerTests +++ b/modules/ServerTests @@ -1 +1 @@ -Subproject commit 0b2afdcead4afcbd3498bb46aebe544bfbdca3f9 +Subproject commit d88d3e48ac5f4b69a35d924a12e043dc3348b752 diff --git a/modules/Session b/modules/Session index 49da69b518..622fb3c1e5 160000 --- a/modules/Session +++ b/modules/Session @@ -1 +1 @@ -Subproject commit 49da69b51858ae0cb1fc5927b99b245062e51eb7 +Subproject commit 622fb3c1e5a553a726adca1dbc892c1b30993445 diff --git a/modules/SignalR b/modules/SignalR index 201c058b93..ac7ca5b270 160000 --- a/modules/SignalR +++ b/modules/SignalR @@ -1 +1 @@ -Subproject commit 201c058b9379b584317b912a4928a83ad7b569bf +Subproject commit ac7ca5b270e1f2970ab7f716578e83529506aeef diff --git a/modules/StaticFiles b/modules/StaticFiles index 089ec7711c..11cd669ce4 160000 --- a/modules/StaticFiles +++ b/modules/StaticFiles @@ -1 +1 @@ -Subproject commit 089ec7711cb6f3c875f527b3e4ac5954a580deb8 +Subproject commit 11cd669ce43dfedcb549431bfd22a60d7e0e2e8e diff --git a/modules/Templating b/modules/Templating index cb3791ec99..ed65af8e87 160000 --- a/modules/Templating +++ b/modules/Templating @@ -1 +1 @@ -Subproject commit cb3791ec992e09f3ab63b772fe799af03a29d845 +Subproject commit ed65af8e87d59a61fffbf0ee6dd7b8dcd6804c6b diff --git a/modules/WebSockets b/modules/WebSockets index 6d565e3a8a..a00eb4fa82 160000 --- a/modules/WebSockets +++ b/modules/WebSockets @@ -1 +1 @@ -Subproject commit 6d565e3a8a6ab74d27ce2e1bbc64e58ad242cd99 +Subproject commit a00eb4fa82843a0ff9f15bb78cf1aeb2d4005e28 diff --git a/version.props b/version.props index 4497e8d87f..e07fa4c22e 100644 --- a/version.props +++ b/version.props @@ -4,15 +4,15 @@ 2 0 $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$(AspNetCorePatchVersion) - preview2 + preview3 t000 - $(VersionPrefix) Preview 2 + $(VersionPrefix) Preview 3 $(PackageBrandingVersion) Build $(BuildNumber) 0.2.0 - preview2 + preview3 $(PrereleaseVersionLabel) $(PackageVersionSuffix)-$(BuildNumber) From f8762a06c355099552e7ffb74a8f37aba5927730 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Wed, 5 Sep 2018 16:48:22 -0700 Subject: [PATCH 6/6] Updating submodule(s) IISIntegration => 2f4172e7e70b18da3b1a5d8a22a6fb397ca3b837 [auto-updated: submodules] --- modules/IISIntegration | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/IISIntegration b/modules/IISIntegration index 9b5e34e197..2f4172e7e7 160000 --- a/modules/IISIntegration +++ b/modules/IISIntegration @@ -1 +1 @@ -Subproject commit 9b5e34e197f2c614573884f9b6c4e0c48fe2717a +Subproject commit 2f4172e7e70b18da3b1a5d8a22a6fb397ca3b837