Skip to content

Commit 11a8ba5

Browse files
dotnet-maestro-botmsftbot[bot]
dotnet-maestro-bot
authored and
msftbot[bot]
committed
[automated] Merge branch 'release/3.1' => 'master' (#1846)
* Update dependencies from https://github.com/dotnet/arcade build 20190905.21 (#1794) - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19455.21 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19455.21 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19455.21 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19455.21 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19455.21 * Fixing removal of None from Page under certain conditions (#1790) (#1796) * Fixing removal of None from Page under certain conditions (EnableDefaultApplicationDefinition or EnableDefaultPageItems is false). Further adding a fix to ensure this doesn't result in ApplicationDefinition being included in Page as well when EnableDefaultApplicationDefinition is false. * Fixing removal of ApplicationDefinition from Page to be unconditional. * Removing extraneous ApplicationDefinition * Clarifying comments * Update dependencies from https://github.com/dotnet/winforms build 20190906.5 (#1801) - Microsoft.Private.Winforms - 4.8.1-preview1.19456.5 Dependency coherency updates - Microsoft.Win32.Registry - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-rc1-19429-05 (parent: Microsoft.Private.Winforms) - System.CodeDom - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App) - System.Configuration.ConfigurationManager - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App) - System.Diagnostics.EventLog - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App) - System.DirectoryServices - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App) - System.Drawing.Common - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App) - System.Reflection.Emit - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App) - System.Reflection.MetadataLoadContext - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App) - System.Security.AccessControl - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App) - System.Security.Cryptography.Xml - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App) - System.Security.Permissions - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App) - System.Security.Principal.Windows - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App) - System.Windows.Extensions - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.Platforms - 3.0.0-rc1.19420.10 (parent: Microsoft.NETCore.App) - System.IO.Packaging - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.ILDAsm - 3.0.0-rc1.19428.6 (parent: Microsoft.NETCore.Runtime.CoreCLR) - Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-rc1.19428.6 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.ILAsm - 3.0.0-rc1.19428.6 (parent: Microsoft.NETCore.Runtime.CoreCLR) * Update dependencies from https://github.com/dotnet/arcade build 20190906.10 (#1810) - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19456.10 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19456.10 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19456.10 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19456.10 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19456.10 * Update dependencies from https://github.com/dotnet/winforms build 20190907.5 (#1812) - Microsoft.Private.Winforms - 4.8.1-preview1.19457.5 * Update dependencies from https://github.com/dotnet/arcade build 20190907.1 (#1815) - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19457.1 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19457.1 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19457.1 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19457.1 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19457.1 * Update dependencies from https://github.com/dotnet/winforms build 20190908.4 (#1816) - Microsoft.Private.Winforms - 4.8.1-preview1.19458.4 * Update dependencies from https://github.com/dotnet/arcade build 20190908.2 (#1821) - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19458.2 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19458.2 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19458.2 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19458.2 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19458.2 * Update dependencies from https://github.com/dotnet/winforms build 20190909.6 (#1822) - Microsoft.Private.Winforms - 4.8.1-preview1.19459.6 * Update dependencies from https://github.com/dotnet/arcade build 20190909.10 (#1828) - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19459.10 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19459.10 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19459.10 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19459.10 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19459.10 * Update dependencies from https://github.com/dotnet/winforms build 20190910.5 (#1830) - Microsoft.Private.Winforms - 4.8.1-preview1.19460.5 * Update dependencies from https://github.com/dotnet/arcade build 20190910.3 (#1843) - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19460.3 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19460.3 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19460.3 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19460.3 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19460.3 * Update dependencies from https://github.com/dotnet/winforms build 20190911.5 (#1847) - Microsoft.Private.Winforms - 4.8.1-preview1.19461.5 * Update dependencies from https://github.com/dotnet/winforms build 20190911.6 (#1848) - Microsoft.Private.Winforms - 5.0.0-alpha1.19461.6 Dependency coherency updates - Microsoft.NETCore.App - 5.0.0-alpha1.19461.4 (parent: Microsoft.Private.Winforms) * Update dependencies from https://github.com/dotnet/winforms build 20190911.7 (#1850) - Microsoft.Private.Winforms - 5.0.0-alpha1.19461.7 * Update dependencies from https://github.com/dotnet/winforms build 20190911.9 (#1851) - Microsoft.Private.Winforms - 5.0.0-alpha1.19461.9 Dependency coherency updates - Microsoft.NETCore.App - 5.0.0-alpha1.19461.8 (parent: Microsoft.Private.Winforms) * Update dependencies from https://github.com/dotnet/winforms build 20190911.11 (#1853) - Microsoft.Private.Winforms - 5.0.0-alpha1.19461.11 Dependency coherency updates - Microsoft.NETCore.App - 5.0.0-alpha1.19461.9 (parent: Microsoft.Private.Winforms) * Update project TargetFramework(s) to netcoreapp3.1 and set TargetFrameworkVersion=v3.1 * Add constant for 3.1 * Update netcore version specific conditions * Add System.Resources.Extensions references to PresentationUI * Make projecttemplates and ArchNeutral use 3.1 versionprefix * Update project templates for netcoreapp3.1 * Update global.json tools.dotnet with SDK with netcoreapp3.1 support * Include "ResolveTargetingPackAssets" in AfterTargets; Remove unused Targets * Update dependencies from ".NET Tools - Latest" channel darc update-dependencies --channel ".NET Tools - Latest" * darc update-dependencies --channel ".NET Core 3.1 Dev" * Update dependencies from https://github.com/dotnet/winforms build 20190911.16 (#1855) - Microsoft.Private.Winforms - 5.0.0-alpha1.19461.16 Dependency coherency updates - Microsoft.NETCore.App - 5.0.0-alpha1.19461.17 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILDAsm - 5.0.0-alpha1.19461.1 (parent: Microsoft.NETCore.Runtime.CoreCLR) - Microsoft.NETCore.Runtime.CoreCLR - 5.0.0-alpha1.19461.1 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.ILAsm - 5.0.0-alpha1.19461.1 (parent: Microsoft.NETCore.Runtime.CoreCLR) * Workaround for dotnet/installer#4744 .NET Core 3.1 SDK hasn't consumed the fix for NuGet/Home#8467 yet. Suppress these warnings temporarily * No not overwrite NoWarn - append to it * Update dependencies from https://github.com/dotnet/winforms build 20190911.18 (#1857) - Microsoft.Private.Winforms - 5.0.0-alpha1.19461.18 Dependency coherency updates - Microsoft.Win32.Registry - 5.0.0-alpha1.19461.5 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 5.0.0-alpha1.19461.26 (parent: Microsoft.Private.Winforms) - System.CodeDom - 5.0.0-alpha1.19461.5 (parent: Microsoft.NETCore.App) - System.Configuration.ConfigurationManager - 5.0.0-alpha1.19461.5 (parent: Microsoft.NETCore.App) - System.Diagnostics.EventLog - 5.0.0-alpha1.19461.5 (parent: Microsoft.NETCore.App) - System.DirectoryServices - 5.0.0-alpha1.19461.5 (parent: Microsoft.NETCore.App) - System.Drawing.Common - 5.0.0-alpha1.19461.5 (parent: Microsoft.NETCore.App) - System.Reflection.Emit - 5.0.0-alpha1.19461.5 (parent: Microsoft.NETCore.App) - System.Reflection.MetadataLoadContext - 5.0.0-alpha1.19461.5 (parent: Microsoft.NETCore.App) - System.Security.AccessControl - 5.0.0-alpha1.19461.5 (parent: Microsoft.NETCore.App) - System.Security.Cryptography.Xml - 5.0.0-alpha1.19461.5 (parent: Microsoft.NETCore.App) - System.Security.Permissions - 5.0.0-alpha1.19461.5 (parent: Microsoft.NETCore.App) - System.Security.Principal.Windows - 5.0.0-alpha1.19461.5 (parent: Microsoft.NETCore.App) - System.Windows.Extensions - 5.0.0-alpha1.19461.5 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.Platforms - 5.0.0-alpha1.19461.5 (parent: Microsoft.NETCore.App) - System.IO.Packaging - 5.0.0-alpha1.19461.5 (parent: Microsoft.NETCore.App) - System.Resources.Extensions - 5.0.0-alpha1.19461.5 (parent: Microsoft.NETCore.App) * Update dependencies from https://github.com/dotnet/winforms build 20190911.19 (#1858) - Microsoft.Private.Winforms - 5.0.0-alpha1.19461.19 Dependency coherency updates - Microsoft.Win32.Registry - 5.0.0-alpha1.19461.8 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 5.0.0-alpha1.19461.33 (parent: Microsoft.Private.Winforms) - System.CodeDom - 5.0.0-alpha1.19461.8 (parent: Microsoft.NETCore.App) - System.Configuration.ConfigurationManager - 5.0.0-alpha1.19461.8 (parent: Microsoft.NETCore.App) - System.Diagnostics.EventLog - 5.0.0-alpha1.19461.8 (parent: Microsoft.NETCore.App) - System.DirectoryServices - 5.0.0-alpha1.19461.8 (parent: Microsoft.NETCore.App) - System.Drawing.Common - 5.0.0-alpha1.19461.8 (parent: Microsoft.NETCore.App) - System.Reflection.Emit - 5.0.0-alpha1.19461.8 (parent: Microsoft.NETCore.App) - System.Reflection.MetadataLoadContext - 5.0.0-alpha1.19461.8 (parent: Microsoft.NETCore.App) - System.Security.AccessControl - 5.0.0-alpha1.19461.8 (parent: Microsoft.NETCore.App) - System.Security.Cryptography.Xml - 5.0.0-alpha1.19461.8 (parent: Microsoft.NETCore.App) - System.Security.Permissions - 5.0.0-alpha1.19461.8 (parent: Microsoft.NETCore.App) - System.Security.Principal.Windows - 5.0.0-alpha1.19461.8 (parent: Microsoft.NETCore.App) - System.Windows.Extensions - 5.0.0-alpha1.19461.8 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.Platforms - 5.0.0-alpha1.19461.8 (parent: Microsoft.NETCore.App) - System.IO.Packaging - 5.0.0-alpha1.19461.8 (parent: Microsoft.NETCore.App) - System.Resources.Extensions - 5.0.0-alpha1.19461.8 (parent: Microsoft.NETCore.App) * Update dependencies from https://github.com/dotnet/winforms build 20190911.20 (#1859) - Microsoft.Private.Winforms - 5.0.0-alpha1.19461.20 Dependency coherency updates - Microsoft.Win32.Registry - 5.0.0-alpha1.19461.10 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 5.0.0-alpha1.19461.40 (parent: Microsoft.Private.Winforms) - System.CodeDom - 5.0.0-alpha1.19461.10 (parent: Microsoft.NETCore.App) - System.Configuration.ConfigurationManager - 5.0.0-alpha1.19461.10 (parent: Microsoft.NETCore.App) - System.Diagnostics.EventLog - 5.0.0-alpha1.19461.10 (parent: Microsoft.NETCore.App) - System.DirectoryServices - 5.0.0-alpha1.19461.10 (parent: Microsoft.NETCore.App) - System.Drawing.Common - 5.0.0-alpha1.19461.10 (parent: Microsoft.NETCore.App) - System.Reflection.Emit - 5.0.0-alpha1.19461.10 (parent: Microsoft.NETCore.App) - System.Reflection.MetadataLoadContext - 5.0.0-alpha1.19461.10 (parent: Microsoft.NETCore.App) - System.Security.AccessControl - 5.0.0-alpha1.19461.10 (parent: Microsoft.NETCore.App) - System.Security.Cryptography.Xml - 5.0.0-alpha1.19461.10 (parent: Microsoft.NETCore.App) - System.Security.Permissions - 5.0.0-alpha1.19461.10 (parent: Microsoft.NETCore.App) - System.Security.Principal.Windows - 5.0.0-alpha1.19461.10 (parent: Microsoft.NETCore.App) - System.Windows.Extensions - 5.0.0-alpha1.19461.10 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.Platforms - 5.0.0-alpha1.19461.10 (parent: Microsoft.NETCore.App) - System.IO.Packaging - 5.0.0-alpha1.19461.10 (parent: Microsoft.NETCore.App) - System.Resources.Extensions - 5.0.0-alpha1.19461.10 (parent: Microsoft.NETCore.App) * Update dependencies from https://github.com/dotnet/winforms build 20190912.1 (#1861) - Microsoft.Private.Winforms - 5.0.0-alpha1.19462.1 Dependency coherency updates - Microsoft.NETCore.App - 5.0.0-alpha1.19461.47 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILDAsm - 5.0.0-alpha1.19461.7 (parent: Microsoft.NETCore.Runtime.CoreCLR) - Microsoft.NETCore.Runtime.CoreCLR - 5.0.0-alpha1.19461.7 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.ILAsm - 5.0.0-alpha1.19461.7 (parent: Microsoft.NETCore.Runtime.CoreCLR) * Update dependencies from https://github.com/dotnet/winforms build 20190912.2 (#1862) - Microsoft.Private.Winforms - 5.0.0-alpha1.19462.2 * Update dependencies from https://github.com/dotnet/winforms build 20190912.3 (#1863) - Microsoft.Private.Winforms - 5.0.0-alpha1.19462.3 * Update dependencies from https://github.com/dotnet/arcade build 20190911.7 - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19461.7 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19461.7 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19461.7 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19461.7 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19461.7 * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20190912.4 (#1866) - Microsoft.DotNet.Wpf.DncEng - 5.0.0-alpha1.19462.4 * [master] Update dependencies from dotnet/winforms (#1870) * Update dependencies from https://github.com/dotnet/winforms build 20190912.5 - Microsoft.Private.Winforms - 5.0.0-alpha1.19462.5 * Update dependencies from https://github.com/dotnet/winforms build 20190912.4 - Microsoft.Private.Winforms - 5.0.0-alpha1.19462.4 * Update dependencies from https://github.com/dotnet/winforms build 20190912.6 (#1871) - Microsoft.Private.Winforms - 5.0.0-alpha1.19462.6 * Update dependencies from https://github.com/dotnet/winforms build 20190912.8 (#1872) - Microsoft.Private.Winforms - 4.8.1-preview1.19462.8 * Update dependencies from https://github.com/dotnet/winforms build 20190912.9 (#1876) - Microsoft.Private.Winforms - 5.0.0-alpha1.19462.9 Dependency coherency updates - Microsoft.NETCore.App - 5.0.0-alpha1.19462.1 (parent: Microsoft.Private.Winforms) * Update dependencies from https://github.com/dotnet/winforms build 20190912.11 (#1877) - Microsoft.Private.Winforms - 5.0.0-alpha1.19462.11 Dependency coherency updates - Microsoft.NETCore.App - 5.0.0-alpha1.19462.5 (parent: Microsoft.Private.Winforms) * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20190911.39 (#1869) - Microsoft.DotNet.Wpf.DncEng - 4.8.1-preview1.19461.39 * darc update-dependencies --channel ".NET Tools - Latest"
1 parent e0acd67 commit 11a8ba5

16 files changed

+143
-213
lines changed

‎eng/Version.Details.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,13 @@
6363
<Uri>https://github.com/dotnet/core-setup</Uri>
6464
<Sha>2718e02209b325d3d188cb529c85a9fba94557d9</Sha>
6565
</Dependency>
66-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19456.6">
66+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19461.7">
6767
<Uri>https://github.com/dotnet/arcade</Uri>
68-
<Sha>a132fe849ecfe85b067a9329df9bd4f8b87a499f</Sha>
68+
<Sha>8eb29ba860a3cfcfe68f9a8256caa7efc1f1aaba</Sha>
6969
</Dependency>
70-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.19456.6">
70+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.19461.7">
7171
<Uri>https://github.com/dotnet/arcade</Uri>
72-
<Sha>a132fe849ecfe85b067a9329df9bd4f8b87a499f</Sha>
72+
<Sha>8eb29ba860a3cfcfe68f9a8256caa7efc1f1aaba</Sha>
7373
</Dependency>
7474
<Dependency Name="Microsoft.NETCore.Platforms" Version="5.0.0-alpha1.19461.10" CoherentParentDependency="Microsoft.NETCore.App">
7575
<Uri>https://github.com/dotnet/corefx</Uri>
@@ -95,17 +95,17 @@
9595
<Uri>https://github.com/dotnet/coreclr</Uri>
9696
<Sha>17a53cb063b5e63fc1cc832ec36cf8a520111124</Sha>
9797
</Dependency>
98-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19456.6">
98+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19461.7">
9999
<Uri>https://github.com/dotnet/arcade</Uri>
100-
<Sha>a132fe849ecfe85b067a9329df9bd4f8b87a499f</Sha>
100+
<Sha>8eb29ba860a3cfcfe68f9a8256caa7efc1f1aaba</Sha>
101101
</Dependency>
102-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="1.0.0-beta.19456.6">
102+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="1.0.0-beta.19461.7">
103103
<Uri>https://github.com/dotnet/arcade</Uri>
104-
<Sha>a132fe849ecfe85b067a9329df9bd4f8b87a499f</Sha>
104+
<Sha>8eb29ba860a3cfcfe68f9a8256caa7efc1f1aaba</Sha>
105105
</Dependency>
106-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19456.6">
106+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19461.7">
107107
<Uri>https://github.com/dotnet/arcade</Uri>
108-
<Sha>a132fe849ecfe85b067a9329df9bd4f8b87a499f</Sha>
108+
<Sha>8eb29ba860a3cfcfe68f9a8256caa7efc1f1aaba</Sha>
109109
</Dependency>
110110
<Dependency Name="System.Resources.Extensions" Version="5.0.0-alpha1.19461.10" CoherentParentDependency="Microsoft.NETCore.App">
111111
<Uri>https://github.com/dotnet/corefx</Uri>

‎eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@
4040
</PropertyGroup>
4141
<!-- Packages that come from https://github.com/dotnet/arcade -->
4242
<PropertyGroup>
43-
<MicrosoftDotNetApiCompatVersion>1.0.0-beta.19456.6</MicrosoftDotNetApiCompatVersion>
44-
<MicrosoftDotNetCodeAnalysisPackageVersion>1.0.0-beta.19456.6</MicrosoftDotNetCodeAnalysisPackageVersion>
45-
<MicrosoftDotNetGenAPIVersion>1.0.0-beta.19456.6</MicrosoftDotNetGenAPIVersion>
43+
<MicrosoftDotNetApiCompatVersion>1.0.0-beta.19461.7</MicrosoftDotNetApiCompatVersion>
44+
<MicrosoftDotNetCodeAnalysisPackageVersion>1.0.0-beta.19461.7</MicrosoftDotNetCodeAnalysisPackageVersion>
45+
<MicrosoftDotNetGenAPIVersion>1.0.0-beta.19461.7</MicrosoftDotNetGenAPIVersion>
4646
</PropertyGroup>
4747
<!-- Packages that come from https://github.com/dotnet/corefxlab -->
4848
<PropertyGroup>

‎eng/WpfArcadeSdk/Sdk/Sdk.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@
7070
<NoWarn Condition="'$(BuildingInsideVisualStudio)'=='true'">$(NoWarn);NU1605</NoWarn>
7171

7272
<!--
73+
7374
Support for suppressing warnings by supplying /p:AdditionalNoWarn=0123;4567 from
7475
dotnet.exe/msbuild commandline.
7576

‎eng/common/performance/performance-setup.sh

100644100755
File mode changed.

‎eng/common/templates/post-build/channels/netcore-dev-30.yml

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -97,14 +97,8 @@ stages:
9797
/p:IsInternalBuild=$(IsInternalBuild)
9898
/p:RepositoryName=$(Build.Repository.Name)
9999
/p:CommitSha=$(Build.SourceVersion)
100-
/p:StaticInternalFeed=$(StaticInternalFeed)
101-
/p:InternalChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl)
102-
/p:InternalChecksumsTargetStaticFeedKey=$(InternalChecksumsBlobFeedKey)
103-
/p:InternalInstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl)
104-
/p:InternalInstallersTargetStaticFeedKey=$(InternalInstallersBlobFeedKey)
105100
/p:NugetPath=$(NuGetExeToolPath)
106101
/p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)'
107-
/p:TargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)'
108102
/p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)'
109103
/p:BARBuildId=$(BARBuildId)
110104
/p:MaestroApiEndpoint='$(MaestroApiEndPoint)'
@@ -118,16 +112,15 @@ stages:
118112
/p:InstallersAzureAccountKey=$(dotnetcli-storage-key)
119113
/p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl)
120114
/p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key)
115+
/p:PublishToAzureDevOpsNuGetFeeds=true
116+
/p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json'
117+
/p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
118+
/p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json'
119+
/p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
120+
/p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-symbols/nuget/v3/index.json'
121+
/p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
121122
${{ parameters.artifactsPublishingAdditionalParameters }}
122123

