huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into merge/release/2.2-to-master

This commit is contained in:
Nate McMaster 2018-07-11 12:52:51 -07:00 committed by GitHub
parent 683e327637 4b0925bd72
commit bba2a5d72e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
85 changed files with 311 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.appveyor.yml
View File

@ -4,7 +4,6 @@ branches:
only:
- master
- /^release\/.*/
- dev
- /^(.*\/)?ci-.*$/
install:
- git submodule update --init --recursive

98
.gitmodules vendored
View File

@ -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

1
.travis.yml
View File

@ -14,7 +14,6 @@ branches:
only:
- master
- /^release\/.*/
- dev
- /^(.*\/)?ci-.*$/
script:
- ./build.sh -t:CheckUniverse

1
Directory.Build.targets
View File

@ -2,6 +2,7 @@
<PropertyGroup>
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">$(MicrosoftNETCoreApp21PackageVersion)</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.2' ">$(MicrosoftNETCoreApp22PackageVersion)</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">$(MicrosoftNETCoreApp30PackageVersion)</RuntimeFrameworkVersion>
<NETStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard2.0' ">$(NETStandardLibrary20PackageVersion)</NETStandardImplicitPackageVersion>
<!-- aspnet/BuildTools#662 Don't police what version of NetCoreApp we use -->
<NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>

2
README.md
View File

@ -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) <br> ![][badge-master] | release/2.2 <br> ![][badge-rel-22] | release/2.1 <br> ![][badge-rel-21]
Platform | Latest (master branch) <br> ![][badge-master] | release/2.2 <br> ![][badge-rel-22] | release/2.1 <br> ![][badge-rel-21]
:---------------------|:----------------------------------------------------------------|:------------------------------------------------------------------------- |:-------------------------------------------------------------------------
Channel name<sup>1</sup> | `master` | `release/2.2` | `release/2.1`
Windows (x64) | [Installer (exe)][win-x64-exe]<br>[Archive (zip)][win-x64-zip] | [Installer (exe)][win-x64-exe-rel-22]<br>[Archive (zip)][win-x64-zip-rel-22] | [Installer (exe)][win-x64-exe-rel-21]<br>[Archive (zip)][win-x64-zip-rel-21]

2
build/SharedFx.props
View File

@ -23,7 +23,7 @@
<LibExtension Condition="$([MSBuild]::IsOSPlatform('Windows'))">.dll</LibExtension>
<LibExtension Condition="$([MSBuild]::IsOSPlatform('OSX'))">.dylib</LibExtension>
<ExeExtension Condition="$([MSBuild]::IsOSPlatform('Windows'))">.exe</ExeExtension>
<SharedFrameworkTargetFramework>netcoreapp2.2</SharedFrameworkTargetFramework>
<SharedFrameworkTargetFramework>netcoreapp3.0</SharedFrameworkTargetFramework>
<!-- installers -->
<SharedFxInstallerName>aspnetcore-runtime</SharedFxInstallerName>

6
build/SharedFx.targets
View File

@ -47,7 +47,7 @@
<CommonProps>$(CommonProps);DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcesPropsPath)</CommonProps>
<CommonProps>$(CommonProps);DotNetBuildOffline=true</CommonProps>
<CommonProps>$(CommonProps);AspNetUniverseBuildOffline=true</CommonProps>
<CommonProps>$(CommonProps);RuntimeFrameworkVersion=$(MicrosoftNETCoreApp22PackageVersion)</CommonProps>
<CommonProps>$(CommonProps);RuntimeFrameworkVersion=$(MicrosoftNETCoreApp30PackageVersion)</CommonProps>
<CommonProps>$(CommonProps);AppMetapackageVersion=$(PackageVersion)</CommonProps>
</PropertyGroup>
@ -173,10 +173,10 @@
<Target Name="PrepareForSharedFx" DependsOnTargets="DefineSharedFxPrerequisites">
<PropertyGroup>
<AppSharedFxProps>SharedFxWorkDirectory=$(AppSharedFxWorkDirectory)</AppSharedFxProps>
<AppSharedFxProps>$(AppSharedFxProps);RuntimeFrameworkVersion=$(MicrosoftNETCoreApp22PackageVersion)</AppSharedFxProps>
<AppSharedFxProps>$(AppSharedFxProps);RuntimeFrameworkVersion=$(MicrosoftNETCoreApp30PackageVersion)</AppSharedFxProps>
<AppSharedFxProps>$(AppSharedFxProps);SharedFxPackage=Microsoft.AspNetCore.App</AppSharedFxProps>
<AllSharedFxProps>SharedFxWorkDirectory=$(AllSharedFxWorkDirectory)</AllSharedFxProps>
<AllSharedFxProps>$(AllSharedFxProps);RuntimeFrameworkVersion=$(MicrosoftNETCoreApp22PackageVersion)</AllSharedFxProps>
<AllSharedFxProps>$(AllSharedFxProps);RuntimeFrameworkVersion=$(MicrosoftNETCoreApp30PackageVersion)</AllSharedFxProps>
<AllSharedFxProps>$(AllSharedFxProps);SharedFxPackage=Microsoft.AspNetCore.All</AllSharedFxProps>
<AllSharedFxProps>$(AllSharedFxProps);SharedFxDep=Microsoft.AspNetCore.App</AllSharedFxProps>
<AllSharedFxProps>$(AllSharedFxProps);SharedFxDepVersion=$(PackageVersion)</AllSharedFxProps>

19
build/artifacts.props
View File

