From 333a8c6a97bbe8a2ffce41eca233186b73a98237 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Wed, 14 Feb 2018 16:42:53 +0000 Subject: [PATCH 1/5] Updating BuildTools from 2.1.0-preview1-1015 to 2.1.0-preview1-1023 [auto-updated: buildtools] --- korebuild-lock.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 0939dd836b..434d675c5b 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.1.0-preview1-1015 -commithash:49ab99ab084250ae35773443f387fd7722c9e60c +version:2.1.0-preview1-1023 +commithash:5111f89ef43885db3dcf81cefc84e2a1d6715b73 From ed81c403e3fbc7e26809d27612854bd2518cb49d Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Wed, 14 Feb 2018 09:31:14 -0800 Subject: [PATCH 2/5] Updating submodule(s) AzureIntegration => 730a744dbbcb10ca646d28d0a42fc4dbb63e7b47 [auto-updated: submodules] --- modules/AzureIntegration | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/AzureIntegration b/modules/AzureIntegration index 183f476492..730a744dbb 160000 --- a/modules/AzureIntegration +++ b/modules/AzureIntegration @@ -1 +1 @@ -Subproject commit 183f4764920d180f2db7bef7fafbce1426dfbce5 +Subproject commit 730a744dbbcb10ca646d28d0a42fc4dbb63e7b47 From 3378e0b86eca1fc77d55b0fe65871cc847be41fb Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Wed, 14 Feb 2018 09:31:24 -0800 Subject: [PATCH 3/5] Updating BuildTools from 2.1.0-preview1-1023 to 2.1.0-preview1-1025 [auto-updated: buildtools] --- korebuild-lock.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 434d675c5b..46abcdc657 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.1.0-preview1-1023 +version:2.1.0-preview1-1025 commithash:5111f89ef43885db3dcf81cefc84e2a1d6715b73 From 3eb84caa3a68e9292c5dd3e1b151b2e950e94741 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Wed, 14 Feb 2018 10:09:36 -0800 Subject: [PATCH 4/5] Updating submodule(s) IISIntegration => 6e0189c312292e1a8350fbd6528914e1b7d0c3b5 [auto-updated: submodules] --- modules/IISIntegration | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/IISIntegration b/modules/IISIntegration index e133377d72..6e0189c312 160000 --- a/modules/IISIntegration +++ b/modules/IISIntegration @@ -1 +1 @@ -Subproject commit e133377d724ab985010079b5bb0ac06164cb2b53 +Subproject commit 6e0189c312292e1a8350fbd6528914e1b7d0c3b5 From 9aa67caa59e0b04980cbeee13374ca31415f4f72 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 14 Feb 2018 11:28:57 -0800 Subject: [PATCH 5/5] Put aspnetcore-runtime installers into a subfolder in dotnetcli (#886) --- .appveyor.yml | 3 +-- README.md | 42 +++++++++++++++++++++--------------------- build/Publish.targets | 4 ++-- 3 files changed, 24 insertions(+), 25 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 6b8813a0c9..ffc91c0d3f 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -7,8 +7,7 @@ branches: - dev - /^(.*\/)?ci-.*$/ install: - # Set depth to 50 because the commit we need may not be at the tip of the branch configured in .gitmodules - - git submodule update --init --depth=50 --recursive + - git submodule update --init --recursive skip_commits: message: /.*\[auto-updated:.*/ build_script: diff --git a/README.md b/README.md index 38803645b5..c14247ba29 100644 --- a/README.md +++ b/README.md @@ -36,38 +36,38 @@ packages that will not be supported in a officially released build. Commonly referenced packages: -[all-metapackage-myget]: https://dotnet.myget.org/feed/aspnetcore-dev/package/nuget/Microsoft.AspNetCore.All -[all-metapackage-myget-badge]: http://img.shields.io/dotnet.myget/aspnetcore-dev/v/Microsoft.AspNetCore.All.svg?style=flat-square&label=myget +[app-metapackage-myget]: https://dotnet.myget.org/feed/aspnetcore-dev/package/nuget/Microsoft.AspNetCore.App +[app-metapackage-myget-badge]: http://img.shields.io/dotnet.myget/aspnetcore-dev/v/Microsoft.AspNetCore.App.svg?style=flat-square&label=myget [metapackage-myget]: https://dotnet.myget.org/feed/aspnetcore-dev/package/nuget/Microsoft.AspNetCore [metapackage-myget-badge]: http://img.shields.io/dotnet.myget/aspnetcore-dev/v/Microsoft.AspNetCore.svg?style=flat-square&label=myget Package | MyGet :---------------------------------|:--------------------------------------------------------- -Microsoft.AspNetCore.All | [![][all-metapackage-myget-badge]][all-metapackage-myget] +Microsoft.AspNetCore.App | [![][app-metapackage-myget-badge]][app-metapackage-myget] Microsoft.AspNetCore | [![][metapackage-myget-badge]][metapackage-myget] ### ASP.NET Core Shared Framework -[badge-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/aspnetcore-runtime-win-x64-version-badge.svg -[win-x64-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/aspnetcore-runtime-latest-win-x64.zip -[win-x64-exe]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/aspnetcore-runtime-latest-win-x64.exe -[win-x86-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/aspnetcore-runtime-latest-win-x86.zip -[win-x86-exe]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/aspnetcore-runtime-latest-win-x86.exe -[linux-x64-tar]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/aspnetcore-runtime-latest-linux-x64.tar.gz -[osx-x64-tar]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/aspnetcore-runtime-latest-osx-x64.tar.gz -[debian-x64-deb]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/aspnetcore-runtime-latest-x64.deb -[redhat-x64-rpm]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/aspnetcore-runtime-latest-x64.rpm +[badge-master]: https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/Runtime/master/aspnetcore-runtime-win-x64-version-badge.svg +[win-x64-zip]: https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/Runtime/master/aspnetcore-runtime-latest-win-x64.zip +[win-x64-exe]: https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/Runtime/master/aspnetcore-runtime-latest-win-x64.exe +[win-x86-zip]: https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/Runtime/master/aspnetcore-runtime-latest-win-x86.zip +[win-x86-exe]: https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/Runtime/master/aspnetcore-runtime-latest-win-x86.exe +[linux-x64-tar]: https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/Runtime/master/aspnetcore-runtime-latest-linux-x64.tar.gz +[osx-x64-tar]: https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/Runtime/master/aspnetcore-runtime-latest-osx-x64.tar.gz +[debian-x64-deb]: https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/Runtime/master/aspnetcore-runtime-latest-x64.deb +[redhat-x64-rpm]: https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/Runtime/master/aspnetcore-runtime-latest-x64.rpm -[badge-rel-21]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.1/aspnetcore-runtime-win-x64-version-badge.svg -[win-x64-zip-rel-21]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.1/aspnetcore-runtime-latest-win-x64.zip -[win-x64-exe-rel-21]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.1/aspnetcore-runtime-latest-win-x64.exe -[win-x86-zip-rel-21]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.1/aspnetcore-runtime-latest-win-x86.zip -[win-x86-exe-rel-21]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.1/aspnetcore-runtime-latest-win-x86.exe -[linux-x64-tar-rel-21]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.1/aspnetcore-runtime-latest-linux-x64.tar.gz -[osx-x64-tar-rel-21]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.1/aspnetcore-runtime-latest-osx-x64.tar.gz -[debian-x64-deb-rel-21]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.1/aspnetcore-runtime-latest-x64.deb -[redhat-x64-rpm-rel-21]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.1/aspnetcore-runtime-latest-x64.rpm +[badge-rel-21]: https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/Runtime/release/2.1/aspnetcore-runtime-win-x64-version-badge.svg +[win-x64-zip-rel-21]: https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/Runtime/release/2.1/aspnetcore-runtime-latest-win-x64.zip +[win-x64-exe-rel-21]: https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/Runtime/release/2.1/aspnetcore-runtime-latest-win-x64.exe +[win-x86-zip-rel-21]: https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/Runtime/release/2.1/aspnetcore-runtime-latest-win-x86.zip +[win-x86-exe-rel-21]: https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/Runtime/release/2.1/aspnetcore-runtime-latest-win-x86.exe +[linux-x64-tar-rel-21]: https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/Runtime/release/2.1/aspnetcore-runtime-latest-linux-x64.tar.gz +[osx-x64-tar-rel-21]: https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/Runtime/release/2.1/aspnetcore-runtime-latest-osx-x64.tar.gz +[debian-x64-deb-rel-21]: https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/Runtime/release/2.1/aspnetcore-runtime-latest-x64.deb +[redhat-x64-rpm-rel-21]: https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/Runtime/release/2.1/aspnetcore-runtime-latest-x64.rpm Platform | Latest (dev branch)
![][badge-master] | release/2.1
![][badge-rel-21] :---------------------|:----------------------------------------------------------------|:------------------------------------------------------------------------- diff --git a/build/Publish.targets b/build/Publish.targets index 08b5abecf7..a358da7a58 100644 --- a/build/Publish.targets +++ b/build/Publish.targets @@ -58,8 +58,8 @@ - Runtime/$(PackageVersion)/ - Runtime/$(SharedFxCliBlobChannel)/ + aspnetcore/Runtime/$(PackageVersion)/ + aspnetcore/Runtime/$(SharedFxCliBlobChannel)/ nuGetPackagesArchive-$(PackageVersion).lzma aspnetcore-runtime-$(PackageVersion) aspnetcore-runtime-latest