From cd36ae4f165136d95002d9afc030c7b2cb272280 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 31 Oct 2018 23:53:13 -0700 Subject: [PATCH 1/6] Delete mv_to_src.sh --- mv_to_src.sh | 35 ----------------------------------- 1 file changed, 35 deletions(-) delete mode 100644 mv_to_src.sh diff --git a/mv_to_src.sh b/mv_to_src.sh deleted file mode 100644 index 2360a52087..0000000000 --- a/mv_to_src.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash - -dir="$(pwd)" -name="IISIntegration" - -if [ "$skip_src" != false ]; then - echo "Moving $dir into src/$name/" - if [ -d "src/" ]; then - git mv src/ src_tmp/ - fi - mkdir -p "src/$name" - if [ -d "src_tmp/" ]; then - git mv src_tmp/ "src/$name/src/" - fi -fi - -files_to_mv=(NuGetPackageVerifier.json .gitignore README.md version.props Directory.Build.props Directory.Build.targets *.sln shared test tools samples build NuGet benchmarks korebuild.json nuget) -for f in "${files_to_mv[@]}"; do - if [ -e $f ]; then - echo "Moving $f" - git mv $f "src/$name/$f" - fi -done - -files_to_rm=(build.sh build.cmd run.cmd run.sh run.ps1 NuGet.config korebuild-lock.txt .github .vsts-pipelines .vscode .appveyor.yml .travis.yml CONTRIBUTING.md) -for f in "${files_to_rm[@]}"; do - if [ -e $f ]; then - echo "Removing $f" - git rm -r $f - fi -done - -echo "Reorganize source code from aspnet/$name into a subfolder" > .git/COMMIT_EDITMSG -echo "" >> .git/COMMIT_EDITMSG -echo "Prior to reorg, this source existed at https://github.com/aspnet/$name/tree/$(git rev-parse HEAD)" >> .git/COMMIT_EDITMSG \ No newline at end of file From 4c63404bf5f89efc8812a2b2c7021107c2f75f03 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 1 Nov 2018 00:21:55 -0700 Subject: [PATCH 2/6] Update build tools to 2.2.0-preview2-20181031.7 --- global.json | 2 +- korebuild-lock.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/global.json b/global.json index 7372733c79..19698a2be4 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "version": "2.2.100-rtm-009571" }, "msbuild-sdks": { - "Internal.AspNetCore.Sdk": "2.2.0-preview2-20181031.2" + "Internal.AspNetCore.Sdk": "2.2.0-preview2-20181031.7" } } diff --git a/korebuild-lock.txt b/korebuild-lock.txt index e79edadb49..a941100efd 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview2-20181031.2 -commithash:4c07148aca6305fe180792bdaefeb0a573b796ad +version:2.2.0-preview2-20181031.7 +commithash:fbd6da7e4dc130cb73a3b8583a326ac1338ca0cf From 57d52d392d4f9711fba0625bdab327e89e0c8152 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 1 Nov 2018 00:25:05 -0700 Subject: [PATCH 3/6] Add Microsoft.NETFramework.ReferenceAssemblies to list of external dependencies --- build/dependencies.props | 1 + build/external-dependencies.props | 1 + build/sources.props | 1 + 3 files changed, 3 insertions(+) diff --git a/build/dependencies.props b/build/dependencies.props index 90b1d52834..2d5779f750 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -101,6 +101,7 @@ 2.1.3 $(MicrosoftNETCoreApp21PackageVersion) 1.0.1 + 1.0.0-alpha-004 15.6.1 3.0.1 3.0.1 diff --git a/build/external-dependencies.props b/build/external-dependencies.props index 2057afdc9a..0afff9cdfd 100644 --- a/build/external-dependencies.props +++ b/build/external-dependencies.props @@ -108,6 +108,7 @@ + diff --git a/build/sources.props b/build/sources.props index a08e49dfdb..039b4f37fd 100644 --- a/build/sources.props +++ b/build/sources.props @@ -18,6 +18,7 @@ https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json; https://dotnet.myget.org/F/aspnetcore-master/api/v3/index.json; https://dotnet.myget.org/F/roslyn/api/v3/index.json; + https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json; https://vside.myget.org/F/vssdk/api/v3/index.json; https://vside.myget.org/F/vsmac/api/v3/index.json From ec8573f3ab127821cfc82f3eeb89232900598042 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Thu, 1 Nov 2018 00:29:58 -0700 Subject: [PATCH 4/6] Updating submodule(s) Diagnostics => c802d5ef5fba1ba8dfbcb8c3741af2ba15e9d1aa HttpSysServer => 3e08bf8833827737a5bd1b64210c7a5e8e2941ec JsonPatch => 3b485909ebec98d9437058dbcf45dac3ccd1f157 KestrelHttpServer => d50c0c13b9fd13cf7817afe6df9dd459b925e708 Logging => d39ac3492dc075a13580419b698960fe084a7c00 MetaPackages => 27efce1042914569097d6c68db404e5286ad7b20 Mvc => a6199bbfbab05583f987bae322fb04566841aaea SignalR => 83139d36f4c7c97019b5738c747ac51af75c9357 [auto-updated: submodules] --- modules/Diagnostics | 2 +- modules/HttpSysServer | 2 +- modules/JsonPatch | 2 +- modules/KestrelHttpServer | 2 +- modules/Logging | 2 +- modules/MetaPackages | 2 +- modules/Mvc | 2 +- modules/SignalR | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/Diagnostics b/modules/Diagnostics index 4c94bc272b..c802d5ef5f 160000 --- a/modules/Diagnostics +++ b/modules/Diagnostics @@ -1 +1 @@ -Subproject commit 4c94bc272b97ee1ff402078c76655801144eb707 +Subproject commit c802d5ef5fba1ba8dfbcb8c3741af2ba15e9d1aa diff --git a/modules/HttpSysServer b/modules/HttpSysServer index 0a22b927b2..3e08bf8833 160000 --- a/modules/HttpSysServer +++ b/modules/HttpSysServer @@ -1 +1 @@ -Subproject commit 0a22b927b20d79177cf97e10111190ab812b98a7 +Subproject commit 3e08bf8833827737a5bd1b64210c7a5e8e2941ec diff --git a/modules/JsonPatch b/modules/JsonPatch index aeb5c578e7..3b485909eb 160000 --- a/modules/JsonPatch +++ b/modules/JsonPatch @@ -1 +1 @@ -Subproject commit aeb5c578e7d59cf9b100352f55f05f55c7cfebd1 +Subproject commit 3b485909ebec98d9437058dbcf45dac3ccd1f157 diff --git a/modules/KestrelHttpServer b/modules/KestrelHttpServer index e958d82584..d50c0c13b9 160000 --- a/modules/KestrelHttpServer +++ b/modules/KestrelHttpServer @@ -1 +1 @@ -Subproject commit e958d8258445c2cda73c244d586f06ca6753be4e +Subproject commit d50c0c13b9fd13cf7817afe6df9dd459b925e708 diff --git a/modules/Logging b/modules/Logging index 2e30d867a4..d39ac3492d 160000 --- a/modules/Logging +++ b/modules/Logging @@ -1 +1 @@ -Subproject commit 2e30d867a412cd7b543f7ec0ed3932be0d08b8e3 +Subproject commit d39ac3492dc075a13580419b698960fe084a7c00 diff --git a/modules/MetaPackages b/modules/MetaPackages index 9949306ca3..27efce1042 160000 --- a/modules/MetaPackages +++ b/modules/MetaPackages @@ -1 +1 @@ -Subproject commit 9949306ca3229c41fc952edee981d34ece62c637 +Subproject commit 27efce1042914569097d6c68db404e5286ad7b20 diff --git a/modules/Mvc b/modules/Mvc index c74a945dda..a6199bbfba 160000 --- a/modules/Mvc +++ b/modules/Mvc @@ -1 +1 @@ -Subproject commit c74a945dda2c96af30bb9dd1482a67edfe6fdd56 +Subproject commit a6199bbfbab05583f987bae322fb04566841aaea diff --git a/modules/SignalR b/modules/SignalR index 865de16086..83139d36f4 160000 --- a/modules/SignalR +++ b/modules/SignalR @@ -1 +1 @@ -Subproject commit 865de160864d512628fecd2116ae49d6feeef7f1 +Subproject commit 83139d36f4c7c97019b5738c747ac51af75c9357 From f170981fec61f1b1b1035dcb3f92db99a09448ab Mon Sep 17 00:00:00 2001 From: Javier Calvarro Nelson Date: Thu, 1 Nov 2018 11:24:41 -0700 Subject: [PATCH 5/6] Add auth server package --- build/artifacts.props | 1 + build/dependencies.props | 3 +++ modules/Identity | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/build/artifacts.props b/build/artifacts.props index 3939eb38ff..f3b205a5cb 100644 --- a/build/artifacts.props +++ b/build/artifacts.props @@ -23,6 +23,7 @@ + diff --git a/build/dependencies.props b/build/dependencies.props index 2d5779f750..e0f5d607bb 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -67,6 +67,9 @@ 2.0.0 8.7.0 4.2.1 + 2.3.0-preview1-update2 + 2.3.0-preview1-update2 + 2.3.0-preview1-update1 3.1.0 1.10.0 1.7.3.4 diff --git a/modules/Identity b/modules/Identity index da9318f431..5e10eb1d1a 160000 --- a/modules/Identity +++ b/modules/Identity @@ -1 +1 @@ -Subproject commit da9318f4313064a019772757fd96d94b65d5a5d9 +Subproject commit 5e10eb1d1ab934a381a8894478016e618930142c From 4fc16c87e92e788c016662542e86e4f2a2860c3a Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Thu, 1 Nov 2018 12:04:14 -0700 Subject: [PATCH 6/6] Updating submodule(s) DotNetTools => fbca8be4042533db160704324e4f095efe77583d SignalR => 4496366794fda2cb35444163a0cb48ec8f931c90 [auto-updated: submodules] --- modules/DotNetTools | 2 +- modules/SignalR | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/DotNetTools b/modules/DotNetTools index bda375e411..fbca8be404 160000 --- a/modules/DotNetTools +++ b/modules/DotNetTools @@ -1 +1 @@ -Subproject commit bda375e4113250043f93912b0b961407155bd793 +Subproject commit fbca8be4042533db160704324e4f095efe77583d diff --git a/modules/SignalR b/modules/SignalR index 83139d36f4..4496366794 160000 --- a/modules/SignalR +++ b/modules/SignalR @@ -1 +1 @@ -Subproject commit 83139d36f4c7c97019b5738c747ac51af75c9357 +Subproject commit 4496366794fda2cb35444163a0cb48ec8f931c90