@ -177,6 +177,23 @@
<PackageArtifact Include="Microsoft.AspNetCore.TestHost" Category="ship" />
<PackageArtifact Include="Microsoft.AspNetCore.Testing" Category="noship" />
<!-- WebHooks packages are not currently shipping, alone or in a meta-package. -->
<PackageArtifact Include="Microsoft.AspNetCore.WebHooks.Receivers" Category="noship" />
<PackageArtifact Include="Microsoft.AspNetCore.WebHooks.Receivers.AzureAlert" Category="noship" />
<PackageArtifact Include="Microsoft.AspNetCore.WebHooks.Receivers.AzureContainerRegistry" Category="noship" />
<PackageArtifact Include="Microsoft.AspNetCore.WebHooks.Receivers.BitBucket" Category="noship" />
<PackageArtifact Include="Microsoft.AspNetCore.WebHooks.Receivers.Dropbox" Category="noship" />
<PackageArtifact Include="Microsoft.AspNetCore.WebHooks.Receivers.DynamicsCRM" Category="noship" />
<PackageArtifact Include="Microsoft.AspNetCore.WebHooks.Receivers.GitHub" Category="noship" />
<PackageArtifact Include="Microsoft.AspNetCore.WebHooks.Receivers.Kudu" Category="noship" />
<PackageArtifact Include="Microsoft.AspNetCore.WebHooks.Receivers.MailChimp" Category="noship" />
<PackageArtifact Include="Microsoft.AspNetCore.WebHooks.Receivers.Pusher" Category="noship" />
<PackageArtifact Include="Microsoft.AspNetCore.WebHooks.Receivers.Salesforce" Category="noship" />
<PackageArtifact Include="Microsoft.AspNetCore.WebHooks.Receivers.Slack" Category="noship" />
<PackageArtifact Include="Microsoft.AspNetCore.WebHooks.Receivers.Stripe" Category="noship" />
<PackageArtifact Include="Microsoft.AspNetCore.WebHooks.Receivers.Trello" Category="noship" />
<PackageArtifact Include="Microsoft.AspNetCore.WebHooks.Receivers.WordPress" Category="noship" />
<PackageArtifact Include="Microsoft.AspNetCore.WebSockets" Category="ship" AppMetapackage="true" AllMetapackage="true"/>
<PackageArtifact Include="Microsoft.AspNetCore.WebUtilities" Category="ship" AppMetapackage="true" AllMetapackage="true"/>
<PackageArtifact Include="Microsoft.CodeAnalysis.Razor" Category="ship" AppMetapackage="true" AllMetapackage="true"/>
@ -186,7 +203,7 @@
<PackageArtifact Include="Microsoft.Data.Sqlite.Core" Category="ship" AllMetapackage="true" />
<PackageArtifact Include="Microsoft.DotNet.Web.Client.ItemTemplates" Category="shipoob" />
<PackageArtifact Include="Microsoft.DotNet.Web.ItemTemplates" Category="shipoob" />
<PackageArtifact Include="Microsoft.DotNet.Web.ProjectTemplates.2.2" Category="shipoob" />
<PackageArtifact Include="Microsoft.DotNet.Web.ProjectTemplates.3.0" Category="shipoob" />
<PackageArtifact Include="Microsoft.DotNet.Web.Spa.ProjectTemplates" Category="shipoob" />
<PackageArtifact Include="Microsoft.EntityFrameworkCore" Category="ship" AppMetapackage="true" AllMetapackage="true"/>
<PackageArtifact Include="Microsoft.EntityFrameworkCore.Analyzers" Category="ship" Analyzer="true" AppMetapackage="true" AllMetapackage="true" />

1
build/buildorder.props
View File

@ -41,6 +41,7 @@
<RepositoryBuildOrder Include="Identity" Order="15" />
<RepositoryBuildOrder Include="JavaScriptServices" Order="15" />
<RepositoryBuildOrder Include="MvcPrecompilation" Order="15" />
<RepositoryBuildOrder Include="WebHooks" Order="15" />
<RepositoryBuildOrder Include="Scaffolding" Order="15" />
<RepositoryBuildOrder Include="AzureIntegration" Order="15" />
<RepositoryBuildOrder Include="MusicStore" Order="16" />

62
build/dependencies.props
View File

