diff --git a/.appveyor.yml b/.appveyor.yml
index 9df1571da9..ead5b5f357 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -4,7 +4,6 @@ branches:
only:
- master
- /^release\/.*/
- - dev
- /^(.*\/)?ci-.*$/
install:
- git submodule update --init --recursive
diff --git a/.gitmodules b/.gitmodules
index c2970f34c1..b867c4c3c1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,188 +1,192 @@
[submodule "modules/AADIntegration"]
path = modules/AADIntegration
url = https://github.com/aspnet/AADIntegration.git
- branch = release/2.2
+ branch = master
[submodule "modules/Antiforgery"]
path = modules/Antiforgery
url = https://github.com/aspnet/Antiforgery.git
- branch = release/2.2
+ branch = master
[submodule "modules/AuthSamples"]
path = modules/AuthSamples
url = https://github.com/aspnet/AuthSamples.git
- branch = release/2.2
+ branch = master
[submodule "modules/AzureIntegration"]
path = modules/AzureIntegration
url = https://github.com/aspnet/AzureIntegration.git
- branch = release/2.2
+ branch = master
[submodule "modules/BasicMiddleware"]
path = modules/BasicMiddleware
url = https://github.com/aspnet/BasicMiddleware.git
- branch = release/2.2
+ branch = master
[submodule "modules/BrowserLink"]
path = modules/BrowserLink
url = https://github.com/aspnet/BrowserLink.git
- branch = release/2.2
+ branch = master
[submodule "modules/Caching"]
path = modules/Caching
url = https://github.com/aspnet/Caching.git
- branch = release/2.2
+ branch = master
[submodule "modules/Common"]
path = modules/Common
url = https://github.com/aspnet/Common.git
- branch = release/2.2
+ branch = master
[submodule "modules/Configuration"]
path = modules/Configuration
url = https://github.com/aspnet/Configuration.git
- branch = release/2.2
+ branch = master
[submodule "modules/CORS"]
path = modules/CORS
url = https://github.com/aspnet/CORS.git
- branch = release/2.2
+ branch = master
[submodule "modules/DataProtection"]
path = modules/DataProtection
url = https://github.com/aspnet/DataProtection.git
- branch = release/2.2
+ branch = master
[submodule "modules/DependencyInjection"]
path = modules/DependencyInjection
url = https://github.com/aspnet/DependencyInjection.git
- branch = release/2.2
+ branch = master
[submodule "modules/Diagnostics"]
path = modules/Diagnostics
url = https://github.com/aspnet/Diagnostics.git
- branch = release/2.2
+ branch = master
[submodule "modules/DotNetTools"]
path = modules/DotNetTools
url = https://github.com/aspnet/DotNetTools.git
- branch = release/2.2
+ branch = master
[submodule "modules/EntityFrameworkCore"]
path = modules/EntityFrameworkCore
url = https://github.com/aspnet/EntityFrameworkCore.git
- branch = release/2.2
+ branch = master
[submodule "modules/EventNotification"]
path = modules/EventNotification
url = https://github.com/aspnet/EventNotification.git
- branch = release/2.2
+ branch = master
[submodule "modules/FileSystem"]
path = modules/FileSystem
url = https://github.com/aspnet/FileSystem.git
- branch = release/2.2
+ branch = master
[submodule "modules/Hosting"]
path = modules/Hosting
url = https://github.com/aspnet/Hosting.git
- branch = release/2.2
+ branch = master
[submodule "modules/HtmlAbstractions"]
path = modules/HtmlAbstractions
url = https://github.com/aspnet/HtmlAbstractions.git
- branch = release/2.2
+ branch = master
[submodule "modules/HttpAbstractions"]
path = modules/HttpAbstractions
url = https://github.com/aspnet/HttpAbstractions.git
- branch = release/2.2
+ branch = master
[submodule "modules/HttpClientFactory"]
path = modules/HttpClientFactory
url = https://github.com/aspnet/HttpClientFactory.git
- branch = release/2.2
+ branch = master
[submodule "modules/HttpSysServer"]
path = modules/HttpSysServer
url = https://github.com/aspnet/HttpSysServer.git
- branch = release/2.2
+ branch = master
[submodule "modules/Identity"]
path = modules/Identity
url = https://github.com/aspnet/Identity.git
- branch = release/2.2
+ branch = master
[submodule "modules/IISIntegration"]
path = modules/IISIntegration
url = https://github.com/aspnet/IISIntegration.git
- branch = release/2.2
+ branch = master
[submodule "modules/JavaScriptServices"]
path = modules/JavaScriptServices
url = https://github.com/aspnet/JavaScriptServices.git
- branch = release/2.2
+ branch = master
[submodule "modules/JsonPatch"]
path = modules/JsonPatch
url = https://github.com/aspnet/JsonPatch.git
- branch = release/2.2
+ branch = master
[submodule "modules/KestrelHttpServer"]
path = modules/KestrelHttpServer
url = https://github.com/aspnet/KestrelHttpServer.git
- branch = release/2.2
+ branch = master
[submodule "modules/Localization"]
path = modules/Localization
url = https://github.com/aspnet/Localization.git
- branch = release/2.2
+ branch = master
[submodule "modules/Logging"]
path = modules/Logging
url = https://github.com/aspnet/Logging.git
- branch = release/2.2
+ branch = master
[submodule "modules/MetaPackages"]
path = modules/MetaPackages
url = https://github.com/aspnet/MetaPackages.git
- branch = release/2.2
+ branch = master
[submodule "modules/Microsoft.Data.Sqlite"]
path = modules/Microsoft.Data.Sqlite
url = https://github.com/aspnet/Microsoft.Data.Sqlite.git
- branch = release/2.2
+ branch = master
[submodule "modules/MusicStore"]
path = modules/MusicStore
url = https://github.com/aspnet/MusicStore.git
- branch = release/2.2
+ branch = master
[submodule "modules/Mvc"]
path = modules/Mvc
url = https://github.com/aspnet/Mvc.git
- branch = release/2.2
+ branch = master
[submodule "modules/MvcPrecompilation"]
path = modules/MvcPrecompilation
url = https://github.com/aspnet/MvcPrecompilation.git
- branch = release/2.2
+ branch = master
[submodule "modules/Options"]
path = modules/Options
url = https://github.com/aspnet/Options.git
- branch = release/2.2
+ branch = master
[submodule "modules/Proxy"]
path = modules/Proxy
url = https://github.com/aspnet/Proxy.git
- branch = release/2.2
+ branch = master
[submodule "modules/Razor"]
path = modules/Razor
url = https://github.com/aspnet/Razor.git
- branch = release/2.2
+ branch = master
[submodule "modules/ResponseCaching"]
path = modules/ResponseCaching
url = https://github.com/aspnet/ResponseCaching.git
- branch = release/2.2
+ branch = master
[submodule "modules/Routing"]
path = modules/Routing
url = https://github.com/aspnet/Routing.git
- branch = release/2.2
+ branch = master
[submodule "modules/Scaffolding"]
path = modules/Scaffolding
url = https://github.com/aspnet/Scaffolding.git
- branch = release/2.2
+ branch = master
[submodule "modules/Security"]
path = modules/Security
url = https://github.com/aspnet/Security.git
- branch = release/2.2
+ branch = master
[submodule "modules/ServerTests"]
path = modules/ServerTests
url = https://github.com/aspnet/ServerTests.git
- branch = release/2.2
+ branch = master
[submodule "modules/Session"]
path = modules/Session
url = https://github.com/aspnet/Session.git
- branch = release/2.2
+ branch = master
[submodule "modules/SignalR"]
path = modules/SignalR
url = https://github.com/aspnet/SignalR.git
- branch = release/2.2
+ branch = master
[submodule "modules/StaticFiles"]
path = modules/StaticFiles
url = https://github.com/aspnet/StaticFiles.git
- branch = release/2.2
+ branch = master
[submodule "modules/Templating"]
path = modules/Templating
url = https://github.com/aspnet/Templating.git
- branch = release/2.2
+ branch = master
[submodule "modules/WebSockets"]
path = modules/WebSockets
url = https://github.com/aspnet/WebSockets.git
- branch = release/2.2
+ branch = master
+[submodule "modules/WebHooks"]
+ path = modules/WebHooks
+ url = https://github.com/aspnet/WebHooks.git
+ branch = master
diff --git a/.travis.yml b/.travis.yml
index ffb7a95841..698d1c1d19 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,6 @@ branches:
only:
- master
- /^release\/.*/
- - dev
- /^(.*\/)?ci-.*$/
script:
- ./build.sh -t:CheckUniverse
diff --git a/Directory.Build.targets b/Directory.Build.targets
index 73b97f2807..181bfc9f70 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -2,6 +2,7 @@
$(MicrosoftNETCoreApp21PackageVersion)
$(MicrosoftNETCoreApp22PackageVersion)
+ $(MicrosoftNETCoreApp30PackageVersion)
$(NETStandardLibrary20PackageVersion)
99.9
diff --git a/README.md b/README.md
index fd97fb2440..e3a225ce36 100644
--- a/README.md
+++ b/README.md
@@ -85,7 +85,7 @@ Microsoft.AspNetCore | [![][metapackage-myget-badge]][metapackage-m
[linux-arm-tar-rel-21]: https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/Runtime/release/2.1/aspnetcore-runtime-latest-linux-arm.tar.gz
[linux-musl-x64-tar-rel-21]: https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/Runtime/release/2.1/aspnetcore-runtime-latest-linux-musl-x64.tar.gz
-Platform | Latest (dev branch)
![][badge-master] | release/2.2
![][badge-rel-22] | release/2.1
![][badge-rel-21]
+Platform | Latest (master branch)
![][badge-master] | release/2.2
![][badge-rel-22] | release/2.1
![][badge-rel-21]
:---------------------|:----------------------------------------------------------------|:------------------------------------------------------------------------- |:-------------------------------------------------------------------------
Channel name1 | `master` | `release/2.2` | `release/2.1`
Windows (x64) | [Installer (exe)][win-x64-exe]
[Archive (zip)][win-x64-zip] | [Installer (exe)][win-x64-exe-rel-22]
[Archive (zip)][win-x64-zip-rel-22] | [Installer (exe)][win-x64-exe-rel-21]
[Archive (zip)][win-x64-zip-rel-21]
diff --git a/build/SharedFx.props b/build/SharedFx.props
index babe57db55..e5666bd06f 100644
--- a/build/SharedFx.props
+++ b/build/SharedFx.props
@@ -23,7 +23,7 @@
.dll
.dylib
.exe
- netcoreapp2.2
+ netcoreapp3.0
aspnetcore-runtime
diff --git a/build/SharedFx.targets b/build/SharedFx.targets
index eba35eb5ef..7809cb8613 100644
--- a/build/SharedFx.targets
+++ b/build/SharedFx.targets
@@ -47,7 +47,7 @@
$(CommonProps);DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcesPropsPath)
$(CommonProps);DotNetBuildOffline=true
$(CommonProps);AspNetUniverseBuildOffline=true
- $(CommonProps);RuntimeFrameworkVersion=$(MicrosoftNETCoreApp22PackageVersion)
+ $(CommonProps);RuntimeFrameworkVersion=$(MicrosoftNETCoreApp30PackageVersion)
$(CommonProps);AppMetapackageVersion=$(PackageVersion)
@@ -173,10 +173,10 @@
SharedFxWorkDirectory=$(AppSharedFxWorkDirectory)
- $(AppSharedFxProps);RuntimeFrameworkVersion=$(MicrosoftNETCoreApp22PackageVersion)
+ $(AppSharedFxProps);RuntimeFrameworkVersion=$(MicrosoftNETCoreApp30PackageVersion)
$(AppSharedFxProps);SharedFxPackage=Microsoft.AspNetCore.App
SharedFxWorkDirectory=$(AllSharedFxWorkDirectory)
- $(AllSharedFxProps);RuntimeFrameworkVersion=$(MicrosoftNETCoreApp22PackageVersion)
+ $(AllSharedFxProps);RuntimeFrameworkVersion=$(MicrosoftNETCoreApp30PackageVersion)
$(AllSharedFxProps);SharedFxPackage=Microsoft.AspNetCore.All
$(AllSharedFxProps);SharedFxDep=Microsoft.AspNetCore.App
$(AllSharedFxProps);SharedFxDepVersion=$(PackageVersion)
diff --git a/build/artifacts.props b/build/artifacts.props
index fe09278849..502aa72823 100644
--- a/build/artifacts.props
+++ b/build/artifacts.props
@@ -177,6 +177,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -186,7 +203,7 @@
-
+
diff --git a/build/buildorder.props b/build/buildorder.props
index 01b5bf8267..4c4e98d981 100644
--- a/build/buildorder.props
+++ b/build/buildorder.props
@@ -41,6 +41,7 @@
+
diff --git a/build/dependencies.props b/build/dependencies.props
index db61fe962d..bed63b5795 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -1,16 +1,42 @@
-
- 2.2.0-preview1-26618-02
- 2.2.0-preview1-26618-02
+ 4.6.0-preview1-26708-04
+ 3.0.0-preview1-26710-03
+
+ 3.0.0-preview1-26710-03
+ 3.0.0-preview1-26710-03
+ 4.6.0-preview1-26708-04
+ 4.6.0-preview1-26708-04
+ 1.6.0-preview1-26708-04
+ 4.6.0-preview1-26708-04
+ 4.6.0-preview1-26708-04
+ 4.6.0-preview1-26708-04
+ 4.6.0-preview1-26708-04
+ 4.6.0-preview1-26708-04
+ 4.6.0-preview1-26708-04
+ 4.6.0-preview1-26708-04
+ 4.6.0-preview1-26708-04
+ 4.6.0-preview1-26708-04
+ 1.7.0-preview1-26708-04
+ 4.6.0-preview1-26708-04
+ 4.6.0-preview1-26708-04
+ 4.6.0-preview1-26708-04
+ 4.6.0-preview1-26708-04
+ 4.6.0-preview1-26708-04
+ 4.6.0-preview1-26708-04
+ 4.6.0-preview1-26708-04
+ 4.6.0-preview1-26708-04
+ 4.10.0-preview1-26708-04
+ 4.6.0-preview1-26708-04
+ 4.6.0-preview1-26708-04
- $(MicrosoftNETCoreAppPackageVersion)
+ $(MicrosoftNETCoreAppPackageVersion)
$(KoreBuildVersion)
@@ -57,11 +83,9 @@
2.8.0
2.8.0
2.8.0
- 4.5.0
1.7.0
0.2.0-beta-63019-01
1.0.0-rc3-003121
- 2.1.0
1.1.0
3.14.2
5.2.0
@@ -71,7 +95,9 @@
1.1.9
2.0.9
2.1.2
+ 2.2.0-preview1-26618-02
$(MicrosoftNETCoreApp21PackageVersion)
+ $(MicrosoftNETCoreApp22PackageVersion)
1.0.1
15.6.1
3.0.1
@@ -94,7 +120,6 @@
15.6.161-preview
11.1.0
1.4.0
- 4.5.0
1.3.8
1.0.1
4.7.49
@@ -115,35 +140,12 @@
1.2.6
1.1.92
1.0.0
- 4.5.0
- 1.5.0
- 4.5.0
- 4.5.1
- 4.5.0
- 4.5.0
5.2.0
3.1.1
- 4.5.0
- 4.5.1
4.3.2
- 4.5.0
- 4.5.1
- 4.5.0
3.1.1
4.3.0
- 1.6.0
- 4.5.1
4.3.0
- 4.5.0
- 4.5.0
- 4.5.0
- 4.5.0
- 4.5.0
- 4.5.0
- 4.5.0
- 4.9.0
- 4.5.1
- 4.5.0
1.3.7
9.0.1
2.9.0-beta4-62911-02
diff --git a/build/external-dependencies.props b/build/external-dependencies.props
index 65900209e5..2a72ca410b 100644
--- a/build/external-dependencies.props
+++ b/build/external-dependencies.props
@@ -75,9 +75,11 @@
+
+
diff --git a/build/repo.props b/build/repo.props
index 0fad8fa291..0346602d9d 100644
--- a/build/repo.props
+++ b/build/repo.props
@@ -43,12 +43,12 @@
-
diff --git a/build/repo.targets b/build/repo.targets
index a9eb20dee0..80a5b354c0 100644
--- a/build/repo.targets
+++ b/build/repo.targets
@@ -34,6 +34,7 @@
MicrosoftNETCoreAppPackageVersion=$(MicrosoftNETCoreAppPackageVersion);
+ $(DesignTimeBuildProps);MicrosoftNETCoreApp30PackageVersion=$(MicrosoftNETCoreApp30PackageVersion);
$(DesignTimeBuildProps);MicrosoftNETCoreApp22PackageVersion=$(MicrosoftNETCoreApp22PackageVersion);
$(DesignTimeBuildProps);MicrosoftNETCoreApp21PackageVersion=$(MicrosoftNETCoreApp21PackageVersion);
$(DesignTimeBuildProps);MicrosoftNETCoreApp20PackageVersion=$(MicrosoftNETCoreApp20PackageVersion);
diff --git a/build/submodules.props b/build/submodules.props
index 13e649eb09..a5ff155336 100644
--- a/build/submodules.props
+++ b/build/submodules.props
@@ -51,6 +51,7 @@
+
diff --git a/build/tools/templates/Archive/Archive.csproj b/build/tools/templates/Archive/Archive.csproj
index b953688f1e..b0b60f6777 100644
--- a/build/tools/templates/Archive/Archive.csproj
+++ b/build/tools/templates/Archive/Archive.csproj
@@ -1,7 +1,7 @@
- netcoreapp2.2
+ netcoreapp3.0
false
true
true
diff --git a/build/tools/templates/SharedFx/SharedFx.csproj b/build/tools/templates/SharedFx/SharedFx.csproj
index 60d28275ec..8070ebbfe6 100644
--- a/build/tools/templates/SharedFx/SharedFx.csproj
+++ b/build/tools/templates/SharedFx/SharedFx.csproj
@@ -1,7 +1,7 @@
- netcoreapp2.2
+ netcoreapp3.0
true
true
diff --git a/korebuild-lock.txt b/korebuild-lock.txt
index 27e2e80f9a..65be0f3d8e 100644
--- a/korebuild-lock.txt
+++ b/korebuild-lock.txt
@@ -1,2 +1,2 @@
-version:2.2.0-preview1-17099
-commithash:263ed1db9866b6b419b1f5d5189a712aa218acb3
+version:3.0.0-alpha1-10008
+commithash:62b1d90d52185db39173f383a2b820d2c2b45c07
diff --git a/korebuild.json b/korebuild.json
index 1cfd76c544..2a75c43d76 100644
--- a/korebuild.json
+++ b/korebuild.json
@@ -1,6 +1,6 @@
{
- "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/release/2.2/tools/korebuild.schema.json",
- "channel": "release/2.2",
+ "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/master/tools/korebuild.schema.json",
+ "channel": "master",
"toolsets": {
"nodejs": {
"minVersion": "8.0",
diff --git a/modules/AADIntegration b/modules/AADIntegration
index 36ee1a1223..e8e600b25b 160000
--- a/modules/AADIntegration
+++ b/modules/AADIntegration
@@ -1 +1 @@
-Subproject commit 36ee1a1223cf024ba65ba1069767194ecb240ee4
+Subproject commit e8e600b25b11a20c105ae68616da9f68b2fcf8cc
diff --git a/modules/Antiforgery b/modules/Antiforgery
index ed2f15bc6e..a35d30c7b2 160000
--- a/modules/Antiforgery
+++ b/modules/Antiforgery
@@ -1 +1 @@
-Subproject commit ed2f15bc6e085c0555b35291c352ca75b46e9422
+Subproject commit a35d30c7b2a6023fb2af112d01c0d1f80e6b03fa
diff --git a/modules/AuthSamples b/modules/AuthSamples
index 9c6c7ae6bd..8d579cebe0 160000
--- a/modules/AuthSamples
+++ b/modules/AuthSamples
@@ -1 +1 @@
-Subproject commit 9c6c7ae6bd9d0fff349fd225711c6936f3033456
+Subproject commit 8d579cebe0408ab49ef7bc69a62a2cd97321e94d
diff --git a/modules/AzureIntegration b/modules/AzureIntegration
index e849173691..c7d7732a0e 160000
--- a/modules/AzureIntegration
+++ b/modules/AzureIntegration
@@ -1 +1 @@
-Subproject commit e849173691046e091318440a4c62027593c1ae83
+Subproject commit c7d7732a0ef255390070ac8fa3155cb187bf0399
diff --git a/modules/BasicMiddleware b/modules/BasicMiddleware
index e425b27c05..2b93e7432d 160000
--- a/modules/BasicMiddleware
+++ b/modules/BasicMiddleware
@@ -1 +1 @@
-Subproject commit e425b27c057e5d875d4e52ccb4e44365b468b1b4
+Subproject commit 2b93e7432ddfb7570bbbb99901955d4c624e106b
diff --git a/modules/BrowserLink b/modules/BrowserLink
index 528e7d4fe5..b217d8888e 160000
--- a/modules/BrowserLink
+++ b/modules/BrowserLink
@@ -1 +1 @@
-Subproject commit 528e7d4fe5eed9f1604360cd2cec70c9ba05c911
+Subproject commit b217d8888e120c3eec5c96096606b79fecbc1aa0
diff --git a/modules/CORS b/modules/CORS
index cbf2f4ca77..ca41e0ace3 160000
--- a/modules/CORS
+++ b/modules/CORS
@@ -1 +1 @@
-Subproject commit cbf2f4ca77c7974e84d86fd6af951231ccba0b3a
+Subproject commit ca41e0ace3f4117f78d9a3bf4ef546c9305d1de8
diff --git a/modules/Caching b/modules/Caching
index 6f5fb1e3d6..01d72c6d0e 160000
--- a/modules/Caching
+++ b/modules/Caching
@@ -1 +1 @@
-Subproject commit 6f5fb1e3d6bb255253a7f740549c9b324ddbff04
+Subproject commit 01d72c6d0e7c094ca794f655ebb9d6e67a6bdea1
diff --git a/modules/Common b/modules/Common
index 6461c675cc..d7a3ef5d12 160000
--- a/modules/Common
+++ b/modules/Common
@@ -1 +1 @@
-Subproject commit 6461c675ccabc70e261fdde27cbb41a5db09526b
+Subproject commit d7a3ef5d126c2d767a26879db9ebc3d805b89014
diff --git a/modules/Configuration b/modules/Configuration
index d6c5092c4e..ebd11c2fe5 160000
--- a/modules/Configuration
+++ b/modules/Configuration
@@ -1 +1 @@
-Subproject commit d6c5092c4e46ff819fabc2a8e5c46b8d3cb013a9
+Subproject commit ebd11c2fe5e1cedc9a125a2d3f6646d5f272b66c
diff --git a/modules/DataProtection b/modules/DataProtection
index 2228213708..8037e756cb 160000
--- a/modules/DataProtection
+++ b/modules/DataProtection
@@ -1 +1 @@
-Subproject commit 2228213708c289139d0ac015e3a3dcaec41ae79d
+Subproject commit 8037e756cbdf4af95cc4d912afb9a34c3c5480e3
diff --git a/modules/DependencyInjection b/modules/DependencyInjection
index 87325a0e50..58ec1e822f 160000
--- a/modules/DependencyInjection
+++ b/modules/DependencyInjection
@@ -1 +1 @@
-Subproject commit 87325a0e50179ce480646a12b13e1fe67a698eeb
+Subproject commit 58ec1e822f0fc19c32b16bc78ca280a71987fcf6
diff --git a/modules/Diagnostics b/modules/Diagnostics
index a5ba2590d5..17d69d94e3 160000
--- a/modules/Diagnostics
+++ b/modules/Diagnostics
@@ -1 +1 @@
-Subproject commit a5ba2590d5760c84e5b043c15c46a6b81e323a75
+Subproject commit 17d69d94e3bceb98f1118981e0d3c5398934304c
diff --git a/modules/DotNetTools b/modules/DotNetTools
index cb954e15f8..7f627772a2 160000
--- a/modules/DotNetTools
+++ b/modules/DotNetTools
@@ -1 +1 @@
-Subproject commit cb954e15f88ffb164d2f23704bfb2a56ff7cf344
+Subproject commit 7f627772a2171e9447c4e5cd5114b0e37933045b
diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore
index ab84f2f033..8b28c8860b 160000
--- a/modules/EntityFrameworkCore
+++ b/modules/EntityFrameworkCore
@@ -1 +1 @@
-Subproject commit ab84f2f033f0d8834d80be049e669fd66b7e8485
+Subproject commit 8b28c8860b0a83bcb3ec4a71c457d7e09af7d238
diff --git a/modules/EventNotification b/modules/EventNotification
index 26f6be9364..4d99b1e60d 160000
--- a/modules/EventNotification
+++ b/modules/EventNotification
@@ -1 +1 @@
-Subproject commit 26f6be93648277f0079246f1c1401f4c9636906b
+Subproject commit 4d99b1e60d70490c18891127987395c6d895680f
diff --git a/modules/FileSystem b/modules/FileSystem
index b38748bcf4..18c4864297 160000
--- a/modules/FileSystem
+++ b/modules/FileSystem
@@ -1 +1 @@
-Subproject commit b38748bcf4987498ee21596064bd089957962dcb
+Subproject commit 18c48642973acef48e81739a921e8e0017766cd9
diff --git a/modules/Hosting b/modules/Hosting
index 51c94337d7..a5b083a39b 160000
--- a/modules/Hosting
+++ b/modules/Hosting
@@ -1 +1 @@
-Subproject commit 51c94337d7755dc4970da77f2ee12285da176d86
+Subproject commit a5b083a39bae974e95ff1a9437468a103e72f6ea
diff --git a/modules/HtmlAbstractions b/modules/HtmlAbstractions
index 8bb788ef9e..1fe9491445 160000
--- a/modules/HtmlAbstractions
+++ b/modules/HtmlAbstractions
@@ -1 +1 @@
-Subproject commit 8bb788ef9eef5ae4a6b48c04b3903f7c8319bbe9
+Subproject commit 1fe94914452c0af5998f25f8e0053628f79ddf71
diff --git a/modules/HttpAbstractions b/modules/HttpAbstractions
index d0a32cc354..405fdc3c1e 160000
--- a/modules/HttpAbstractions
+++ b/modules/HttpAbstractions
@@ -1 +1 @@
-Subproject commit d0a32cc354adf9ad45e0773ba07dfd4207dd11a9
+Subproject commit 405fdc3c1e9a935f294562fef3ec91edfd6c3c60
diff --git a/modules/HttpClientFactory b/modules/HttpClientFactory
index 38a3611e5a..f2af73b1ea 160000
--- a/modules/HttpClientFactory
+++ b/modules/HttpClientFactory
@@ -1 +1 @@
-Subproject commit 38a3611e5a5994ebfa53393899df1aaf3b90023f
+Subproject commit f2af73b1eaf770e1cb537160754d793d39bb588f
diff --git a/modules/HttpSysServer b/modules/HttpSysServer
index 7de560b7ac..91c518e13d 160000
--- a/modules/HttpSysServer
+++ b/modules/HttpSysServer
@@ -1 +1 @@
-Subproject commit 7de560b7accf32c532272ca5acff100d042788e4
+Subproject commit 91c518e13d7ede44e6cb88df895d9a242b07726e
diff --git a/modules/IISIntegration b/modules/IISIntegration
index 11b83dc2b3..13251ce5b7 160000
--- a/modules/IISIntegration
+++ b/modules/IISIntegration
@@ -1 +1 @@
-Subproject commit 11b83dc2b3916ffcc17101902ec383257f6cd033
+Subproject commit 13251ce5b777a3d47e475acf3ce4ba07ea949144
diff --git a/modules/Identity b/modules/Identity
index 4e84251cbf..c60b4d8784 160000
--- a/modules/Identity
+++ b/modules/Identity
@@ -1 +1 @@
-Subproject commit 4e84251cbf1535976c70ec66f038a768aefc4e96
+Subproject commit c60b4d8784550ea868af0c2d08cc14217ae2e940
diff --git a/modules/JavaScriptServices b/modules/JavaScriptServices
index 5fa87a0313..0dc570a0c8 160000
--- a/modules/JavaScriptServices
+++ b/modules/JavaScriptServices
@@ -1 +1 @@
-Subproject commit 5fa87a0313877c8749df997bb6f30e9a447434ac
+Subproject commit 0dc570a0c8725e3031ce5a884d7df3cfb75545ba
diff --git a/modules/JsonPatch b/modules/JsonPatch
index b34f628412..40dfd77fd0 160000
--- a/modules/JsonPatch
+++ b/modules/JsonPatch
@@ -1 +1 @@
-Subproject commit b34f6284126e38e8b510b58e735a3d5587a8989c
+Subproject commit 40dfd77fd025d74cfe831bd79f261f548a61a2bb
diff --git a/modules/KestrelHttpServer b/modules/KestrelHttpServer
index 868acacf68..6c9d9f2b0c 160000
--- a/modules/KestrelHttpServer
+++ b/modules/KestrelHttpServer
@@ -1 +1 @@
-Subproject commit 868acacf68cd0b891054f84a4e07f7f1ac147307
+Subproject commit 6c9d9f2b0c3193b5bb4c7f7182f116c0073f195f
diff --git a/modules/Localization b/modules/Localization
index 758cefa465..1d24b7a325 160000
--- a/modules/Localization
+++ b/modules/Localization
@@ -1 +1 @@
-Subproject commit 758cefa4659fa315a61e3036daadb50548be182f
+Subproject commit 1d24b7a325a25ead3b1ee9c2ff1cf7c0806ec39b
diff --git a/modules/Logging b/modules/Logging
index 8252a21987..e9f9ad7379 160000
--- a/modules/Logging
+++ b/modules/Logging
@@ -1 +1 @@
-Subproject commit 8252a2198726e36425e9364e5168a6ce359672ab
+Subproject commit e9f9ad7379c3bf1707fa35bced6bdeadd409ba72
diff --git a/modules/MetaPackages b/modules/MetaPackages
index 5f4f181c97..f115404d64 160000
--- a/modules/MetaPackages
+++ b/modules/MetaPackages
@@ -1 +1 @@
-Subproject commit 5f4f181c97811e739b295b1bbbf0529f5f147d0d
+Subproject commit f115404d64d288ba916f43bd4c5ff0b8f55b434e
diff --git a/modules/Microsoft.Data.Sqlite b/modules/Microsoft.Data.Sqlite
index 8f1e9c390a..31b4c6a6df 160000
--- a/modules/Microsoft.Data.Sqlite
+++ b/modules/Microsoft.Data.Sqlite
@@ -1 +1 @@
-Subproject commit 8f1e9c390ada36acf9d1ac55d3c305647e107ad8
+Subproject commit 31b4c6a6df50758558af729f54f95928c4baf657
diff --git a/modules/MusicStore b/modules/MusicStore
index 96beb8413d..58175b540b 160000
--- a/modules/MusicStore
+++ b/modules/MusicStore
@@ -1 +1 @@
-Subproject commit 96beb8413d7399b3eef5d267b1ebc58ce283c646
+Subproject commit 58175b540bc40dc50a56b9cbc050d5c57931c448
diff --git a/modules/Mvc b/modules/Mvc
index 1e7be641ae..432e11f286 160000
--- a/modules/Mvc
+++ b/modules/Mvc
@@ -1 +1 @@
-Subproject commit 1e7be641ae62759ecaf83806f48713e0437c1ea3
+Subproject commit 432e11f2862b1c231497e57f0052bae4ca213869
diff --git a/modules/MvcPrecompilation b/modules/MvcPrecompilation
index 40c00c4165..e65092b711 160000
--- a/modules/MvcPrecompilation
+++ b/modules/MvcPrecompilation
@@ -1 +1 @@
-Subproject commit 40c00c4165294a6c821797b778c84a6a8d82041f
+Subproject commit e65092b711a7a2121055915ca9a57a361bf93900
diff --git a/modules/Options b/modules/Options
index 26cf566665..aea8ecb396 160000
--- a/modules/Options
+++ b/modules/Options
@@ -1 +1 @@
-Subproject commit 26cf5666659608458bca96cea5eed7d8ff6bdd60
+Subproject commit aea8ecb3967f4928608169681cfce1e6e5bb5ec9
diff --git a/modules/Proxy b/modules/Proxy
index 5bc572eaac..7746356662 160000
--- a/modules/Proxy
+++ b/modules/Proxy
@@ -1 +1 @@
-Subproject commit 5bc572eaacc39cb09d490078f1f4b3476da2ef08
+Subproject commit 7746356662cd1a90748da3360173aca3f2842549
diff --git a/modules/Razor b/modules/Razor
index bbddd29ab8..61aeae1023 160000
--- a/modules/Razor
+++ b/modules/Razor
@@ -1 +1 @@
-Subproject commit bbddd29ab87a75f61b42226854ad5dc98c74192d
+Subproject commit 61aeae10233e52025090e836f3cbf70a13a2679f
diff --git a/modules/ResponseCaching b/modules/ResponseCaching
index d1ddd44130..ffd7583db8 160000
--- a/modules/ResponseCaching
+++ b/modules/ResponseCaching
@@ -1 +1 @@
-Subproject commit d1ddd44130f59210c56cdb22f82304150ba835fe
+Subproject commit ffd7583db83ec57b70a2702343424dace805c889
diff --git a/modules/Routing b/modules/Routing
index 2d53d398b2..d339b2b256 160000
--- a/modules/Routing
+++ b/modules/Routing
@@ -1 +1 @@
-Subproject commit 2d53d398b26959e3fb388989a03f8c7ae761cbcc
+Subproject commit d339b2b256f448946cd0da1ebb106e46408be333
diff --git a/modules/Scaffolding b/modules/Scaffolding
index 99a678424d..52914b548a 160000
--- a/modules/Scaffolding
+++ b/modules/Scaffolding
@@ -1 +1 @@
-Subproject commit 99a678424d0747842de49677bbe7da80ffbfb42e
+Subproject commit 52914b548a8d390192e47e075ffc63e0952ecaae
diff --git a/modules/Security b/modules/Security
index 8b30c73597..36276e7378 160000
--- a/modules/Security
+++ b/modules/Security
@@ -1 +1 @@
-Subproject commit 8b30c7359769cd9e3360c065d610598aa99da0c6
+Subproject commit 36276e737842267ebb88a2cacb7c6223e117da6d
diff --git a/modules/ServerTests b/modules/ServerTests
index f57669db86..6a2b3b9645 160000
--- a/modules/ServerTests
+++ b/modules/ServerTests
@@ -1 +1 @@
-Subproject commit f57669db864ec955ff8ffd1fbc5abb6e40db971e
+Subproject commit 6a2b3b9645cefd276bacbb5ec400dde55189737b
diff --git a/modules/Session b/modules/Session
index 9b16c7907e..dce34d3563 160000
--- a/modules/Session
+++ b/modules/Session
@@ -1 +1 @@
-Subproject commit 9b16c7907ec13f89e1c5665833623fe4f42e65cf
+Subproject commit dce34d356386074937be317f2a38e2bec0a7596c
diff --git a/modules/SignalR b/modules/SignalR
index 2d4fb0af6f..46c8ba5fdc 160000
--- a/modules/SignalR
+++ b/modules/SignalR
@@ -1 +1 @@
-Subproject commit 2d4fb0af6fd2ef2e3a059a2a15a56484d8800d35
+Subproject commit 46c8ba5fdc881f19a0384613510e71290719503d
diff --git a/modules/StaticFiles b/modules/StaticFiles
index 2df2d2865f..a527fc1cb1 160000
--- a/modules/StaticFiles
+++ b/modules/StaticFiles
@@ -1 +1 @@
-Subproject commit 2df2d2865ffc692f8f946933d1b71d3bb39561b7
+Subproject commit a527fc1cb1e736449b060a3f75d5b59f2d67c95e
diff --git a/modules/SubmoduleGraph.dgml b/modules/SubmoduleGraph.dgml
index 58a8289412..b67a8dc6db 100644
--- a/modules/SubmoduleGraph.dgml
+++ b/modules/SubmoduleGraph.dgml
@@ -46,6 +46,7 @@
+
@@ -379,6 +380,12 @@
+
+
+
+
+
+
@@ -391,4 +398,4 @@
-
+
\ No newline at end of file
diff --git a/modules/Templating b/modules/Templating
index 5911fc0be1..e472c17533 160000
--- a/modules/Templating
+++ b/modules/Templating
@@ -1 +1 @@
-Subproject commit 5911fc0be1212b18daed74cb50d72233418c5193
+Subproject commit e472c17533434285f62affa25a4d544cc463b168
diff --git a/modules/WebHooks b/modules/WebHooks
new file mode 160000
index 0000000000..3aeedfa117
--- /dev/null
+++ b/modules/WebHooks
@@ -0,0 +1 @@
+Subproject commit 3aeedfa117306d10329b9ae6704da1a931cff2d3
diff --git a/modules/WebSockets b/modules/WebSockets
index c48f2b953e..85fd36f143 160000
--- a/modules/WebSockets
+++ b/modules/WebSockets
@@ -1 +1 @@
-Subproject commit c48f2b953e74b9a999081c3d4f94ce53427947ff
+Subproject commit 85fd36f14337e939e37257c558f737967f5820af
diff --git a/run.ps1 b/run.ps1
index 2c8cd81d8a..95f7f2246f 100644
--- a/run.ps1
+++ b/run.ps1
@@ -64,8 +64,8 @@ in the file are overridden by command line parameters.
Example config file:
```json
{
- "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/dev/tools/korebuild.schema.json",
- "channel": "dev",
+ "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/master/tools/korebuild.schema.json",
+ "channel": "master",
"toolsSource": "https://aspnetcore.blob.core.windows.net/buildtools"
}
```
@@ -206,7 +206,7 @@ if (!$DotNetHome) {
else { Join-Path $PSScriptRoot '.dotnet'}
}
-if (!$Channel) { $Channel = 'dev' }
+if (!$Channel) { $Channel = 'master' }
if (!$ToolsSource) { $ToolsSource = 'https://aspnetcore.blob.core.windows.net/buildtools' }
if ($PackageVersionPropsUrl) {
diff --git a/run.sh b/run.sh
index 8cec27061d..1eef4d8194 100755
--- a/run.sh
+++ b/run.sh
@@ -289,7 +289,7 @@ if [ ! -z "$product_build_id" ]; then
msbuild_args[${#msbuild_args[*]}]="-p:DotNetProductBuildId=$product_build_id"
fi
-[ -z "$channel" ] && channel='dev'
+[ -z "$channel" ] && channel='master'
[ -z "$tools_source" ] && tools_source='https://aspnetcore.blob.core.windows.net/buildtools'
get_korebuild
diff --git a/scripts/PatchVersionPrefix.ps1 b/scripts/PatchVersionPrefix.ps1
new file mode 100755
index 0000000000..cf62428902
--- /dev/null
+++ b/scripts/PatchVersionPrefix.ps1
@@ -0,0 +1,108 @@
+#!/usr/bin/env pwsh -c
+
+<#
+.SYNOPSIS
+ Updates the version.props file in repos to a newer patch version
+.PARAMETER Repos
+ A list of the repositories that should be patched
+.PARAMETER Mode
+ Version bump options: Major, Minor, Patch
+.PARAMETER VersionSuffix
+ The version suffix to use
+#>
+[cmdletbinding(SupportsShouldProcess = $true)]
+param(
+ [Parameter(Mandatory = $true)]
+ [string[]]$Repos,
+ [Parameter(Mandatory = $true)]
+ [ValidateSet('Major', 'Minor', 'Patch')]
+ [string]$Mode,
+ [string]$VersionSuffix = $null,
+ [switch]$NoCommit
+)
+
+$ErrorActionPreference = 'Stop'
+
+Import-Module -Scope Local -Force "$PSScriptRoot/common.psm1"
+
+function SetVersionSuffix([System.Xml.XmlNode]$node) {
+ if (-not $node) {
+ return
+ }
+ $node.InnerText = $VersionSuffix
+ return "Setting $($node.Name) to $VersionSuffix"
+}
+
+function BumpVersion([System.Xml.XmlNode]$node) {
+ if (-not $node) {
+ return
+ }
+ [version] $version = $node.InnerText
+
+ $experimental = $version.Major -eq 0
+
+ switch ($mode) {
+ { ($_ -ne 'Patch') -and $experimental} {
+ $node.InnerText = "{0}.{1}.{2}" -f $version.Major, ($version.Minor + 1), 0
+ }
+ { ($_ -eq 'Major') -and -not $experimental } {
+ $node.InnerText = "{0}.{1}.{2}" -f ($version.Major + 1), 0, 0
+ }
+ { ($_ -eq 'Minor') -and -not $experimental } {
+ $node.InnerText = "{0}.{1}.{2}" -f $version.Major, ($version.Minor + 1), 0
+ }
+ 'Patch' {
+ $node.InnerText = "{0}.{1}.{2}" -f $version.Major, $version.Minor, ($version.Build + 1)
+ }
+ }
+ return "Bumping version from $version to $($node.InnerText)"
+}
+
+foreach ($repo in $Repos) {
+ $repoPath = "$PSScriptRoot/../modules/$repo"
+ Push-Location $repoPath
+ try
+ {
+ $path = "$repoPath/version.props"
+ Write-Host -ForegroundColor Magenta "Updating $repo"
+ if (-not (Test-Path $path)) {
+ Write-Warning "$path does not exist"
+ continue
+ }
+ $path = Resolve-Path $path
+ Write-Verbose "$path"
+ [xml] $xml = LoadXml $path
+
+ $suffix = $xml.SelectSingleNode('/Project/PropertyGroup/VersionSuffix')
+ if (-not $suffix) {
+ write-error "$path does not have VersionSuffix"
+ }
+
+ if ($VersionSuffix) {
+ SetVersionSuffix $xml.SelectSingleNode('/Project/PropertyGroup/VersionSuffix') | write-host
+ SetVersionSuffix $xml.SelectSingleNode('/Project/PropertyGroup/ExperimentalProjectVersionSuffix') | write-host
+ SetVersionSuffix $xml.SelectSingleNode('/Project/PropertyGroup/ExperimentalVersionSuffix') | write-host
+ }
+
+ $versionPrefix = $xml.SelectSingleNode('/Project/PropertyGroup/VersionPrefix')
+ $epxVersionPrefix = $xml.SelectSingleNode('/Project/PropertyGroup/ExperimentalProjectVersionPrefix')
+ $exVersionPrefix = $xml.SelectSingleNode('/Project/PropertyGroup/ExperimentalVersionPrefix')
+ BumpVersion $epxVersionPrefix | write-host
+ BumpVersion $exVersionPrefix | write-host
+ $message = BumpVersion $versionPrefix
+ Write-Host $message
+
+ if ($PSCmdlet.ShouldProcess("Update $path")) {
+ SaveXml $xml $path
+ if (-not $NoCommit) {
+ Invoke-Block { & git add $path }
+ Invoke-Block { & git commit -m $message }
+ }
+ }
+ }
+ finally
+ {
+ Pop-Location
+ }
+}
+
diff --git a/scripts/UpdateDependenciesCoreFx.ps1 b/scripts/UpdateDependenciesCoreFx.ps1
index 4bb9be2333..03be551f8a 100644
--- a/scripts/UpdateDependenciesCoreFx.ps1
+++ b/scripts/UpdateDependenciesCoreFx.ps1
@@ -6,6 +6,7 @@ param(
[string]$GithubUsername,
[string]$GithubToken
)
+# This script only works against master at the moment because only master prod-con builds allow you to access their results before the entire chain is finished.
$ErrorActionPreference = 'Stop'
Import-Module -Scope Local -Force "$PSScriptRoot/common.psm1"
@@ -107,7 +108,7 @@ Write-Host "Loading deps from $depsPath"
[xml] $dependencies = LoadXml $depsPath
if (-not $NoCommit) {
- $baseBranch = "release/2.2"
+ $baseBranch = "master"
Invoke-Block { & git fetch origin }
$currentBranch = Invoke-Block { & git rev-parse --abbrev-ref HEAD }
diff --git a/scripts/update_travis_appveyor_yml.py b/scripts/update_travis_appveyor_yml.py
index e77bcc25c3..07fde1a9bf 100755
--- a/scripts/update_travis_appveyor_yml.py
+++ b/scripts/update_travis_appveyor_yml.py
@@ -93,7 +93,7 @@ def transform_yaml_doc(document):
if not 'branches' in document:
document['branches'] = {}
document['branches']['only'] = [
- 'dev', '/^release\/.*$/', '/^(.*\/)?ci-.*$/']
+ 'master', '/^release\/.*$/', '/^(.*\/)?ci-.*$/']
return document
update(".travis.yml", transform_yaml_doc)
diff --git a/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj b/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj
index 3b9952d08b..d64e5e198e 100644
--- a/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj
+++ b/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj
@@ -3,7 +3,7 @@
false
false
- netcoreapp2.2
+ netcoreapp3.0
aspnetcore
Microsoft.AspNetCore.All
false
diff --git a/src/Microsoft.AspNetCore.All/build/netcoreapp2.2/Microsoft.AspNetCore.All.props b/src/Microsoft.AspNetCore.All/build/netcoreapp3.0/Microsoft.AspNetCore.All.props
similarity index 100%
rename from src/Microsoft.AspNetCore.All/build/netcoreapp2.2/Microsoft.AspNetCore.All.props
rename to src/Microsoft.AspNetCore.All/build/netcoreapp3.0/Microsoft.AspNetCore.All.props
diff --git a/src/Microsoft.AspNetCore.All/build/netcoreapp2.2/Microsoft.AspNetCore.All.targets b/src/Microsoft.AspNetCore.All/build/netcoreapp3.0/Microsoft.AspNetCore.All.targets
similarity index 81%
rename from src/Microsoft.AspNetCore.All/build/netcoreapp2.2/Microsoft.AspNetCore.All.targets
rename to src/Microsoft.AspNetCore.All/build/netcoreapp3.0/Microsoft.AspNetCore.All.targets
index ff8736382c..c4f1f46390 100644
--- a/src/Microsoft.AspNetCore.All/build/netcoreapp2.2/Microsoft.AspNetCore.All.targets
+++ b/src/Microsoft.AspNetCore.All/build/netcoreapp3.0/Microsoft.AspNetCore.All.targets
@@ -12,7 +12,7 @@
+ Text="This version of Microsoft.AspNetCore.All is only compatible with the netcoreapp3.0 target framework. Please target netcoreapp3.0 or choose a version of Microsoft.AspNetCore.All compatible with $(TargetFramework)."
+ Condition="'$(TargetFramework)' != 'netcoreapp3.0'"/>
diff --git a/src/Microsoft.AspNetCore.All/lib/netcoreapp2.2/_._ b/src/Microsoft.AspNetCore.All/lib/netcoreapp3.0/_._
similarity index 100%
rename from src/Microsoft.AspNetCore.All/lib/netcoreapp2.2/_._
rename to src/Microsoft.AspNetCore.All/lib/netcoreapp3.0/_._
diff --git a/src/Microsoft.AspNetCore.App/Microsoft.AspNetCore.App.csproj b/src/Microsoft.AspNetCore.App/Microsoft.AspNetCore.App.csproj
index a1b3b0afe4..1ec21fe5d7 100644
--- a/src/Microsoft.AspNetCore.App/Microsoft.AspNetCore.App.csproj
+++ b/src/Microsoft.AspNetCore.App/Microsoft.AspNetCore.App.csproj
@@ -3,7 +3,7 @@
false
false
- netcoreapp2.2
+ netcoreapp3.0
aspnetcore
Microsoft.AspNetCore.App
false
diff --git a/src/Microsoft.AspNetCore.App/build/netcoreapp2.2/Microsoft.AspNetCore.App.props b/src/Microsoft.AspNetCore.App/build/netcoreapp3.0/Microsoft.AspNetCore.App.props
similarity index 100%
rename from src/Microsoft.AspNetCore.App/build/netcoreapp2.2/Microsoft.AspNetCore.App.props
rename to src/Microsoft.AspNetCore.App/build/netcoreapp3.0/Microsoft.AspNetCore.App.props
diff --git a/src/Microsoft.AspNetCore.App/build/netcoreapp2.2/Microsoft.AspNetCore.App.targets b/src/Microsoft.AspNetCore.App/build/netcoreapp3.0/Microsoft.AspNetCore.App.targets
similarity index 81%
rename from src/Microsoft.AspNetCore.App/build/netcoreapp2.2/Microsoft.AspNetCore.App.targets
rename to src/Microsoft.AspNetCore.App/build/netcoreapp3.0/Microsoft.AspNetCore.App.targets
index 2ba815e5da..2e222008cc 100644
--- a/src/Microsoft.AspNetCore.App/build/netcoreapp2.2/Microsoft.AspNetCore.App.targets
+++ b/src/Microsoft.AspNetCore.App/build/netcoreapp3.0/Microsoft.AspNetCore.App.targets
@@ -12,7 +12,7 @@
+ Text="This version of Microsoft.AspNetCore.App is only compatible with the netcoreapp3.0 target framework. Please target netcoreapp3.0 or choose a version of Microsoft.AspNetCore.App compatible with $(TargetFramework)."
+ Condition="'$(TargetFramework)' != 'netcoreapp3.0'"/>
diff --git a/src/Microsoft.AspNetCore.App/lib/netcoreapp2.2/_._ b/src/Microsoft.AspNetCore.App/lib/netcoreapp3.0/_._
similarity index 100%
rename from src/Microsoft.AspNetCore.App/lib/netcoreapp2.2/_._
rename to src/Microsoft.AspNetCore.App/lib/netcoreapp3.0/_._
diff --git a/src/PackageArchive/Archive.props b/src/PackageArchive/Archive.props
index 8d888cf505..81c2c200b0 100644
--- a/src/PackageArchive/Archive.props
+++ b/src/PackageArchive/Archive.props
@@ -6,6 +6,8 @@
- netcoreapp2.1
+ netcoreapp3.0
+
+ 99.9
diff --git a/src/PackageArchive/Scenario.ConsoleApp/Scenario.ConsoleApp.csproj b/src/PackageArchive/Scenario.ConsoleApp/Scenario.ConsoleApp.csproj
index e1ef3cfe40..a83925d7df 100644
--- a/src/PackageArchive/Scenario.ConsoleApp/Scenario.ConsoleApp.csproj
+++ b/src/PackageArchive/Scenario.ConsoleApp/Scenario.ConsoleApp.csproj
@@ -1,12 +1,12 @@
- netcoreapp2.2
+ netcoreapp3.0
99.9
- 2.2.0
+ 3.0.0
- $(MicrosoftNETCoreApp22PackageVersion)
+ $(MicrosoftNETCoreApp30PackageVersion)
$([MSbuild]::ValueOrDefault('$(MicrosoftNETCoreAppPackageVersion)','$(MaxImplicitVersion)'))
diff --git a/src/PackageArchive/Scenario.WebApp/Scenario.WebApp.csproj b/src/PackageArchive/Scenario.WebApp/Scenario.WebApp.csproj
index e20e8d3b93..7b6e555ae0 100644
--- a/src/PackageArchive/Scenario.WebApp/Scenario.WebApp.csproj
+++ b/src/PackageArchive/Scenario.WebApp/Scenario.WebApp.csproj
@@ -1,7 +1,7 @@
- netcoreapp2.2
+ netcoreapp3.0
99.9
diff --git a/test/SharedFx.UnitTests/SharedFx.UnitTests.csproj b/test/SharedFx.UnitTests/SharedFx.UnitTests.csproj
index 77d020f3dc..bb58bee45a 100644
--- a/test/SharedFx.UnitTests/SharedFx.UnitTests.csproj
+++ b/test/SharedFx.UnitTests/SharedFx.UnitTests.csproj
@@ -1,7 +1,7 @@
- netcoreapp2.2
+ netcoreapp3.0
Microsoft.AspNetCore
diff --git a/version.props b/version.props
index b2e7e63c8d..37bc516397 100644
--- a/version.props
+++ b/version.props
@@ -1,16 +1,16 @@
- 2
- 2
+ 3
+ 0
0
$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$(AspNetCorePatchVersion)
- preview1
+ alpha1
t000
- $(VersionPrefix) Preview 1
+ $(VersionPrefix) Alpha 1
- 0.2.0
+ 0.3.0
alpha1
$(PrereleaseVersionLabel)
@@ -31,7 +31,7 @@
$(ExperimentalVersionPrefix)-$(ExperimentalVersionSuffix)-final
$(ExperimentalVersionSuffix)-$(BuildNumber)
- release/2.2
+ master