123-
124-
- stage: NetCore_Dev30_Publish_Validation
125-
displayName: .NET Core 3.0 Dev Publish Validation
126-
variables:
127-
- template: ../common-variables.yml
128-
jobs:
129-
- template: ../setup-maestro-vars.yml
130-
131-
- template: ../promote-build.yml
132-
parameters:
133-
ChannelId: ${{ variables.PublicDevRelease_30_Channel_Id }}
124+
- template: ../../steps/promote-build.yml
125+
parameters:
126+
ChannelId: ${{ variables.PublicDevRelease_30_Channel_Id }}

‎eng/common/templates/post-build/channels/netcore-dev-31.yml

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ stages:
4646
/p:Configuration=Release
4747
${{ parameters.symbolPublishingAdditionalParameters }}
4848

49-
- job:
49+
- job: publish_assets
5050
displayName: Publish Assets
5151
dependsOn: setupMaestroVars
5252
variables:
@@ -97,14 +97,8 @@ stages:
9797
/p:IsInternalBuild=$(IsInternalBuild)
9898
/p:RepositoryName=$(Build.Repository.Name)
9999
/p:CommitSha=$(Build.SourceVersion)
100-
/p:StaticInternalFeed=$(StaticInternalFeed)
101-
/p:InternalChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl)
102-
/p:InternalChecksumsTargetStaticFeedKey=$(InternalChecksumsBlobFeedKey)
103-
/p:InternalInstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl)
104-
/p:InternalInstallersTargetStaticFeedKey=$(InternalInstallersBlobFeedKey)
105100
/p:NugetPath=$(NuGetExeToolPath)
106101
/p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)'
107-
/p:TargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)'
108102
/p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)'
109103
/p:BARBuildId=$(BARBuildId)
110104
/p:MaestroApiEndpoint='$(MaestroApiEndPoint)'
@@ -118,16 +112,15 @@ stages:
118112
/p:InstallersAzureAccountKey=$(dotnetcli-storage-key)
119113
/p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl)
120114
/p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key)
115+
/p:PublishToAzureDevOpsNuGetFeeds=true
116+
/p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json'
117+
/p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
118+
/p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json'
119+
/p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
120+
/p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json'
121+
/p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
121122
${{ parameters.artifactsPublishingAdditionalParameters }}
122123