@ -1,16 +1,42 @@
<Project>
<!-- These package versions may be overridden or updated by automation. -->
<PropertyGroup Label="Package Versions: Auto" Condition=" '$(DotNetPackageVersionPropsPath)' == '' ">
<!-- MicrosoftNETCoreApp22PackageVersion is assigned at the bottom so it can automatically pick up MicrosoftNETCoreAppPackageVersion in an orchestrated build. -->
<MicrosoftNETCoreAppPackageVersion>2.2.0-preview1-26618-02</MicrosoftNETCoreAppPackageVersion>
<MicrosoftNETCoreDotNetAppHostPackageVersion>2.2.0-preview1-26618-02</MicrosoftNETCoreDotNetAppHostPackageVersion>
<MicrosoftCSharpPackageVersion>4.6.0-preview1-26708-04</MicrosoftCSharpPackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>3.0.0-preview1-26710-03</MicrosoftExtensionsDependencyModelPackageVersion>
<!-- MicrosoftNETCoreApp30PackageVersion is assigned at the bottom so it can automatically pick up MicrosoftNETCoreAppPackageVersion in an orchestrated build. -->
<MicrosoftNETCoreAppPackageVersion>3.0.0-preview1-26710-03</MicrosoftNETCoreAppPackageVersion>
<MicrosoftNETCoreDotNetAppHostPackageVersion>3.0.0-preview1-26710-03</MicrosoftNETCoreDotNetAppHostPackageVersion>
<MicrosoftWin32RegistryPackageVersion>4.6.0-preview1-26708-04</MicrosoftWin32RegistryPackageVersion>
<SystemBuffersPackageVersion>4.6.0-preview1-26708-04</SystemBuffersPackageVersion>
<SystemCollectionsImmutablePackageVersion>1.6.0-preview1-26708-04</SystemCollectionsImmutablePackageVersion>
<SystemComponentModelAnnotationsPackageVersion>4.6.0-preview1-26708-04</SystemComponentModelAnnotationsPackageVersion>
<SystemDataSqlClientPackageVersion>4.6.0-preview1-26708-04</SystemDataSqlClientPackageVersion>
<SystemDiagnosticsDiagnosticSourcePackageVersion>4.6.0-preview1-26708-04</SystemDiagnosticsDiagnosticSourcePackageVersion>
<SystemDiagnosticsEventLogPackageVersion>4.6.0-preview1-26708-04</SystemDiagnosticsEventLogPackageVersion>
<SystemIOPipelinesPackageVersion>4.6.0-preview1-26708-04</SystemIOPipelinesPackageVersion>
<SystemMemoryPackageVersion>4.6.0-preview1-26708-04</SystemMemoryPackageVersion>
<SystemNetHttpWinHttpHandlerPackageVersion>4.6.0-preview1-26708-04</SystemNetHttpWinHttpHandlerPackageVersion>
<SystemNetWebSocketsWebSocketProtocolPackageVersion>4.6.0-preview1-26708-04</SystemNetWebSocketsWebSocketProtocolPackageVersion>
<SystemNumericsVectorsPackageVersion>4.6.0-preview1-26708-04</SystemNumericsVectorsPackageVersion>
<SystemReflectionMetadataPackageVersion>1.7.0-preview1-26708-04</SystemReflectionMetadataPackageVersion>
<SystemRuntimeCompilerServicesUnsafePackageVersion>4.6.0-preview1-26708-04</SystemRuntimeCompilerServicesUnsafePackageVersion>
<SystemSecurityCryptographyCngPackageVersion>4.6.0-preview1-26708-04</SystemSecurityCryptographyCngPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>4.6.0-preview1-26708-04</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>4.6.0-preview1-26708-04</SystemSecurityPermissionsPackageVersion>
<SystemSecurityPrincipalWindowsPackageVersion>4.6.0-preview1-26708-04</SystemSecurityPrincipalWindowsPackageVersion>
<SystemServiceProcessServiceControllerPackageVersion>4.6.0-preview1-26708-04</SystemServiceProcessServiceControllerPackageVersion>
<SystemTextEncodingsWebPackageVersion>4.6.0-preview1-26708-04</SystemTextEncodingsWebPackageVersion>
<SystemThreadingChannelsPackageVersion>4.6.0-preview1-26708-04</SystemThreadingChannelsPackageVersion>
<SystemThreadingTasksDataflowPackageVersion>4.10.0-preview1-26708-04</SystemThreadingTasksDataflowPackageVersion>
<SystemThreadingTasksExtensionsPackageVersion>4.6.0-preview1-26708-04</SystemThreadingTasksExtensionsPackageVersion>
<SystemValueTuplePackageVersion>4.6.0-preview1-26708-04</SystemValueTuplePackageVersion>
</PropertyGroup>
<Import Project="$(DotNetPackageVersionPropsPath)" Condition="'$(DotNetPackageVersionPropsPath)' != ''" />
<PropertyGroup>
<!-- Assign this variable last because it may be updated from DotNetPackageVersionPropsPath as MicrosoftNETCoreAppPackageVersion. -->
<MicrosoftNETCoreApp22PackageVersion Condition="'$(MicrosoftNETCoreAppPackageVersion)' != ''">$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreApp22PackageVersion>
<MicrosoftNETCoreApp30PackageVersion Condition="'$(MicrosoftNETCoreAppPackageVersion)' != ''">$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreApp30PackageVersion>
<!-- Determined by build tools -->
<InternalAspNetCoreSdkPackageVersion>$(KoreBuildVersion)</InternalAspNetCoreSdkPackageVersion>
@ -57,11 +83,9 @@
<MicrosoftCodeAnalysisCommonPackageVersion>2.8.0</MicrosoftCodeAnalysisCommonPackageVersion>
<MicrosoftCodeAnalysisCSharpPackageVersion>2.8.0</MicrosoftCodeAnalysisCSharpPackageVersion>
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>2.8.0</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
<MicrosoftCSharpPackageVersion>4.5.0</MicrosoftCSharpPackageVersion>
<MicrosoftDiaSymReaderNativePackageVersion>1.7.0</MicrosoftDiaSymReaderNativePackageVersion>
<MicrosoftDotNetArchivePackageVersion>0.2.0-beta-63019-01</MicrosoftDotNetArchivePackageVersion>
<MicrosoftDotNetProjectModelPackageVersion>1.0.0-rc3-003121</MicrosoftDotNetProjectModelPackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>2.1.0</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftExtensionsPlatformAbstractionsPackageVersion>1.1.0</MicrosoftExtensionsPlatformAbstractionsPackageVersion>
<MicrosoftIdentityModelClientsActiveDirectoryPackageVersion>3.14.2</MicrosoftIdentityModelClientsActiveDirectoryPackageVersion>
<MicrosoftIdentityModelProtocolsOpenIdConnectPackageVersion>5.2.0</MicrosoftIdentityModelProtocolsOpenIdConnectPackageVersion>
@ -71,7 +95,9 @@
<MicrosoftNETCoreApp11PackageVersion>1.1.9</MicrosoftNETCoreApp11PackageVersion>
<MicrosoftNETCoreApp20PackageVersion>2.0.9</MicrosoftNETCoreApp20PackageVersion>
<MicrosoftNETCoreApp21PackageVersion>2.1.2</MicrosoftNETCoreApp21PackageVersion>
<MicrosoftNETCoreApp22PackageVersion>2.2.0-preview1-26618-02</MicrosoftNETCoreApp22PackageVersion>
<MicrosoftNETCoreDotNetAppHost21PackageVersion>$(MicrosoftNETCoreApp21PackageVersion)</MicrosoftNETCoreDotNetAppHost21PackageVersion>
<MicrosoftNETCoreDotNetAppHost22PackageVersion>$(MicrosoftNETCoreApp22PackageVersion)</MicrosoftNETCoreDotNetAppHost22PackageVersion>
<MicrosoftNETCoreWindowsApiSetsPackageVersion>1.0.1</MicrosoftNETCoreWindowsApiSetsPackageVersion>
<MicrosoftNETTestSdkPackageVersion>15.6.1</MicrosoftNETTestSdkPackageVersion>
<MicrosoftOwinSecurityCookiesPackageVersion>3.0.1</MicrosoftOwinSecurityCookiesPackageVersion>
@ -94,7 +120,6 @@
<MicrosoftVisualStudioTextUIPackageVersion>15.6.161-preview</MicrosoftVisualStudioTextUIPackageVersion>
<MicrosoftWebAdministrationPackageVersion>11.1.0</MicrosoftWebAdministrationPackageVersion>
<MicrosoftWebXdtPackageVersion>1.4.0</MicrosoftWebXdtPackageVersion>
<MicrosoftWin32RegistryPackageVersion>4.5.0</MicrosoftWin32RegistryPackageVersion>
<MonoAddinsPackageVersion>1.3.8</MonoAddinsPackageVersion>
<MonoDevelopSdkPackageVersion>1.0.1</MonoDevelopSdkPackageVersion>
<MoqPackageVersion>4.7.49</MoqPackageVersion>
@ -115,35 +140,12 @@
<StackExchangeRedisStrongNamePackageVersion>1.2.6</StackExchangeRedisStrongNamePackageVersion>
<StreamJsonRpcPackageVersion>1.1.92</StreamJsonRpcPackageVersion>
<StyleCopAnalyzersPackageVersion>1.0.0</StyleCopAnalyzersPackageVersion>
<SystemBuffersPackageVersion>4.5.0</SystemBuffersPackageVersion>
<SystemCollectionsImmutablePackageVersion>1.5.0</SystemCollectionsImmutablePackageVersion>
<SystemComponentModelAnnotationsPackageVersion>4.5.0</SystemComponentModelAnnotationsPackageVersion>
<SystemDataSqlClientPackageVersion>4.5.1</SystemDataSqlClientPackageVersion>
<SystemDiagnosticsDiagnosticSourcePackageVersion>4.5.0</SystemDiagnosticsDiagnosticSourcePackageVersion>
<SystemDiagnosticsEventLogPackageVersion>4.5.0</SystemDiagnosticsEventLogPackageVersion>
<SystemIdentityModelTokensJwtPackageVersion>5.2.0</SystemIdentityModelTokensJwtPackageVersion>
<SystemInteractiveAsyncPackageVersion>3.1.1</SystemInteractiveAsyncPackageVersion>
<SystemIOPipelinesPackageVersion>4.5.0</SystemIOPipelinesPackageVersion>
<SystemMemoryPackageVersion>4.5.1</SystemMemoryPackageVersion>
<SystemNetHttpPackageVersion>4.3.2</SystemNetHttpPackageVersion>
<SystemNetHttpWinHttpHandlerPackageVersion>4.5.0</SystemNetHttpWinHttpHandlerPackageVersion>
<SystemNetWebSocketsWebSocketProtocolPackageVersion>4.5.1</SystemNetWebSocketsWebSocketProtocolPackageVersion>
<SystemNumericsVectorsPackageVersion>4.5.0</SystemNumericsVectorsPackageVersion>
<SystemReactiveLinqPackageVersion>3.1.1</SystemReactiveLinqPackageVersion>
<SystemReflectionEmitPackageVersion>4.3.0</SystemReflectionEmitPackageVersion>
<SystemReflectionMetadataPackageVersion>1.6.0</SystemReflectionMetadataPackageVersion>
<SystemRuntimeCompilerServicesUnsafePackageVersion>4.5.1</SystemRuntimeCompilerServicesUnsafePackageVersion>
<SystemRuntimeInteropServicesRuntimeInformationPackageVersion>4.3.0</SystemRuntimeInteropServicesRuntimeInformationPackageVersion>
<SystemSecurityCryptographyCngPackageVersion>4.5.0</SystemSecurityCryptographyCngPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>4.5.0</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>4.5.0</SystemSecurityPermissionsPackageVersion>
<SystemSecurityPrincipalWindowsPackageVersion>4.5.0</SystemSecurityPrincipalWindowsPackageVersion>
<SystemServiceProcessServiceControllerPackageVersion>4.5.0</SystemServiceProcessServiceControllerPackageVersion>
<SystemTextEncodingsWebPackageVersion>4.5.0</SystemTextEncodingsWebPackageVersion>
<SystemThreadingChannelsPackageVersion>4.5.0</SystemThreadingChannelsPackageVersion>
<SystemThreadingTasksDataflowPackageVersion>4.9.0</SystemThreadingTasksDataflowPackageVersion>
<SystemThreadingTasksExtensionsPackageVersion>4.5.1</SystemThreadingTasksExtensionsPackageVersion>
<SystemValueTuplePackageVersion>4.5.0</SystemValueTuplePackageVersion>
<Utf8JsonPackageVersion>1.3.7</Utf8JsonPackageVersion>
<VisualStudio_NewtonsoftJsonPackageVersion>9.0.1</VisualStudio_NewtonsoftJsonPackageVersion>
<VSIX_MicrosoftCodeAnalysisCommonPackageVersion>2.9.0-beta4-62911-02</VSIX_MicrosoftCodeAnalysisCommonPackageVersion>

