Merge branch 'master' into merges/release/3.0.1xx-to-master
This commit is contained in:
Nick Guerrera
commit
28e5c54dfe
7 changed files with 57 additions and 47 deletions
|
|
@ -2,71 +2,71 @@
|
|||
<Dependencies>
|
||||
<ProductDependencies>
|
||||
<!-- Winforms / WPF -->
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App" Version="3.0.0-preview4-27607-5">
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App" Version="3.0.0-preview4-27608-30">
|
||||
<Uri>https://dev.azure.com/devdiv/DevDiv/_git/DotNet-Trusted</Uri>
|
||||
<Sha>b76aadda41b179d0eb08868dc6c97061ffd0103e</Sha>
|
||||
<Sha>0b7a3613eab5fbfa1abed891835ae389daf2bb7f</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview4-27608-11">
|
||||
<Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview5-27607-08">
|
||||
<Uri>https://github.com/dotnet/core-setup</Uri>
|
||||
<Sha>63787f307be73c00d5c8830896be0e82a944227d</Sha>
|
||||
<Sha>1cdd7e42898c0da50beb6adead1de4f1e38583a6</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="3.0.0-preview4-19207-02">
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="3.0.0-preview5-19208-09">
|
||||
<Uri>https://github.com/aspnet/AspNetCore</Uri>
|
||||
<Sha>b44680762ef34c91f5fe0d411ddd8fe0b4e3d06b</Sha>
|
||||
<Sha>e4fbd598b56c5582335b427dedfb68495d1b8489</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.0.0-preview4-19207-02">
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.0.0-preview5-19208-09">
|
||||
<Uri>https://github.com/aspnet/AspNetCore</Uri>
|
||||
<Sha>b44680762ef34c91f5fe0d411ddd8fe0b4e3d06b</Sha>
|
||||
<Sha>e4fbd598b56c5582335b427dedfb68495d1b8489</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="3.0.0-preview4-19207-02">
|
||||
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="3.0.0-preview5-19208-09">
|
||||
<Uri>https://github.com/aspnet/AspNetCore</Uri>
|
||||
<Sha>b44680762ef34c91f5fe0d411ddd8fe0b4e3d06b</Sha>
|
||||
<Sha>e4fbd598b56c5582335b427dedfb68495d1b8489</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="dotnet-dev-certs" Version="3.0.0-preview4-19207-02">
|
||||
<Dependency Name="dotnet-dev-certs" Version="3.0.0-preview5-19208-09">
|
||||
<Uri>https://github.com/aspnet/AspNetCore</Uri>
|
||||
<Sha>b44680762ef34c91f5fe0d411ddd8fe0b4e3d06b</Sha>
|
||||
<Sha>e4fbd598b56c5582335b427dedfb68495d1b8489</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="dotnet-sql-cache" Version="3.0.0-preview4-19207-02">
|
||||
<Dependency Name="dotnet-sql-cache" Version="3.0.0-preview5-19208-09">
|
||||
<Uri>https://github.com/aspnet/AspNetCore</Uri>
|
||||
<Sha>b44680762ef34c91f5fe0d411ddd8fe0b4e3d06b</Sha>
|
||||
<Sha>e4fbd598b56c5582335b427dedfb68495d1b8489</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="dotnet-user-secrets" Version="3.0.0-preview4-19207-02">
|
||||
<Dependency Name="dotnet-user-secrets" Version="3.0.0-preview5-19208-09">
|
||||
<Uri>https://github.com/aspnet/AspNetCore</Uri>
|
||||
<Sha>b44680762ef34c91f5fe0d411ddd8fe0b4e3d06b</Sha>
|
||||
<Sha>e4fbd598b56c5582335b427dedfb68495d1b8489</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="dotnet-watch" Version="3.0.0-preview4-19207-02">
|
||||
<Dependency Name="dotnet-watch" Version="3.0.0-preview5-19208-09">
|
||||
<Uri>https://github.com/aspnet/AspNetCore</Uri>
|
||||
<Sha>b44680762ef34c91f5fe0d411ddd8fe0b4e3d06b</Sha>
|
||||
<Sha>e4fbd598b56c5582335b427dedfb68495d1b8489</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="1.0.2-beta5.19115.3">
|
||||
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="1.0.2-beta5.19208.3">
|
||||
<Uri>https://github.com/dotnet/templating</Uri>
|
||||
<Sha>42a212514e375a0821baab69fbac462e39590cfb</Sha>
|
||||
<Sha>704d12668d5379fd4cb8bbdee43fe557be8f77e4</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.0.100-preview4.19208.25">
|
||||
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.0.100-preview5.19209.5">
|
||||
<Uri>https://github.com/dotnet/toolset</Uri>
|
||||
<Sha>28cb3fab3350143829db8b91d8670f38848d4d1f</Sha>
|
||||
<Sha>6f9e3d80471afca56733656313845afe734e347c</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="NETStandard.Library" Version="2.1.0-prerelease.19208.5">
|
||||
<Dependency Name="NETStandard.Library" Version="2.1.0-prerelease.19209.1">
|
||||
<Uri>https://github.com/dotnet/standard</Uri>
|
||||
<Sha>8ef5ada20b5343b0cb9e7fd577341426dab76cd8</Sha>
|
||||
<Sha>17f3e55f67068d8a9f8b37e5982060c0c0df5fb4</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.0.100-preview4.19208.5">
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.0.100-preview5.19208.3">
|
||||
<Uri>https://github.com/dotnet/cli</Uri>
|
||||
<Sha>1e3947e908afd6b6cd392f9df56b62d115a0a35d</Sha>
|
||||
<Sha>8d0f2a593ec98ccc1ef2141452d7dccadc34ac40</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="4.8.0-preview4.19205.5">
|
||||
<Uri>https://github.com/dotnet/winforms</Uri>
|
||||
<Sha>a875e24eff58bcc7a1bb124a6f05792639a83536</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="3.0.0-preview4.19208.9">
|
||||
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="3.0.0-preview4.19207.4">
|
||||
<Uri>https://github.com/dotnet/wpf</Uri>
|
||||
<Sha>5d48aa52e109fa025dc8991409fcf8fd0ec7ccb2</Sha>
|
||||
<Sha>9a043ba85d4d7207a793840e8bd13f316bdea324</Sha>
|
||||
</Dependency>
|
||||
</ProductDependencies>
|
||||
<ToolsetDependencies>
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19206.5">
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19209.1">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>9d8abf998866f10bc19d97e1916ff1c0ada3fd42</Sha>
|
||||
<Sha>9d7e665ecf2606094677524ecd5af0fc39c7bb49</Sha>
|
||||
</Dependency>
|
||||
</ToolsetDependencies>
|
||||
</Dependencies>
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<MicrosoftDotnetToolsetInternalPackageVersion>3.0.100-preview4.19208.25</MicrosoftDotnetToolsetInternalPackageVersion>
|
||||
<MicrosoftDotnetToolsetInternalPackageVersion>3.0.100-preview5.19209.5</MicrosoftDotnetToolsetInternalPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/winforms -->
|
||||
|
|
@ -20,34 +20,34 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/wpf -->
|
||||
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>3.0.0-preview4.19208.9</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
|
||||
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>3.0.0-preview4.19207.4</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
|
||||
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>3.0.0-preview4-19207-02</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefPackageVersion>3.0.0-preview4-19207-02</MicrosoftAspNetCoreAppRefPackageVersion>
|
||||
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>3.0.0-preview4-19207-02</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
|
||||
<dotnetdevcertsPackageVersion>3.0.0-preview4-19207-02</dotnetdevcertsPackageVersion>
|
||||
<dotnetsqlcachePackageVersion>3.0.0-preview4-19207-02</dotnetsqlcachePackageVersion>
|
||||
<dotnetusersecretsPackageVersion>3.0.0-preview4-19207-02</dotnetusersecretsPackageVersion>
|
||||
<dotnetwatchPackageVersion>3.0.0-preview4-19207-02</dotnetwatchPackageVersion>
|
||||
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>3.0.0-preview5-19208-09</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefPackageVersion>3.0.0-preview5-19208-09</MicrosoftAspNetCoreAppRefPackageVersion>
|
||||
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>3.0.0-preview5-19208-09</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
|
||||
<dotnetdevcertsPackageVersion>3.0.0-preview5-19208-09</dotnetdevcertsPackageVersion>
|
||||
<dotnetsqlcachePackageVersion>3.0.0-preview5-19208-09</dotnetsqlcachePackageVersion>
|
||||
<dotnetusersecretsPackageVersion>3.0.0-preview5-19208-09</dotnetusersecretsPackageVersion>
|
||||
<dotnetwatchPackageVersion>3.0.0-preview5-19208-09</dotnetwatchPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/cli -->
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>3.0.100-preview4.19208.5</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>3.0.100-preview5.19208.3</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<MicrosoftNETCoreAppPackageVersion>3.0.0-preview4-27608-11</MicrosoftNETCoreAppPackageVersion>
|
||||
<MicrosoftNETCoreAppPackageVersion>3.0.0-preview5-27607-08</MicrosoftNETCoreAppPackageVersion>
|
||||
<MicrosoftNETCoreDotNetHostResolverPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreDotNetHostResolverPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<NETStandardLibraryPackageVersion>2.1.0-prerelease.19208.5</NETStandardLibraryPackageVersion>
|
||||
<NETStandardLibraryPackageVersion>2.1.0-prerelease.19209.1</NETStandardLibraryPackageVersion>
|
||||
<!-- Use a different property name here, as NETStandardLibraryPackageVersion is also set by targets in the NETStandard.Library package,
|
||||
which ends up overriding the value set here. -->
|
||||
<NETSTandardTargetingPackVersion>$(NETStandardLibraryPackageVersion)</NETSTandardTargetingPackVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<MicrosoftDotNetCommonItemTemplatesPackageVersion>1.0.2-beta5.19115.3</MicrosoftDotNetCommonItemTemplatesPackageVersion>
|
||||
<MicrosoftDotNetCommonItemTemplatesPackageVersion>1.0.2-beta5.19208.3</MicrosoftDotNetCommonItemTemplatesPackageVersion>
|
||||
<MicrosoftDotNetCommonProjectTemplates30PackageVersion>$(MicrosoftDotNetCommonItemTemplatesPackageVersion)</MicrosoftDotNetCommonProjectTemplates30PackageVersion>
|
||||
<MicrosoftDotNetTestProjectTemplates30PackageVersion>1.0.2-beta4.19155.2</MicrosoftDotNetTestProjectTemplates30PackageVersion>
|
||||
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
|
||||
|
|
@ -60,7 +60,7 @@
|
|||
<WindowsDesktopTargetingPackVersion>$(MicrosoftNETCoreAppPackageVersion)</WindowsDesktopTargetingPackVersion>
|
||||
<AspNetCoreVersion>$(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion)</AspNetCoreVersion>
|
||||
<AspNetTargetingPackVersion>$(MicrosoftAspNetCoreAppRefPackageVersion)</AspNetTargetingPackVersion>
|
||||
<MicrosoftWindowsDesktopAppPackageVersion>3.0.0-preview4-27607-5</MicrosoftWindowsDesktopAppPackageVersion>
|
||||
<MicrosoftWindowsDesktopAppPackageVersion>3.0.0-preview4-27608-30</MicrosoftWindowsDesktopAppPackageVersion>
|
||||
<MicrosoftWindowsDesktopPackageVersion>$(MicrosoftWindowsDesktopAppPackageVersion)</MicrosoftWindowsDesktopPackageVersion>
|
||||
</PropertyGroup>
|
||||
<!-- infrastructure and test only dependencies -->
|
||||
|
|
|
|||
|
|
@ -24,6 +24,14 @@
|
|||
<ItemGroup>
|
||||
<FilesToPublishToSymbolServer Include="$(PDBArtifactsDirectory)\*.pdb"/>
|
||||
<PackagesToPublishToSymbolServer Include="$(BlobBasePath)\*.symbols.nupkg"/>
|
||||
|
||||
<!--
|
||||
These packages from Arcade-Services include some native libraries that
|
||||
our current symbol uploader can't handle. Below is a workaround until
|
||||
we get issue: https://github.com/dotnet/arcade/issues/2457 sorted.
|
||||
-->
|
||||
<PackagesToPublishToSymbolServer Remove="$(BlobBasePath)\Microsoft.DotNet.Darc.*" />
|
||||
<PackagesToPublishToSymbolServer Remove="$(BlobBasePath)\Microsoft.DotNet.Maestro.Tasks.*" />
|
||||
</ItemGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ parameters:
|
|||
condition: succeeded()
|
||||
continueOnError: false
|
||||
runAsPublic: false
|
||||
publishUsingPipelines: false
|
||||
phases:
|
||||
- phase: Asset_Registry_Publish
|
||||
displayName: Publish to Build Asset Registry
|
||||
|
|
@ -36,6 +37,7 @@ phases:
|
|||
/p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests'
|
||||
/p:BuildAssetRegistryToken=$(MaestroAccessToken)
|
||||
/p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com
|
||||
/p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }}
|
||||
/p:Configuration=$(_BuildConfig)
|
||||
condition: ${{ parameters.condition }}
|
||||
continueOnError: ${{ parameters.continueOnError }}
|
||||
|
|
|
|||
|
|
@ -3,6 +3,6 @@
|
|||
"dotnet": "3.0.100-preview-009812"
|
||||
},
|
||||
"msbuild-sdks": {
|
||||
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19206.5"
|
||||
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19209.1"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<Channel>release/3.0.1xx</Channel>
|
||||
<Channel>master</Channel>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<VersionMinor>0</VersionMinor>
|
||||
<VersionSDKMinor>1</VersionSDKMinor>
|
||||
<VersionPatch>00</VersionPatch>
|
||||
<ReleaseSuffix Condition=" '$(ReleaseSuffix)' == '' ">preview4</ReleaseSuffix>
|
||||
<ReleaseSuffix Condition=" '$(ReleaseSuffix)' == '' ">preview5</ReleaseSuffix>
|
||||
</PropertyGroup>
|
||||
|
||||
<Target Name="GetCoreSdkGitCommitInfo">
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue