Merge release/2.1 into dev (#1030)
This commit is contained in:
Pavel Krymets
GitHub
parent
12f658b9a9
commit
f828c9d6aa
|
|
@ -20,7 +20,7 @@
|
|||
</ItemDefinitionGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageArtifact Include="dotnet-aspnet-codegenerator" Category="ship" />
|
||||
<PackageArtifact Include="dotnet-aspnet-codegenerator" Category="noship" />
|
||||
<PackageArtifact Include="dotnet-dev-certs" Category="shipoob" />
|
||||
<PackageArtifact Include="dotnet-ef" Category="shipoob" />
|
||||
<PackageArtifact Include="dotnet-sql-cache" Category="shipoob" />
|
||||
|
|
|
|||
|
|
@ -0,0 +1,54 @@
|
|||
<Project>
|
||||
<ItemGroup>
|
||||
<RepositoryBuildOrder Include="Common" Order="1" />
|
||||
<RepositoryBuildOrder Include="Microsoft.Data.Sqlite" Order="1" />
|
||||
<RepositoryBuildOrder Include="Testing" Order="1" />
|
||||
<RepositoryBuildOrder Include="DependencyInjection" Order="2" />
|
||||
<RepositoryBuildOrder Include="FileSystem" Order="2" />
|
||||
<RepositoryBuildOrder Include="EventNotification" Order="2" />
|
||||
<RepositoryBuildOrder Include="JsonPatch" Order="2" />
|
||||
<RepositoryBuildOrder Include="Configuration" Order="3" />
|
||||
<RepositoryBuildOrder Include="Options" Order="4" />
|
||||
<RepositoryBuildOrder Include="DotNetTools" Order="4" />
|
||||
<RepositoryBuildOrder Include="Caching" Order="5" />
|
||||
<RepositoryBuildOrder Include="HtmlAbstractions" Order="5" />
|
||||
<RepositoryBuildOrder Include="Logging" Order="5" />
|
||||
<RepositoryBuildOrder Include="Razor" Order="6" />
|
||||
<RepositoryBuildOrder Include="HttpAbstractions" Order="6" />
|
||||
<RepositoryBuildOrder Include="HttpClientFactory" Order="6" />
|
||||
<RepositoryBuildOrder Include="Hosting" Order="7" />
|
||||
<RepositoryBuildOrder Include="DataProtection" Order="8" />
|
||||
<RepositoryBuildOrder Include="KestrelHttpServer" Order="8" />
|
||||
<RepositoryBuildOrder Include="EntityFrameworkCore" Order="8" />
|
||||
<RepositoryBuildOrder Include="HttpSysServer" Order="8" />
|
||||
<RepositoryBuildOrder Include="BrowserLink" Order="8" />
|
||||
<RepositoryBuildOrder Include="BasicMiddleware" Order="9" />
|
||||
<RepositoryBuildOrder Include="Antiforgery" Order="9" />
|
||||
<RepositoryBuildOrder Include="IISIntegration" Order="10" />
|
||||
<RepositoryBuildOrder Include="CORS" Order="11" />
|
||||
<RepositoryBuildOrder Include="StaticFiles" Order="11" />
|
||||
<RepositoryBuildOrder Include="Routing" Order="11" />
|
||||
<RepositoryBuildOrder Include="ResponseCaching" Order="11" />
|
||||
<RepositoryBuildOrder Include="Session" Order="11" />
|
||||
<RepositoryBuildOrder Include="ServerTests" Order="11" />
|
||||
<RepositoryBuildOrder Include="Diagnostics" Order="12" />
|
||||
<RepositoryBuildOrder Include="Localization" Order="12" />
|
||||
<RepositoryBuildOrder Include="WebSockets" Order="13" />
|
||||
<RepositoryBuildOrder Include="Security" Order="13" />
|
||||
<RepositoryBuildOrder Include="MetaPackages" Order="13" />
|
||||
<RepositoryBuildOrder Include="Mvc" Order="14" />
|
||||
<RepositoryBuildOrder Include="Proxy" Order="14" />
|
||||
<RepositoryBuildOrder Include="AADIntegration" Order="15" />
|
||||
<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" />
|
||||
<RepositoryBuildOrder Include="SignalR" Order="16" />
|
||||
<RepositoryBuildOrder Include="AuthSamples" Order="16" />
|
||||
|
||||
<RepositoryBuildOrder Update="@(RepositoryBuildOrder)" RootPath="$(SubmoduleRoot)%(Identity)" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
@ -1,90 +1,90 @@
|
|||
<Project>
|
||||
<!-- These package version may be overridden or updated by automation. -->
|
||||
<PropertyGroup Label="Package Versions: Auto" Condition=" '$(DotNetPackageVersionPropsPath)' == '' ">
|
||||
<MicrosoftCSharpPackageVersion>4.5.0-preview2-26330-05</MicrosoftCSharpPackageVersion>
|
||||
<MicrosoftDotNetPlatformAbstractionsPackageVersion>2.1.0-preview2-26330-03</MicrosoftDotNetPlatformAbstractionsPackageVersion>
|
||||
<MicrosoftExtensionsDependencyModelPackageVersion>2.1.0-preview2-26330-03</MicrosoftExtensionsDependencyModelPackageVersion>
|
||||
<MicrosoftCSharpPackageVersion>4.5.0-preview3-26331-02</MicrosoftCSharpPackageVersion>
|
||||
<MicrosoftDotNetPlatformAbstractionsPackageVersion>2.1.0-preview3-26331-01</MicrosoftDotNetPlatformAbstractionsPackageVersion>
|
||||
<MicrosoftExtensionsDependencyModelPackageVersion>2.1.0-preview3-26331-01</MicrosoftExtensionsDependencyModelPackageVersion>
|
||||
<!-- MicrosoftNETCoreApp21PackageVersion is assigned at the bottom so it can automatically pick up MicrosoftNETCoreAppPackageVersion in an orchestrated build. -->
|
||||
<MicrosoftNETCoreAppPackageVersion>2.1.0-preview2-26330-03</MicrosoftNETCoreAppPackageVersion>
|
||||
<MicrosoftNETCoreDotNetAppHostPackageVersion>2.1.0-preview2-26330-03</MicrosoftNETCoreDotNetAppHostPackageVersion>
|
||||
<MicrosoftNETCoreDotNetHostPolicyPackageVersion>2.1.0-preview2-26330-03</MicrosoftNETCoreDotNetHostPolicyPackageVersion>
|
||||
<MicrosoftNETCoreDotNetHostResolverPackageVersion>2.1.0-preview2-26330-03</MicrosoftNETCoreDotNetHostResolverPackageVersion>
|
||||
<MicrosoftNETCorePlatformsPackageVersion>2.1.0-preview2-26330-05</MicrosoftNETCorePlatformsPackageVersion>
|
||||
<MicrosoftWin32RegistryPackageVersion>4.5.0-preview2-26330-05</MicrosoftWin32RegistryPackageVersion>
|
||||
<NuGetFrameworksPackageVersion>4.7.0-netcore.2.1.preview2.5137</NuGetFrameworksPackageVersion>
|
||||
<RuntimeAlpine36X64MicrosoftNETCoreAppPackageVersion>2.1.0-preview2-26330-03</RuntimeAlpine36X64MicrosoftNETCoreAppPackageVersion>
|
||||
<RuntimeAlpine36X64MicrosoftNETCoreDotNetAppHostPackageVersion>2.1.0-preview2-26330-03</RuntimeAlpine36X64MicrosoftNETCoreDotNetAppHostPackageVersion>
|
||||
<RuntimeAlpine36X64MicrosoftNETCoreDotNetHostPackageVersion>2.1.0-preview2-26330-03</RuntimeAlpine36X64MicrosoftNETCoreDotNetHostPackageVersion>
|
||||
<RuntimeAlpine36X64MicrosoftNETCoreDotNetHostPolicyPackageVersion>2.1.0-preview2-26330-03</RuntimeAlpine36X64MicrosoftNETCoreDotNetHostPolicyPackageVersion>
|
||||
<RuntimeAlpine36X64MicrosoftNETCoreDotNetHostResolverPackageVersion>2.1.0-preview2-26330-03</RuntimeAlpine36X64MicrosoftNETCoreDotNetHostResolverPackageVersion>
|
||||
<RuntimeLinuxArmMicrosoftNETCoreAppPackageVersion>2.1.0-preview2-26330-03</RuntimeLinuxArmMicrosoftNETCoreAppPackageVersion>
|
||||
<RuntimeLinuxArmMicrosoftNETCoreDotNetAppHostPackageVersion>2.1.0-preview2-26330-03</RuntimeLinuxArmMicrosoftNETCoreDotNetAppHostPackageVersion>
|
||||
<RuntimeLinuxArmMicrosoftNETCoreDotNetHostPackageVersion>2.1.0-preview2-26330-03</RuntimeLinuxArmMicrosoftNETCoreDotNetHostPackageVersion>
|
||||
<RuntimeLinuxArmMicrosoftNETCoreDotNetHostPolicyPackageVersion>2.1.0-preview2-26330-03</RuntimeLinuxArmMicrosoftNETCoreDotNetHostPolicyPackageVersion>
|
||||
<RuntimeLinuxArmMicrosoftNETCoreDotNetHostResolverPackageVersion>2.1.0-preview2-26330-03</RuntimeLinuxArmMicrosoftNETCoreDotNetHostResolverPackageVersion>
|
||||
<RuntimeLinuxX64MicrosoftNETCoreAppPackageVersion>2.1.0-preview2-26330-03</RuntimeLinuxX64MicrosoftNETCoreAppPackageVersion>
|
||||
<RuntimeLinuxX64MicrosoftNETCoreDotNetAppHostPackageVersion>2.1.0-preview2-26330-03</RuntimeLinuxX64MicrosoftNETCoreDotNetAppHostPackageVersion>
|
||||
<RuntimeLinuxX64MicrosoftNETCoreDotNetHostPackageVersion>2.1.0-preview2-26330-03</RuntimeLinuxX64MicrosoftNETCoreDotNetHostPackageVersion>
|
||||
<RuntimeLinuxX64MicrosoftNETCoreDotNetHostPolicyPackageVersion>2.1.0-preview2-26330-03</RuntimeLinuxX64MicrosoftNETCoreDotNetHostPolicyPackageVersion>
|
||||
<RuntimeLinuxX64MicrosoftNETCoreDotNetHostResolverPackageVersion>2.1.0-preview2-26330-03</RuntimeLinuxX64MicrosoftNETCoreDotNetHostResolverPackageVersion>
|
||||
<RuntimeOsxX64MicrosoftNETCoreAppPackageVersion>2.1.0-preview2-26330-03</RuntimeOsxX64MicrosoftNETCoreAppPackageVersion>
|
||||
<RuntimeOsxX64MicrosoftNETCoreDotNetAppHostPackageVersion>2.1.0-preview2-26330-03</RuntimeOsxX64MicrosoftNETCoreDotNetAppHostPackageVersion>
|
||||
<RuntimeOsxX64MicrosoftNETCoreDotNetHostPackageVersion>2.1.0-preview2-26330-03</RuntimeOsxX64MicrosoftNETCoreDotNetHostPackageVersion>
|
||||
<RuntimeOsxX64MicrosoftNETCoreDotNetHostPolicyPackageVersion>2.1.0-preview2-26330-03</RuntimeOsxX64MicrosoftNETCoreDotNetHostPolicyPackageVersion>
|
||||
<RuntimeOsxX64MicrosoftNETCoreDotNetHostResolverPackageVersion>2.1.0-preview2-26330-03</RuntimeOsxX64MicrosoftNETCoreDotNetHostResolverPackageVersion>
|
||||
<RuntimeWinX64MicrosoftNETCoreAppPackageVersion>2.1.0-preview2-26330-03</RuntimeWinX64MicrosoftNETCoreAppPackageVersion>
|
||||
<RuntimeWinX64MicrosoftNETCoreDotNetAppHostPackageVersion>2.1.0-preview2-26330-03</RuntimeWinX64MicrosoftNETCoreDotNetAppHostPackageVersion>
|
||||
<RuntimeWinX64MicrosoftNETCoreDotNetHostPackageVersion>2.1.0-preview2-26330-03</RuntimeWinX64MicrosoftNETCoreDotNetHostPackageVersion>
|
||||
<RuntimeWinX64MicrosoftNETCoreDotNetHostPolicyPackageVersion>2.1.0-preview2-26330-03</RuntimeWinX64MicrosoftNETCoreDotNetHostPolicyPackageVersion>
|
||||
<RuntimeWinX64MicrosoftNETCoreDotNetHostResolverPackageVersion>2.1.0-preview2-26330-03</RuntimeWinX64MicrosoftNETCoreDotNetHostResolverPackageVersion>
|
||||
<RuntimeWinX86MicrosoftNETCoreAppPackageVersion>2.1.0-preview2-26330-03</RuntimeWinX86MicrosoftNETCoreAppPackageVersion>
|
||||
<RuntimeWinX86MicrosoftNETCoreDotNetAppHostPackageVersion>2.1.0-preview2-26330-03</RuntimeWinX86MicrosoftNETCoreDotNetAppHostPackageVersion>
|
||||
<RuntimeWinX86MicrosoftNETCoreDotNetHostPackageVersion>2.1.0-preview2-26330-03</RuntimeWinX86MicrosoftNETCoreDotNetHostPackageVersion>
|
||||
<RuntimeWinX86MicrosoftNETCoreDotNetHostPolicyPackageVersion>2.1.0-preview2-26330-03</RuntimeWinX86MicrosoftNETCoreDotNetHostPolicyPackageVersion>
|
||||
<RuntimeWinX86MicrosoftNETCoreDotNetHostResolverPackageVersion>2.1.0-preview2-26330-03</RuntimeWinX86MicrosoftNETCoreDotNetHostResolverPackageVersion>
|
||||
<SystemBuffersPackageVersion>4.5.0-preview2-26330-05</SystemBuffersPackageVersion>
|
||||
<SystemCodeDomPackageVersion>4.5.0-preview2-26330-05</SystemCodeDomPackageVersion>
|
||||
<SystemCollectionsImmutablePackageVersion>1.5.0-preview2-26330-05</SystemCollectionsImmutablePackageVersion>
|
||||
<SystemComponentModelAnnotationsPackageVersion>4.5.0-preview2-26330-05</SystemComponentModelAnnotationsPackageVersion>
|
||||
<SystemCompositionAttributedModelPackageVersion>1.2.0-preview2-26330-05</SystemCompositionAttributedModelPackageVersion>
|
||||
<SystemCompositionConventionPackageVersion>1.2.0-preview2-26330-05</SystemCompositionConventionPackageVersion>
|
||||
<SystemCompositionHostingPackageVersion>1.2.0-preview2-26330-05</SystemCompositionHostingPackageVersion>
|
||||
<SystemCompositionPackageVersion>1.2.0-preview2-26330-05</SystemCompositionPackageVersion>
|
||||
<SystemCompositionRuntimePackageVersion>1.2.0-preview2-26330-05</SystemCompositionRuntimePackageVersion>
|
||||
<SystemCompositionTypedPartsPackageVersion>1.2.0-preview2-26330-05</SystemCompositionTypedPartsPackageVersion>
|
||||
<SystemConfigurationConfigurationManagerPackageVersion>4.5.0-preview2-26330-05</SystemConfigurationConfigurationManagerPackageVersion>
|
||||
<SystemDataSqlClientPackageVersion>4.5.0-preview2-26330-05</SystemDataSqlClientPackageVersion>
|
||||
<SystemDiagnosticsDiagnosticSourcePackageVersion>4.5.0-preview2-26330-05</SystemDiagnosticsDiagnosticSourcePackageVersion>
|
||||
<SystemDiagnosticsEventLogPackageVersion>4.5.0-preview2-26330-05</SystemDiagnosticsEventLogPackageVersion>
|
||||
<SystemIOFileSystemAccessControlPackageVersion>4.5.0-preview2-26330-05</SystemIOFileSystemAccessControlPackageVersion>
|
||||
<SystemIOPackagingPackageVersion>4.5.0-preview2-26330-05</SystemIOPackagingPackageVersion>
|
||||
<SystemIOPipesAccessControlPackageVersion>4.5.0-preview2-26330-05</SystemIOPipesAccessControlPackageVersion>
|
||||
<SystemIOPipelinesPackageVersion>4.5.0-preview2-26330-05</SystemIOPipelinesPackageVersion>
|
||||
<SystemIOPortsPackageVersion>4.5.0-preview2-26330-05</SystemIOPortsPackageVersion>
|
||||
<SystemJsonPackageVersion>4.5.0-preview2-26330-05</SystemJsonPackageVersion>
|
||||
<SystemMemoryPackageVersion>4.5.0-preview2-26330-05</SystemMemoryPackageVersion>
|
||||
<SystemNetHttpWinHttpHandlerPackageVersion>4.5.0-preview2-26330-05</SystemNetHttpWinHttpHandlerPackageVersion>
|
||||
<SystemNetWebSocketsWebSocketProtocolPackageVersion>4.5.0-preview2-26330-05</SystemNetWebSocketsWebSocketProtocolPackageVersion>
|
||||
<SystemNumericsVectorsPackageVersion>4.5.0-preview2-26330-05</SystemNumericsVectorsPackageVersion>
|
||||
<SystemReflectionDispatchProxyPackageVersion>4.5.0-preview2-26330-05</SystemReflectionDispatchProxyPackageVersion>
|
||||
<SystemReflectionMetadataPackageVersion>1.6.0-preview2-26330-05</SystemReflectionMetadataPackageVersion>
|
||||
<SystemReflectionTypeExtensionsPackageVersion>4.5.0-preview2-26330-05</SystemReflectionTypeExtensionsPackageVersion>
|
||||
<SystemRuntimeCompilerServicesUnsafePackageVersion>4.5.0-preview2-26330-05</SystemRuntimeCompilerServicesUnsafePackageVersion>
|
||||
<SystemSecurityAccessControlPackageVersion>4.5.0-preview2-26330-05</SystemSecurityAccessControlPackageVersion>
|
||||
<SystemSecurityCryptographyCngPackageVersion>4.5.0-preview2-26330-05</SystemSecurityCryptographyCngPackageVersion>
|
||||
<SystemSecurityCryptographyPkcsPackageVersion>4.5.0-preview2-26330-05</SystemSecurityCryptographyPkcsPackageVersion>
|
||||
<SystemSecurityCryptographyProtectedDataPackageVersion>4.5.0-preview2-26330-05</SystemSecurityCryptographyProtectedDataPackageVersion>
|
||||
<SystemSecurityCryptographyXmlPackageVersion>4.5.0-preview2-26330-05</SystemSecurityCryptographyXmlPackageVersion>
|
||||
<SystemSecurityPermissionsPackageVersion>4.5.0-preview2-26330-05</SystemSecurityPermissionsPackageVersion>
|
||||
<SystemSecurityPrincipalWindowsPackageVersion>4.5.0-preview2-26330-05</SystemSecurityPrincipalWindowsPackageVersion>
|
||||
<SystemServiceProcessServiceControllerPackageVersion>4.5.0-preview2-26330-05</SystemServiceProcessServiceControllerPackageVersion>
|
||||
<SystemTextEncodingCodePagesPackageVersion>4.5.0-preview2-26330-05</SystemTextEncodingCodePagesPackageVersion>
|
||||
<SystemTextEncodingsWebPackageVersion>4.5.0-preview2-26330-05</SystemTextEncodingsWebPackageVersion>
|
||||
<SystemThreadingAccessControlPackageVersion>4.5.0-preview2-26330-05</SystemThreadingAccessControlPackageVersion>
|
||||
<SystemThreadingChannelsPackageVersion>4.5.0-preview2-26330-05</SystemThreadingChannelsPackageVersion>
|
||||
<SystemThreadingTasksDataflowPackageVersion>4.9.0-preview2-26330-05</SystemThreadingTasksDataflowPackageVersion>
|
||||
<SystemThreadingTasksExtensionsPackageVersion>4.5.0-preview2-26330-05</SystemThreadingTasksExtensionsPackageVersion>
|
||||
<SystemValueTuplePackageVersion>4.5.0-preview2-26330-05</SystemValueTuplePackageVersion>
|
||||
<MicrosoftNETCoreAppPackageVersion>2.1.0-preview3-26331-01</MicrosoftNETCoreAppPackageVersion>
|
||||
<MicrosoftNETCoreDotNetAppHostPackageVersion>2.1.0-preview3-26331-01</MicrosoftNETCoreDotNetAppHostPackageVersion>
|
||||
<MicrosoftNETCoreDotNetHostPolicyPackageVersion>2.1.0-preview3-26331-01</MicrosoftNETCoreDotNetHostPolicyPackageVersion>
|
||||
<MicrosoftNETCoreDotNetHostResolverPackageVersion>2.1.0-preview3-26331-01</MicrosoftNETCoreDotNetHostResolverPackageVersion>
|
||||
<MicrosoftNETCorePlatformsPackageVersion>2.1.0-preview3-26331-02</MicrosoftNETCorePlatformsPackageVersion>
|
||||
<MicrosoftWin32RegistryPackageVersion>4.5.0-preview3-26331-02</MicrosoftWin32RegistryPackageVersion>
|
||||
<NuGetFrameworksPackageVersion>4.7.0-preview3.5039</NuGetFrameworksPackageVersion>
|
||||
<RuntimeAlpine36X64MicrosoftNETCoreAppPackageVersion>2.1.0-preview3-26331-01</RuntimeAlpine36X64MicrosoftNETCoreAppPackageVersion>
|
||||
<RuntimeAlpine36X64MicrosoftNETCoreDotNetAppHostPackageVersion>2.1.0-preview3-26331-01</RuntimeAlpine36X64MicrosoftNETCoreDotNetAppHostPackageVersion>
|
||||
<RuntimeAlpine36X64MicrosoftNETCoreDotNetHostPackageVersion>2.1.0-preview3-26331-01</RuntimeAlpine36X64MicrosoftNETCoreDotNetHostPackageVersion>
|
||||
<RuntimeAlpine36X64MicrosoftNETCoreDotNetHostPolicyPackageVersion>2.1.0-preview3-26331-01</RuntimeAlpine36X64MicrosoftNETCoreDotNetHostPolicyPackageVersion>
|
||||
<RuntimeAlpine36X64MicrosoftNETCoreDotNetHostResolverPackageVersion>2.1.0-preview3-26331-01</RuntimeAlpine36X64MicrosoftNETCoreDotNetHostResolverPackageVersion>
|
||||
<RuntimeLinuxArmMicrosoftNETCoreAppPackageVersion>2.1.0-preview3-26331-01</RuntimeLinuxArmMicrosoftNETCoreAppPackageVersion>
|
||||
<RuntimeLinuxArmMicrosoftNETCoreDotNetAppHostPackageVersion>2.1.0-preview3-26331-01</RuntimeLinuxArmMicrosoftNETCoreDotNetAppHostPackageVersion>
|
||||
<RuntimeLinuxArmMicrosoftNETCoreDotNetHostPackageVersion>2.1.0-preview3-26331-01</RuntimeLinuxArmMicrosoftNETCoreDotNetHostPackageVersion>
|
||||
<RuntimeLinuxArmMicrosoftNETCoreDotNetHostPolicyPackageVersion>2.1.0-preview3-26331-01</RuntimeLinuxArmMicrosoftNETCoreDotNetHostPolicyPackageVersion>
|
||||
<RuntimeLinuxArmMicrosoftNETCoreDotNetHostResolverPackageVersion>2.1.0-preview3-26331-01</RuntimeLinuxArmMicrosoftNETCoreDotNetHostResolverPackageVersion>
|
||||
<RuntimeLinuxX64MicrosoftNETCoreAppPackageVersion>2.1.0-preview3-26331-01</RuntimeLinuxX64MicrosoftNETCoreAppPackageVersion>
|
||||
<RuntimeLinuxX64MicrosoftNETCoreDotNetAppHostPackageVersion>2.1.0-preview3-26331-01</RuntimeLinuxX64MicrosoftNETCoreDotNetAppHostPackageVersion>
|
||||
<RuntimeLinuxX64MicrosoftNETCoreDotNetHostPackageVersion>2.1.0-preview3-26331-01</RuntimeLinuxX64MicrosoftNETCoreDotNetHostPackageVersion>
|
||||
<RuntimeLinuxX64MicrosoftNETCoreDotNetHostPolicyPackageVersion>2.1.0-preview3-26331-01</RuntimeLinuxX64MicrosoftNETCoreDotNetHostPolicyPackageVersion>
|
||||
<RuntimeLinuxX64MicrosoftNETCoreDotNetHostResolverPackageVersion>2.1.0-preview3-26331-01</RuntimeLinuxX64MicrosoftNETCoreDotNetHostResolverPackageVersion>
|
||||
<RuntimeOsxX64MicrosoftNETCoreAppPackageVersion>2.1.0-preview3-26331-01</RuntimeOsxX64MicrosoftNETCoreAppPackageVersion>
|
||||
<RuntimeOsxX64MicrosoftNETCoreDotNetAppHostPackageVersion>2.1.0-preview3-26331-01</RuntimeOsxX64MicrosoftNETCoreDotNetAppHostPackageVersion>
|
||||
<RuntimeOsxX64MicrosoftNETCoreDotNetHostPackageVersion>2.1.0-preview3-26331-01</RuntimeOsxX64MicrosoftNETCoreDotNetHostPackageVersion>
|
||||
<RuntimeOsxX64MicrosoftNETCoreDotNetHostPolicyPackageVersion>2.1.0-preview3-26331-01</RuntimeOsxX64MicrosoftNETCoreDotNetHostPolicyPackageVersion>
|
||||
<RuntimeOsxX64MicrosoftNETCoreDotNetHostResolverPackageVersion>2.1.0-preview3-26331-01</RuntimeOsxX64MicrosoftNETCoreDotNetHostResolverPackageVersion>
|
||||
<RuntimeWinX64MicrosoftNETCoreAppPackageVersion>2.1.0-preview3-26331-01</RuntimeWinX64MicrosoftNETCoreAppPackageVersion>
|
||||
<RuntimeWinX64MicrosoftNETCoreDotNetAppHostPackageVersion>2.1.0-preview3-26331-01</RuntimeWinX64MicrosoftNETCoreDotNetAppHostPackageVersion>
|
||||
<RuntimeWinX64MicrosoftNETCoreDotNetHostPackageVersion>2.1.0-preview3-26331-01</RuntimeWinX64MicrosoftNETCoreDotNetHostPackageVersion>
|
||||
<RuntimeWinX64MicrosoftNETCoreDotNetHostPolicyPackageVersion>2.1.0-preview3-26331-01</RuntimeWinX64MicrosoftNETCoreDotNetHostPolicyPackageVersion>
|
||||
<RuntimeWinX64MicrosoftNETCoreDotNetHostResolverPackageVersion>2.1.0-preview3-26331-01</RuntimeWinX64MicrosoftNETCoreDotNetHostResolverPackageVersion>
|
||||
<RuntimeWinX86MicrosoftNETCoreAppPackageVersion>2.1.0-preview3-26331-01</RuntimeWinX86MicrosoftNETCoreAppPackageVersion>
|
||||
<RuntimeWinX86MicrosoftNETCoreDotNetAppHostPackageVersion>2.1.0-preview3-26331-01</RuntimeWinX86MicrosoftNETCoreDotNetAppHostPackageVersion>
|
||||
<RuntimeWinX86MicrosoftNETCoreDotNetHostPackageVersion>2.1.0-preview3-26331-01</RuntimeWinX86MicrosoftNETCoreDotNetHostPackageVersion>
|
||||
<RuntimeWinX86MicrosoftNETCoreDotNetHostPolicyPackageVersion>2.1.0-preview3-26331-01</RuntimeWinX86MicrosoftNETCoreDotNetHostPolicyPackageVersion>
|
||||
<RuntimeWinX86MicrosoftNETCoreDotNetHostResolverPackageVersion>2.1.0-preview3-26331-01</RuntimeWinX86MicrosoftNETCoreDotNetHostResolverPackageVersion>
|
||||
<SystemBuffersPackageVersion>4.5.0-preview3-26331-02</SystemBuffersPackageVersion>
|
||||
<SystemCodeDomPackageVersion>4.5.0-preview3-26331-02</SystemCodeDomPackageVersion>
|
||||
<SystemCollectionsImmutablePackageVersion>1.5.0-preview3-26331-02</SystemCollectionsImmutablePackageVersion>
|
||||
<SystemComponentModelAnnotationsPackageVersion>4.5.0-preview3-26331-02</SystemComponentModelAnnotationsPackageVersion>
|
||||
<SystemCompositionAttributedModelPackageVersion>1.2.0-preview3-26331-02</SystemCompositionAttributedModelPackageVersion>
|
||||
<SystemCompositionConventionPackageVersion>1.2.0-preview3-26331-02</SystemCompositionConventionPackageVersion>
|
||||
<SystemCompositionHostingPackageVersion>1.2.0-preview3-26331-02</SystemCompositionHostingPackageVersion>
|
||||
<SystemCompositionPackageVersion>1.2.0-preview3-26331-02</SystemCompositionPackageVersion>
|
||||
<SystemCompositionRuntimePackageVersion>1.2.0-preview3-26331-02</SystemCompositionRuntimePackageVersion>
|
||||
<SystemCompositionTypedPartsPackageVersion>1.2.0-preview3-26331-02</SystemCompositionTypedPartsPackageVersion>
|
||||
<SystemConfigurationConfigurationManagerPackageVersion>4.5.0-preview3-26331-02</SystemConfigurationConfigurationManagerPackageVersion>
|
||||
<SystemDataSqlClientPackageVersion>4.5.0-preview3-26331-02</SystemDataSqlClientPackageVersion>
|
||||
<SystemDiagnosticsDiagnosticSourcePackageVersion>4.5.0-preview3-26331-02</SystemDiagnosticsDiagnosticSourcePackageVersion>
|
||||
<SystemDiagnosticsEventLogPackageVersion>4.5.0-preview3-26331-02</SystemDiagnosticsEventLogPackageVersion>
|
||||
<SystemIOFileSystemAccessControlPackageVersion>4.5.0-preview3-26331-02</SystemIOFileSystemAccessControlPackageVersion>
|
||||
<SystemIOPackagingPackageVersion>4.5.0-preview3-26331-02</SystemIOPackagingPackageVersion>
|
||||
<SystemIOPipesAccessControlPackageVersion>4.5.0-preview3-26331-02</SystemIOPipesAccessControlPackageVersion>
|
||||
<SystemIOPipelinesPackageVersion>4.5.0-preview3-26331-02</SystemIOPipelinesPackageVersion>
|
||||
<SystemIOPortsPackageVersion>4.5.0-preview3-26331-02</SystemIOPortsPackageVersion>
|
||||
<SystemJsonPackageVersion>4.5.0-preview3-26331-02</SystemJsonPackageVersion>
|
||||
<SystemMemoryPackageVersion>4.5.0-preview3-26331-02</SystemMemoryPackageVersion>
|
||||
<SystemNetHttpWinHttpHandlerPackageVersion>4.5.0-preview3-26331-02</SystemNetHttpWinHttpHandlerPackageVersion>
|
||||
<SystemNetWebSocketsWebSocketProtocolPackageVersion>4.5.0-preview3-26331-02</SystemNetWebSocketsWebSocketProtocolPackageVersion>
|
||||
<SystemNumericsVectorsPackageVersion>4.5.0-preview3-26331-02</SystemNumericsVectorsPackageVersion>
|
||||
<SystemReflectionDispatchProxyPackageVersion>4.5.0-preview3-26331-02</SystemReflectionDispatchProxyPackageVersion>
|
||||
<SystemReflectionMetadataPackageVersion>1.6.0-preview3-26331-02</SystemReflectionMetadataPackageVersion>
|
||||
<SystemReflectionTypeExtensionsPackageVersion>4.5.0-preview3-26331-02</SystemReflectionTypeExtensionsPackageVersion>
|
||||
<SystemRuntimeCompilerServicesUnsafePackageVersion>4.5.0-preview3-26331-02</SystemRuntimeCompilerServicesUnsafePackageVersion>
|
||||
<SystemSecurityAccessControlPackageVersion>4.5.0-preview3-26331-02</SystemSecurityAccessControlPackageVersion>
|
||||
<SystemSecurityCryptographyCngPackageVersion>4.5.0-preview3-26331-02</SystemSecurityCryptographyCngPackageVersion>
|
||||
<SystemSecurityCryptographyPkcsPackageVersion>4.5.0-preview3-26331-02</SystemSecurityCryptographyPkcsPackageVersion>
|
||||
<SystemSecurityCryptographyProtectedDataPackageVersion>4.5.0-preview3-26331-02</SystemSecurityCryptographyProtectedDataPackageVersion>
|
||||
<SystemSecurityCryptographyXmlPackageVersion>4.5.0-preview3-26331-02</SystemSecurityCryptographyXmlPackageVersion>
|
||||
<SystemSecurityPermissionsPackageVersion>4.5.0-preview3-26331-02</SystemSecurityPermissionsPackageVersion>
|
||||
<SystemSecurityPrincipalWindowsPackageVersion>4.5.0-preview3-26331-02</SystemSecurityPrincipalWindowsPackageVersion>
|
||||
<SystemServiceProcessServiceControllerPackageVersion>4.5.0-preview3-26331-02</SystemServiceProcessServiceControllerPackageVersion>
|
||||
<SystemTextEncodingCodePagesPackageVersion>4.5.0-preview3-26331-02</SystemTextEncodingCodePagesPackageVersion>
|
||||
<SystemTextEncodingsWebPackageVersion>4.5.0-preview3-26331-02</SystemTextEncodingsWebPackageVersion>
|
||||
<SystemThreadingAccessControlPackageVersion>4.5.0-preview3-26331-02</SystemThreadingAccessControlPackageVersion>
|
||||
<SystemThreadingChannelsPackageVersion>4.5.0-preview3-26331-02</SystemThreadingChannelsPackageVersion>
|
||||
<SystemThreadingTasksDataflowPackageVersion>4.9.0-preview3-26331-02</SystemThreadingTasksDataflowPackageVersion>
|
||||
<SystemThreadingTasksExtensionsPackageVersion>4.5.0-preview3-26331-02</SystemThreadingTasksExtensionsPackageVersion>
|
||||
<SystemValueTuplePackageVersion>4.5.0-preview3-26331-02</SystemValueTuplePackageVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Project="$(DotNetPackageVersionPropsPath)" Condition="'$(DotNetPackageVersionPropsPath)' != ''" />
|
||||
|
|
|
|||
|
|
@ -7,6 +7,9 @@
|
|||
<Import Project="SharedFxInstaller.targets" />
|
||||
<Import Project="Publish.targets" />
|
||||
|
||||
<!-- Workaround for #1014 -->
|
||||
<Import Project="buildorder.props" Condition="$([MSBuild]::IsOSUnixLike())" />
|
||||
|
||||
<PropertyGroup>
|
||||
<GeneratedPackageVersionPropsPath>$(IntermediateDir)dependencies.g.props</GeneratedPackageVersionPropsPath>
|
||||
<GeneratedRestoreSourcesPropsPath>$(IntermediateDir)sources.g.props</GeneratedRestoreSourcesPropsPath>
|
||||
|
|
@ -154,7 +157,8 @@
|
|||
<Error Text="Undeclared package artifacts. Add these to artifacts.props:%0A - @(_UndeclaredPackageArtifact, '%0A - ')"
|
||||
Condition=" @(_UndeclaredPackageArtifact->Count()) != 0 " />
|
||||
|
||||
<RepoTasks.AnalyzeBuildGraph
|
||||
<!-- Skipped to workaround #1014. The order is hardcoded in buildorder.props -->
|
||||
<RepoTasks.AnalyzeBuildGraph Condition=" ! $([MSBuild]::IsOSUnixLike())"
|
||||
Solutions="@(Solution)"
|
||||
Artifacts="@(ArtifactInfo)"
|
||||
Dependencies="@(ExternalDependency)"
|
||||
|
|
@ -162,6 +166,9 @@
|
|||
Properties="Configuration=$(Configuration);BuildNumber=$(BuildNumber);DotNetPackageVersionPropsPath=$(GeneratedPackageVersionPropsPath);DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcesPropsPath)">
|
||||
<Output TaskParameter="RepositoryBuildOrder" ItemName="RepositoryBuildOrder" />
|
||||
</RepoTasks.AnalyzeBuildGraph>
|
||||
|
||||
<Message Text="Repository build order:" Importance="high" />
|
||||
<Message Text="%(RepositoryBuildOrder.Order). @(RepositoryBuildOrder, ', ')" Importance="high" />
|
||||
</Target>
|
||||
|
||||
<Target Name="VerifyPackageArtifactConfig">
|
||||
|
|
|
|||
|
|
@ -247,13 +247,6 @@ namespace RepoTasks
|
|||
repositoriesWithOrder.Add((repositoryTaskItem, order));
|
||||
}
|
||||
|
||||
Log.LogMessage(MessageImportance.High, "Repository build order:");
|
||||
foreach (var buildGroup in repositoriesWithOrder.GroupBy(r => r.order).OrderBy(g => g.Key))
|
||||
{
|
||||
var buildGroupRepos = buildGroup.Select(b => b.repository.ItemSpec);
|
||||
Log.LogMessage(MessageImportance.High, $"{buildGroup.Key.ToString().PadLeft(2, ' ')}: {string.Join(", ", buildGroupRepos)}");
|
||||
}
|
||||
|
||||
return repositoriesWithOrder
|
||||
.OrderBy(r => r.order)
|
||||
.Select(r => r.repository)
|
||||
|
|
|
|||
Loading…
Reference in New Issue