2
build/external-dependencies.props
View File

@ -75,9 +75,11 @@
<ExternalDependency Include="Microsoft.NETCore.App" Version="$(MicrosoftNETCoreApp20PackageVersion)" VariableName="MicrosoftNETCoreApp20PackageVersion" />
<ExternalDependency Include="Microsoft.NETCore.App" Version="$(MicrosoftNETCoreApp21PackageVersion)" VariableName="MicrosoftNETCoreApp21PackageVersion" />
<ExternalDependency Include="Microsoft.NETCore.App" Version="$(MicrosoftNETCoreApp22PackageVersion)" VariableName="MicrosoftNETCoreApp22PackageVersion" />
<ExternalDependency Include="Microsoft.NETCore.App" Version="$(MicrosoftNETCoreApp30PackageVersion)" VariableName="MicrosoftNETCoreApp30PackageVersion" />
<!-- Microsoft.NetCore.DotNetAppHost for global tools-->
<ExternalDependency Include="Microsoft.NETCore.DotNetAppHost" Version="$(MicrosoftNETCoreDotNetAppHost21PackageVersion)" VariableName="MicrosoftNETCoreDotNetAppHost21PackageVersion" />
<ExternalDependency Include="Microsoft.NETCore.DotNetAppHost" Version="$(MicrosoftNETCoreDotNetAppHost22PackageVersion)" VariableName="MicrosoftNETCoreDotNetAppHost22PackageVersion" />
<ExternalDependency Include="Microsoft.NETCore.DotNetAppHost" Version="$(MicrosoftNETCoreDotNetAppHostPackageVersion)" />
<ExternalDependency Include="Microsoft.NETCore.Windows.ApiSets" Version="$(MicrosoftNETCoreWindowsApiSetsPackageVersion)" />