123-
124-
- stage: NetCore_Dev31_Publish_Validation
125-
displayName: .NET Core 3.1 Dev Publish Validation
126-
variables:
127-
- template: ../common-variables.yml
128-
jobs:
129-
- template: ../setup-maestro-vars.yml
130-
131-
- template: ../promote-build.yml
132-
parameters:
133-
ChannelId: ${{ variables.PublicDevRelease_31_Channel_Id }}
124+
- template: ../../steps/promote-build.yml
125+
parameters:
126+
ChannelId: ${{ variables.PublicDevRelease_31_Channel_Id }}

‎eng/common/templates/post-build/channels/netcore-dev-5.yml

Lines changed: 15 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ parameters:
22
symbolPublishingAdditionalParameters: ''
33
artifactsPublishingAdditionalParameters: ''
44
publishInstallersAndChecksums: false
5-
publishToAzureDevOpsFeeds: true
65

76
stages:
87
- stage: NetCore_Dev5_Publish
@@ -92,48 +91,36 @@ stages:
9291
AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw)
9392
inputs:
9493
filePath: eng\common\sdk-task.ps1
95-
arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet
94+
arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet
9695
/p:ArtifactsCategory=$(_DotNetArtifactsCategory)
9796
/p:IsStableBuild=$(IsStableBuild)
9897
/p:IsInternalBuild=$(IsInternalBuild)
9998
/p:RepositoryName=$(Build.Repository.Name)
10099
/p:CommitSha=$(Build.SourceVersion)
101-
/p:StaticInternalFeed=$(StaticInternalFeed)
102-
/p:InternalChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl)
103-
/p:InternalChecksumsTargetStaticFeedKey=$(InternalChecksumsBlobFeedKey)
104-
/p:InternalInstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl)
105-
/p:InternalInstallersTargetStaticFeedKey=$(InternalInstallersBlobFeedKey)
106100
/p:NugetPath=$(NuGetExeToolPath)
107-
/p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)'
108-
/p:TargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)'
109-
/p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)'
110-
/p:BARBuildId=$(BARBuildId)
111-
/p:MaestroApiEndpoint='$(MaestroApiEndPoint)'
112-
/p:BuildAssetRegistryToken='$(MaestroApiAccessToken)'
113-
/p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/'
114-
/p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
115-
/p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/'
101+
/p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)'
102+
/p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)'
103+
/p:BARBuildId=$(BARBuildId)
104+
/p:MaestroApiEndpoint='$(MaestroApiEndPoint)'
105+
/p:BuildAssetRegistryToken='$(MaestroApiAccessToken)'
106+
/p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/'
107+
/p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
108+
/p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/'
116109
/p:Configuration=Release
117110
/p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }}
118111
/p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl)
119112
/p:InstallersAzureAccountKey=$(dotnetcli-storage-key)
120113
/p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl)
121114
/p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key)
122-
/p:PublishToAzureDevOpsNuGetFeeds=${{ parameters.publishToAzureDevOpsFeeds }}
115+
/p:PublishToAzureDevOpsNuGetFeeds=true
123116
/p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json'
124117
/p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
125118
/p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json'
126119
/p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
120+
/p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json'
121+
/p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
127122
${{ parameters.artifactsPublishingAdditionalParameters }}
128123