4
build/repo.props
View File

@ -43,12 +43,12 @@
</ItemGroup>
<ItemGroup>
<DotNetCoreRuntime Include="$(MicrosoftNETCoreApp22PackageVersion)"
<DotNetCoreRuntime Include="$(MicrosoftNETCoreAppPackageVersion)"
Feed="$(DotNetAssetRootUrl)"
FeedCredential="$(DotNetAssetRootAccessTokenSuffix)" />
<DotNetCoreRuntime Condition="'$(OS)' == 'Windows_NT'"
Include="$(MicrosoftNETCoreApp22PackageVersion)"
Include="$(MicrosoftNETCoreApp30PackageVersion)"
Arch="x86"
Feed="$(DotNetAssetRootUrl)"
FeedCredential="$(DotNetAssetRootAccessTokenSuffix)" />

1
build/repo.targets
View File

@ -34,6 +34,7 @@
<!-- We need to pass the NETCoreApp package versions to msbuild so that it doesn't complain about us using a different one than it was restored against. -->
<PropertyGroup>
<DesignTimeBuildProps>MicrosoftNETCoreAppPackageVersion=$(MicrosoftNETCoreAppPackageVersion);</DesignTimeBuildProps>
<DesignTimeBuildProps>$(DesignTimeBuildProps);MicrosoftNETCoreApp30PackageVersion=$(MicrosoftNETCoreApp30PackageVersion);</DesignTimeBuildProps>
<DesignTimeBuildProps>$(DesignTimeBuildProps);MicrosoftNETCoreApp22PackageVersion=$(MicrosoftNETCoreApp22PackageVersion);</DesignTimeBuildProps>
<DesignTimeBuildProps>$(DesignTimeBuildProps);MicrosoftNETCoreApp21PackageVersion=$(MicrosoftNETCoreApp21PackageVersion);</DesignTimeBuildProps>
<DesignTimeBuildProps>$(DesignTimeBuildProps);MicrosoftNETCoreApp20PackageVersion=$(MicrosoftNETCoreApp20PackageVersion);</DesignTimeBuildProps>

1
build/submodules.props
View File

@ -51,6 +51,7 @@
<Repository Include="Session" />
<Repository Include="SignalR" />
<Repository Include="StaticFiles" />
<Repository Include="WebHooks" />
<Repository Include="WebSockets" />
</ItemGroup>
</Project>

2
build/tools/templates/Archive/Archive.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework>
<TargetFramework>netcoreapp3.0</TargetFramework>
<EnableApiCheck>false</EnableApiCheck>
<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>

2
build/tools/templates/SharedFx/SharedFx.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk" >
<PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework>
<TargetFramework>netcoreapp3.0</TargetFramework>
<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
</PropertyGroup>

4
korebuild-lock.txt
View File

@ -1,2 +1,2 @@
version:2.2.0-preview1-17099
commithash:263ed1db9866b6b419b1f5d5189a712aa218acb3
version:3.0.0-alpha1-10008
commithash:62b1d90d52185db39173f383a2b820d2c2b45c07

4
korebuild.json
View File

@ -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",

2
modules/AADIntegration

@ -1 +1 @@
Subproject commit 36ee1a1223cf024ba65ba1069767194ecb240ee4
Subproject commit e8e600b25b11a20c105ae68616da9f68b2fcf8cc

2
modules/Antiforgery

@ -1 +1 @@
Subproject commit ed2f15bc6e085c0555b35291c352ca75b46e9422
Subproject commit a35d30c7b2a6023fb2af112d01c0d1f80e6b03fa

2
modules/AuthSamples

@ -1 +1 @@
Subproject commit 9c6c7ae6bd9d0fff349fd225711c6936f3033456
Subproject commit 8d579cebe0408ab49ef7bc69a62a2cd97321e94d

2
modules/AzureIntegration

@ -1 +1 @@
Subproject commit e849173691046e091318440a4c62027593c1ae83
Subproject commit c7d7732a0ef255390070ac8fa3155cb187bf0399

2
modules/BasicMiddleware

@ -1 +1 @@
Subproject commit e425b27c057e5d875d4e52ccb4e44365b468b1b4
Subproject commit 2b93e7432ddfb7570bbbb99901955d4c624e106b

2
modules/BrowserLink

@ -1 +1 @@
Subproject commit 528e7d4fe5eed9f1604360cd2cec70c9ba05c911
Subproject commit b217d8888e120c3eec5c96096606b79fecbc1aa0

2
modules/CORS

@ -1 +1 @@
Subproject commit cbf2f4ca77c7974e84d86fd6af951231ccba0b3a
Subproject commit ca41e0ace3f4117f78d9a3bf4ef546c9305d1de8

2
modules/Caching

@ -1 +1 @@
Subproject commit 6f5fb1e3d6bb255253a7f740549c9b324ddbff04
Subproject commit 01d72c6d0e7c094ca794f655ebb9d6e67a6bdea1

2
modules/Common

@ -1 +1 @@
Subproject commit 6461c675ccabc70e261fdde27cbb41a5db09526b
Subproject commit d7a3ef5d126c2d767a26879db9ebc3d805b89014

2
modules/Configuration

@ -1 +1 @@
Subproject commit d6c5092c4e46ff819fabc2a8e5c46b8d3cb013a9
Subproject commit ebd11c2fe5e1cedc9a125a2d3f6646d5f272b66c

2
modules/DataProtection

@ -1 +1 @@
Subproject commit 2228213708c289139d0ac015e3a3dcaec41ae79d
Subproject commit 8037e756cbdf4af95cc4d912afb9a34c3c5480e3

2
modules/DependencyInjection

@ -1 +1 @@
Subproject commit 87325a0e50179ce480646a12b13e1fe67a698eeb
Subproject commit 58ec1e822f0fc19c32b16bc78ca280a71987fcf6

2
modules/Diagnostics

@ -1 +1 @@
Subproject commit a5ba2590d5760c84e5b043c15c46a6b81e323a75
Subproject commit 17d69d94e3bceb98f1118981e0d3c5398934304c

2
modules/DotNetTools

@ -1 +1 @@
Subproject commit cb954e15f88ffb164d2f23704bfb2a56ff7cf344
Subproject commit 7f627772a2171e9447c4e5cd5114b0e37933045b

2
modules/EntityFrameworkCore

@ -1 +1 @@
Subproject commit ab84f2f033f0d8834d80be049e669fd66b7e8485
Subproject commit 8b28c8860b0a83bcb3ec4a71c457d7e09af7d238

2
modules/EventNotification

@ -1 +1 @@
Subproject commit 26f6be93648277f0079246f1c1401f4c9636906b
Subproject commit 4d99b1e60d70490c18891127987395c6d895680f

2
modules/FileSystem

@ -1 +1 @@
Subproject commit b38748bcf4987498ee21596064bd089957962dcb
Subproject commit 18c48642973acef48e81739a921e8e0017766cd9

2
modules/Hosting

@ -1 +1 @@
Subproject commit 51c94337d7755dc4970da77f2ee12285da176d86
Subproject commit a5b083a39bae974e95ff1a9437468a103e72f6ea

2
modules/HtmlAbstractions

@ -1 +1 @@
Subproject commit 8bb788ef9eef5ae4a6b48c04b3903f7c8319bbe9
Subproject commit 1fe94914452c0af5998f25f8e0053628f79ddf71

2
modules/HttpAbstractions

@ -1 +1 @@
Subproject commit d0a32cc354adf9ad45e0773ba07dfd4207dd11a9
Subproject commit 405fdc3c1e9a935f294562fef3ec91edfd6c3c60

2
modules/HttpClientFactory

@ -1 +1 @@
Subproject commit 38a3611e5a5994ebfa53393899df1aaf3b90023f
Subproject commit f2af73b1eaf770e1cb537160754d793d39bb588f

2
modules/HttpSysServer

@ -1 +1 @@
Subproject commit 7de560b7accf32c532272ca5acff100d042788e4
Subproject commit 91c518e13d7ede44e6cb88df895d9a242b07726e

2
modules/IISIntegration

@ -1 +1 @@
Subproject commit 11b83dc2b3916ffcc17101902ec383257f6cd033
Subproject commit 13251ce5b777a3d47e475acf3ce4ba07ea949144

2
modules/Identity

@ -1 +1 @@
Subproject commit 4e84251cbf1535976c70ec66f038a768aefc4e96
Subproject commit c60b4d8784550ea868af0c2d08cc14217ae2e940

2
modules/JavaScriptServices

@ -1 +1 @@
Subproject commit 5fa87a0313877c8749df997bb6f30e9a447434ac
Subproject commit 0dc570a0c8725e3031ce5a884d7df3cfb75545ba

2
modules/JsonPatch

@ -1 +1 @@
Subproject commit b34f6284126e38e8b510b58e735a3d5587a8989c
Subproject commit 40dfd77fd025d74cfe831bd79f261f548a61a2bb

2
modules/KestrelHttpServer

@ -1 +1 @@
Subproject commit 868acacf68cd0b891054f84a4e07f7f1ac147307
Subproject commit 6c9d9f2b0c3193b5bb4c7f7182f116c0073f195f

2
modules/Localization

@ -1 +1 @@
Subproject commit 758cefa4659fa315a61e3036daadb50548be182f
Subproject commit 1d24b7a325a25ead3b1ee9c2ff1cf7c0806ec39b

2
modules/Logging

@ -1 +1 @@
Subproject commit 8252a2198726e36425e9364e5168a6ce359672ab
Subproject commit e9f9ad7379c3bf1707fa35bced6bdeadd409ba72

2
modules/MetaPackages

@ -1 +1 @@
Subproject commit 5f4f181c97811e739b295b1bbbf0529f5f147d0d
Subproject commit f115404d64d288ba916f43bd4c5ff0b8f55b434e

2
modules/Microsoft.Data.Sqlite

@ -1 +1 @@
Subproject commit 8f1e9c390ada36acf9d1ac55d3c305647e107ad8
Subproject commit 31b4c6a6df50758558af729f54f95928c4baf657

2
modules/MusicStore

@ -1 +1 @@
Subproject commit 96beb8413d7399b3eef5d267b1ebc58ce283c646
Subproject commit 58175b540bc40dc50a56b9cbc050d5c57931c448

2
modules/Mvc

@ -1 +1 @@
Subproject commit 1e7be641ae62759ecaf83806f48713e0437c1ea3
Subproject commit 432e11f2862b1c231497e57f0052bae4ca213869

2
modules/MvcPrecompilation

@ -1 +1 @@
Subproject commit 40c00c4165294a6c821797b778c84a6a8d82041f
Subproject commit e65092b711a7a2121055915ca9a57a361bf93900

2
modules/Options

@ -1 +1 @@
Subproject commit 26cf5666659608458bca96cea5eed7d8ff6bdd60
Subproject commit aea8ecb3967f4928608169681cfce1e6e5bb5ec9

2
modules/Proxy

@ -1 +1 @@
Subproject commit 5bc572eaacc39cb09d490078f1f4b3476da2ef08
Subproject commit 7746356662cd1a90748da3360173aca3f2842549

2
modules/Razor

@ -1 +1 @@
Subproject commit bbddd29ab87a75f61b42226854ad5dc98c74192d
Subproject commit 61aeae10233e52025090e836f3cbf70a13a2679f

2
modules/ResponseCaching

@ -1 +1 @@
Subproject commit d1ddd44130f59210c56cdb22f82304150ba835fe
Subproject commit ffd7583db83ec57b70a2702343424dace805c889

2
modules/Routing

@ -1 +1 @@
Subproject commit 2d53d398b26959e3fb388989a03f8c7ae761cbcc
Subproject commit d339b2b256f448946cd0da1ebb106e46408be333

2
modules/Scaffolding

@ -1 +1 @@
Subproject commit 99a678424d0747842de49677bbe7da80ffbfb42e
Subproject commit 52914b548a8d390192e47e075ffc63e0952ecaae

2
modules/Security

@ -1 +1 @@
Subproject commit 8b30c7359769cd9e3360c065d610598aa99da0c6
Subproject commit 36276e737842267ebb88a2cacb7c6223e117da6d

2
modules/ServerTests

@ -1 +1 @@
Subproject commit f57669db864ec955ff8ffd1fbc5abb6e40db971e
Subproject commit 6a2b3b9645cefd276bacbb5ec400dde55189737b

2
modules/Session

@ -1 +1 @@
Subproject commit 9b16c7907ec13f89e1c5665833623fe4f42e65cf
Subproject commit dce34d356386074937be317f2a38e2bec0a7596c

2
modules/SignalR

@ -1 +1 @@
Subproject commit 2d4fb0af6fd2ef2e3a059a2a15a56484d8800d35
Subproject commit 46c8ba5fdc881f19a0384613510e71290719503d

2
modules/StaticFiles

@ -1 +1 @@
Subproject commit 2df2d2865ffc692f8f946933d1b71d3bb39561b7
Subproject commit a527fc1cb1e736449b060a3f75d5b59f2d67c95e

9
modules/SubmoduleGraph.dgml
View File

@ -46,6 +46,7 @@
<Node Id="Session" Label="Session" />
<Node Id="SignalR" Label="SignalR" />
<Node Id="StaticFiles" Label="StaticFiles" />
<Node Id="WebHooks" Label="WebHooks" />
<Node Id="WebSockets" Label="WebSockets" />
</Nodes>
<Links>
@ -379,6 +380,12 @@
<Link Source="StaticFiles" Target="IISIntegration" />
<Link Source="StaticFiles" Target="KestrelHttpServer" />
<Link Source="StaticFiles" Target="Logging" />
<Link Source="WebHooks" Target="Common" />
<Link Source="WebHooks" Target="Configuration" />
<Link Source="WebHooks" Target="Logging" />
<Link Source="WebHooks" Target="MetaPackages" />
<Link Source="WebHooks" Target="Mvc" />
<Link Source="WebHooks" Target="StaticFiles" />
<Link Source="WebSockets" Target="Common" />
<Link Source="WebSockets" Target="Configuration" />
<Link Source="WebSockets" Target="Diagnostics" />
@ -391,4 +398,4 @@
<Link Source="WebSockets" Target="Options" />
<Link Source="WebSockets" Target="StaticFiles" />
</Links>
</DirectedGraph>
</DirectedGraph>

2
modules/Templating

@ -1 +1 @@
Subproject commit 5911fc0be1212b18daed74cb50d72233418c5193
Subproject commit e472c17533434285f62affa25a4d544cc463b168

1
modules/WebHooks Submodule

@ -0,0 +1 @@
Subproject commit 3aeedfa117306d10329b9ae6704da1a931cff2d3

2
modules/WebSockets

@ -1 +1 @@
Subproject commit c48f2b953e74b9a999081c3d4f94ce53427947ff
Subproject commit 85fd36f14337e939e37257c558f737967f5820af

6
run.ps1
View File

@ -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) {

2
run.sh
View File

@ -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

108
scripts/PatchVersionPrefix.ps1 Executable file
View File

@ -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
}
}

3
scripts/UpdateDependenciesCoreFx.ps1
View File

@ -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 }

2
scripts/update_travis_appveyor_yml.py
View File

@ -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)

2
src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj
View File

@ -3,7 +3,7 @@
<PropertyGroup>
<IncludeBuildOutput>false</IncludeBuildOutput>
<IncludeSymbols>false</IncludeSymbols>
<TargetFramework>netcoreapp2.2</TargetFramework>
<TargetFramework>netcoreapp3.0</TargetFramework>
<PackageTags>aspnetcore</PackageTags>
<Description>Microsoft.AspNetCore.All</Description>
<EnableApiCheck>false</EnableApiCheck>

0
src/Microsoft.AspNetCore.All/build/netcoreapp2.2/Microsoft.AspNetCore.All.props → src/Microsoft.AspNetCore.All/build/netcoreapp3.0/Microsoft.AspNetCore.All.props
View File

4
src/Microsoft.AspNetCore.All/build/netcoreapp2.2/Microsoft.AspNetCore.All.targets → src/Microsoft.AspNetCore.All/build/netcoreapp3.0/Microsoft.AspNetCore.All.targets
View File

@ -12,7 +12,7 @@
<Target Name="EnsureTFMCompatibility" BeforeTargets="_CheckForInvalidConfigurationAndPlatform">
<Error
Text="This version of Microsoft.AspNetCore.All is only compatible with the netcoreapp2.2 target framework. Please target netcoreapp2.2 or choose a version of Microsoft.AspNetCore.All compatible with $(TargetFramework)."
Condition="'$(TargetFramework)' != 'netcoreapp2.2'"/>
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'"/>
</Target>
</Project>

0
src/Microsoft.AspNetCore.All/lib/netcoreapp2.2/_._ → src/Microsoft.AspNetCore.All/lib/netcoreapp3.0/_._
View File

2
src/Microsoft.AspNetCore.App/Microsoft.AspNetCore.App.csproj
View File

@ -3,7 +3,7 @@
<PropertyGroup>
<IncludeBuildOutput>false</IncludeBuildOutput>
<IncludeSymbols>false</IncludeSymbols>
<TargetFramework>netcoreapp2.2</TargetFramework>
<TargetFramework>netcoreapp3.0</TargetFramework>
<PackageTags>aspnetcore</PackageTags>
<Description>Microsoft.AspNetCore.App</Description>
<EnableApiCheck>false</EnableApiCheck>