129-
130-
- stage: NetCore_Dev5_Publish_Validation
131-
displayName: .NET Core 5 Dev Publish Validation
132-
variables:
133-
- template: ../common-variables.yml
134-
jobs:
135-
- template: ../setup-maestro-vars.yml
136-
137-
- template: ../promote-build.yml
138-
parameters:
139-
ChannelId: ${{ variables.NetCore_5_Dev_Channel_Id }}
124+
- template: ../../steps/promote-build.yml
125+
parameters:
126+
ChannelId: ${{ variables.NetCore_5_Dev_Channel_Id }}

‎eng/common/templates/post-build/channels/netcore-internal-30.yml

Lines changed: 24 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -90,40 +90,35 @@ stages:
9090
AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw)
9191
inputs:
9292
filePath: eng\common\sdk-task.ps1
93-
arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet
93+
arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet
9494
/p:IsStableBuild=$(IsStableBuild)
9595
/p:IsInternalBuild=$(IsInternalBuild)
9696
/p:RepositoryName=$(Build.Repository.Name)
9797
/p:CommitSha=$(Build.SourceVersion)
98-
/p:StaticInternalFeed=$(StaticInternalFeed)
99-
/p:InternalChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl)
100-
/p:InternalChecksumsTargetStaticFeedKey=$(InternalChecksumsBlobFeedKey)
101-
/p:InternalInstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl)
102-
/p:InternalInstallersTargetStaticFeedKey=$(InternalInstallersBlobFeedKey)
10398
/p:NugetPath=$(NuGetExeToolPath)
104-
/p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)'
105-
/p:TargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)'
106-
/p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)'
107-
/p:BARBuildId=$(BARBuildId)
108-
/p:MaestroApiEndpoint='$(MaestroApiEndPoint)'
109-
/p:BuildAssetRegistryToken='$(MaestroApiAccessToken)'
110-
/p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/'
111-
/p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
112-
/p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/'
113-
/p:Configuration=Release
99+
/p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)'
100+
/p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)'
101+
/p:BARBuildId=$(BARBuildId)
102+
/p:MaestroApiEndpoint='$(MaestroApiEndPoint)'
103+
/p:BuildAssetRegistryToken='$(MaestroApiAccessToken)'
104+
/p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/'
105+
/p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
106+
/p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/'
107+
/p:Configuration=Release
108+
/p:PublishInstallersAndChecksums=true
109+
/p:ChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl)
110+
/p:ChecksumsTargetStaticFeedKey=$(InternalChecksumsBlobFeedKey)
111+
/p:InstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl)
112+
/p:InstallersTargetStaticFeedKey=$(InternalInstallersBlobFeedKey)
113+
/p:PublishToAzureDevOpsNuGetFeeds=true
114+
/p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v3/index.json'
115+
/p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
116+
/p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v3/index.json'
117+
/p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
118+
/p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-symbols/nuget/v3/index.json'
119+
/p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
114120
${{ parameters.artifactsPublishingAdditionalParameters }}
115121

116-
- template: ../trigger-subscription.yml
122+
- template: ../../steps/promote-build.yml
117123
parameters:
118-
ChannelId: ${{ variables.InternalServicing_30_Channel_Id }}
119-
120-
- stage: NetCore_30_Internal_Servicing_Publish_Validation
121-
displayName: .NET Core 3.0 Internal Servicing Publish Validation
122-
variables:
123-
- template: ../common-variables.yml
124-
jobs:
125-
- template: ../setup-maestro-vars.yml
126-
127-
- template: ../promote-build.yml
128-
parameters:
129-
ChannelId: ${{ variables.InternalServicing_30_Channel_Id }}
124+
ChannelId: ${{ variables.InternalServicing_30_Channel_Id }}

0 commit comments

Comments
 (0)