0
src/Microsoft.AspNetCore.App/build/netcoreapp2.2/Microsoft.AspNetCore.App.props → src/Microsoft.AspNetCore.App/build/netcoreapp3.0/Microsoft.AspNetCore.App.props
View File

4
src/Microsoft.AspNetCore.App/build/netcoreapp2.2/Microsoft.AspNetCore.App.targets → src/Microsoft.AspNetCore.App/build/netcoreapp3.0/Microsoft.AspNetCore.App.targets
View File

@ -12,7 +12,7 @@
<Target Name="EnsureTFMCompatibility" BeforeTargets="_CheckForInvalidConfigurationAndPlatform">
<Error
Text="This version of Microsoft.AspNetCore.App is only compatible with the netcoreapp2.2 target framework. Please target netcoreapp2.2 or choose a version of Microsoft.AspNetCore.App compatible with $(TargetFramework)."
Condition="'$(TargetFramework)' != 'netcoreapp2.2'"/>
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'"/>
</Target>
</Project>

0
src/Microsoft.AspNetCore.App/lib/netcoreapp2.2/_._ → src/Microsoft.AspNetCore.App/lib/netcoreapp3.0/_._
View File

4
src/PackageArchive/Archive.props
View File

@ -6,6 +6,8 @@
<PropertyGroup>
<!-- Required to make /t:Restore happy, but not really used for anything else. -->
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>netcoreapp3.0</TargetFramework>
<!-- aspnet/BuildTools#662 Don't police what version of NetCoreApp we use -->
<NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
</PropertyGroup>
</Project>

6
src/PackageArchive/Scenario.ConsoleApp/Scenario.ConsoleApp.csproj
View File

@ -1,12 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework>
<TargetFramework>netcoreapp3.0</TargetFramework>
<!-- aspnet/BuildTools#662 Don't police what version of NetCoreApp we use -->
<NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
<MaxImplicitVersion>2.2.0</MaxImplicitVersion>
<MaxImplicitVersion>3.0.0</MaxImplicitVersion>
<!-- Use pre-release versions up until 2.1.0, then don't lift higher than "2.1.0" -->
<MicrosoftNETCoreAppPackageVersion Condition="$(MicrosoftNETCoreApp22PackageVersion.StartsWith('$(MaxImplicitVersion)-'))">$(MicrosoftNETCoreApp22PackageVersion)</MicrosoftNETCoreAppPackageVersion>
<MicrosoftNETCoreAppPackageVersion Condition="$(MicrosoftNETCoreApp30PackageVersion.StartsWith('$(MaxImplicitVersion)-'))">$(MicrosoftNETCoreApp30PackageVersion)</MicrosoftNETCoreAppPackageVersion>
<MicrosoftNETCoreAppPackageVersion>$([MSbuild]::ValueOrDefault('$(MicrosoftNETCoreAppPackageVersion)','$(MaxImplicitVersion)'))</MicrosoftNETCoreAppPackageVersion>
</PropertyGroup>

2
src/PackageArchive/Scenario.WebApp/Scenario.WebApp.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework>
<TargetFramework>netcoreapp3.0</TargetFramework>
<!-- aspnet/BuildTools#662 Don't police what version of NetCoreApp we use -->
<NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
</PropertyGroup>

2
test/SharedFx.UnitTests/SharedFx.UnitTests.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework>
<TargetFramework>netcoreapp3.0</TargetFramework>
<RootNamespace>Microsoft.AspNetCore</RootNamespace>
</PropertyGroup>

12
version.props
View File

@ -1,16 +1,16 @@
<Project>
<PropertyGroup>
<AspNetCoreMajorVersion>2</AspNetCoreMajorVersion>
<AspNetCoreMinorVersion>2</AspNetCoreMinorVersion>
<AspNetCoreMajorVersion>3</AspNetCoreMajorVersion>
<AspNetCoreMinorVersion>0</AspNetCoreMinorVersion>
<AspNetCorePatchVersion>0</AspNetCorePatchVersion>
<VersionPrefix>$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$(AspNetCorePatchVersion)</VersionPrefix>
<PrereleaseVersionLabel>preview1</PrereleaseVersionLabel>
<PrereleaseVersionLabel>alpha1</PrereleaseVersionLabel>
<BuildNumber Condition="'$(BuildNumber)' == ''">t000</BuildNumber>
<!-- The 'human friendly' version to display in installers. In pre-release builds, this might be "2.0.7 Preview 2" -->
<PackageBrandingVersion>$(VersionPrefix) Preview 1</PackageBrandingVersion>
<PackageBrandingVersion>$(VersionPrefix) Alpha 1</PackageBrandingVersion>
<ExperimentalVersionPrefix>0.2.0</ExperimentalVersionPrefix>
<ExperimentalVersionPrefix>0.3.0</ExperimentalVersionPrefix>
<ExperimentalVersionSuffix>alpha1</ExperimentalVersionSuffix>
<PackageVersionSuffix Condition=" '$(IsFinalBuild)' != 'true' AND '$(PrereleaseVersionLabel)' != '' ">$(PrereleaseVersionLabel)</PackageVersionSuffix>
@ -31,7 +31,7 @@
<ExperimentalPackageVersion Condition=" '$(IsFinalBuild)' == 'true' AND '$(ExperimentalVersionSuffix)' != 'rtm' ">$(ExperimentalVersionPrefix)-$(ExperimentalVersionSuffix)-final</ExperimentalPackageVersion>
<ExperimentalVersionSuffix Condition=" '$(ExperimentalVersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(ExperimentalVersionSuffix)-$(BuildNumber)</ExperimentalVersionSuffix>
<SharedFxCliBlobChannel>release/2.2</SharedFxCliBlobChannel>
<SharedFxCliBlobChannel>master</SharedFxCliBlobChannel>
</PropertyGroup>
</Project>