Skip to content

W
wpf

dotNET Platform / wpf
11 个月 前同步成功

通知 1
Star 1
Fork 0
W
wpf

体验新版 GitCode，发现更多精彩内容 >>

提交 11a8ba50 编写于 作者: D dotnet-maestro-bot 提交者： msftbot[bot]
浏览文件
操作

[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 https://github.com/dotnet/core-sdk/issues/4744
            .NET Core 3.1 SDK hasn't consumed the fix for https://github.com/NuGet/Home/issues/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"
上级 e0acd67d
隐藏空白更改
内联 并排
Showing with 143 addition and 213 deletion
eng/Version.Details.xml
浏览文件 @ 11a8ba50
......@@ -63,13 +63,13 @@
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>2718e02209b325d3d188cb529c85a9fba94557d9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19456.6">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19461.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a132fe849ecfe85b067a9329df9bd4f8b87a499f</Sha>
<Sha>8eb29ba860a3cfcfe68f9a8256caa7efc1f1aaba</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.19456.6">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.19461.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a132fe849ecfe85b067a9329df9bd4f8b87a499f</Sha>
<Sha>8eb29ba860a3cfcfe68f9a8256caa7efc1f1aaba</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="5.0.0-alpha1.19461.10" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
......@@ -95,17 +95,17 @@
<Uri>https://github.com/dotnet/coreclr</Uri>
<Sha>17a53cb063b5e63fc1cc832ec36cf8a520111124</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19456.6">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19461.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a132fe849ecfe85b067a9329df9bd4f8b87a499f</Sha>
<Sha>8eb29ba860a3cfcfe68f9a8256caa7efc1f1aaba</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="1.0.0-beta.19456.6">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="1.0.0-beta.19461.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a132fe849ecfe85b067a9329df9bd4f8b87a499f</Sha>
<Sha>8eb29ba860a3cfcfe68f9a8256caa7efc1f1aaba</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19456.6">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19461.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a132fe849ecfe85b067a9329df9bd4f8b87a499f</Sha>
<Sha>8eb29ba860a3cfcfe68f9a8256caa7efc1f1aaba</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="5.0.0-alpha1.19461.10" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
......
eng/Versions.props
浏览文件 @ 11a8ba50
......@@ -40,9 +40,9 @@
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/arcade -->
<PropertyGroup>
<MicrosoftDotNetApiCompatVersion>1.0.0-beta.19456.6</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>1.0.0-beta.19456.6</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIVersion>1.0.0-beta.19456.6</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetApiCompatVersion>1.0.0-beta.19461.7</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>1.0.0-beta.19461.7</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIVersion>1.0.0-beta.19461.7</MicrosoftDotNetGenAPIVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/corefxlab -->
<PropertyGroup>
......
eng/WpfArcadeSdk/Sdk/Sdk.props
浏览文件 @ 11a8ba50
......@@ -70,6 +70,7 @@
<NoWarn Condition="'$(BuildingInsideVisualStudio)'=='true'">$(NoWarn);NU1605</NoWarn>
<!--
Support for suppressing warnings by supplying /p:AdditionalNoWarn=0123;4567 from
dotnet.exe/msbuild commandline.
......
eng/common/performance/performance-setup.sh 100644 → 100755
浏览文件 @ 11a8ba50
文件模式从 100644 更改为 100755
eng/common/templates/post-build/channels/netcore-dev-30.yml
浏览文件 @ 11a8ba50
......@@ -97,14 +97,8 @@ stages:
/p:IsInternalBuild=$(IsInternalBuild)
/p:RepositoryName=$(Build.Repository.Name)
/p:CommitSha=$(Build.SourceVersion)
/p:StaticInternalFeed=$(StaticInternalFeed)
/p:InternalChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl)
/p:InternalChecksumsTargetStaticFeedKey=$(InternalChecksumsBlobFeedKey)
/p:InternalInstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl)
/p:InternalInstallersTargetStaticFeedKey=$(InternalInstallersBlobFeedKey)
/p:NugetPath=$(NuGetExeToolPath)
/p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)'
/p:TargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)'
/p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)'
/p:BARBuildId=$(BARBuildId)
/p:MaestroApiEndpoint='$(MaestroApiEndPoint)'
......@@ -118,16 +112,15 @@ stages:
/p:InstallersAzureAccountKey=$(dotnetcli-storage-key)
/p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl)
/p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key)
/p:PublishToAzureDevOpsNuGetFeeds=true
/p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json'
/p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
/p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json'
/p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
/p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-symbols/nuget/v3/index.json'
/p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
${{ parameters.artifactsPublishingAdditionalParameters }}
- stage: NetCore_Dev30_Publish_Validation
displayName: .NET Core 3.0 Dev Publish Validation
variables:
- template: ../common-variables.yml
jobs:
- template: ../setup-maestro-vars.yml
- template: ../promote-build.yml
parameters:
ChannelId: ${{ variables.PublicDevRelease_30_Channel_Id }}
- template: ../../steps/promote-build.yml
parameters:
ChannelId: ${{ variables.PublicDevRelease_30_Channel_Id }}
eng/common/templates/post-build/channels/netcore-dev-31.yml
浏览文件 @ 11a8ba50
......@@ -46,7 +46,7 @@ stages:
/p:Configuration=Release
${{ parameters.symbolPublishingAdditionalParameters }}
- job:
- job: publish_assets
displayName: Publish Assets
dependsOn: setupMaestroVars
variables:
......@@ -97,14 +97,8 @@ stages:
/p:IsInternalBuild=$(IsInternalBuild)
/p:RepositoryName=$(Build.Repository.Name)
/p:CommitSha=$(Build.SourceVersion)
/p:StaticInternalFeed=$(StaticInternalFeed)
/p:InternalChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl)
/p:InternalChecksumsTargetStaticFeedKey=$(InternalChecksumsBlobFeedKey)
/p:InternalInstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl)
/p:InternalInstallersTargetStaticFeedKey=$(InternalInstallersBlobFeedKey)
/p:NugetPath=$(NuGetExeToolPath)
/p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)'
/p:TargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)'
/p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)'
/p:BARBuildId=$(BARBuildId)
/p:MaestroApiEndpoint='$(MaestroApiEndPoint)'
......@@ -118,16 +112,15 @@ stages:
/p:InstallersAzureAccountKey=$(dotnetcli-storage-key)
/p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl)
/p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key)
/p:PublishToAzureDevOpsNuGetFeeds=true
/p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json'
/p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
/p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json'
/p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
/p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json'
/p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
${{ parameters.artifactsPublishingAdditionalParameters }}
- stage: NetCore_Dev31_Publish_Validation
displayName: .NET Core 3.1 Dev Publish Validation
variables:
- template: ../common-variables.yml
jobs:
- template: ../setup-maestro-vars.yml
- template: ../promote-build.yml
parameters:
ChannelId: ${{ variables.PublicDevRelease_31_Channel_Id }}
- template: ../../steps/promote-build.yml
parameters:
ChannelId: ${{ variables.PublicDevRelease_31_Channel_Id }}
eng/common/templates/post-build/channels/netcore-dev-5.yml
浏览文件 @ 11a8ba50
......@@ -2,7 +2,6 @@ parameters:
symbolPublishingAdditionalParameters: ''
artifactsPublishingAdditionalParameters: ''
publishInstallersAndChecksums: false
publishToAzureDevOpsFeeds: true
stages:
- stage: NetCore_Dev5_Publish
......@@ -92,48 +91,36 @@ stages:
AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw)
inputs:
filePath: eng\common\sdk-task.ps1
arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet
arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet
/p:ArtifactsCategory=$(_DotNetArtifactsCategory)
/p:IsStableBuild=$(IsStableBuild)
/p:IsInternalBuild=$(IsInternalBuild)
/p:RepositoryName=$(Build.Repository.Name)
/p:CommitSha=$(Build.SourceVersion)
/p:StaticInternalFeed=$(StaticInternalFeed)
/p:InternalChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl)
/p:InternalChecksumsTargetStaticFeedKey=$(InternalChecksumsBlobFeedKey)
/p:InternalInstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl)
/p:InternalInstallersTargetStaticFeedKey=$(InternalInstallersBlobFeedKey)
/p:NugetPath=$(NuGetExeToolPath)
/p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)'
/p:TargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)'
/p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)'
/p:BARBuildId=$(BARBuildId)
/p:MaestroApiEndpoint='$(MaestroApiEndPoint)'
/p:BuildAssetRegistryToken='$(MaestroApiAccessToken)'
/p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/'
/p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
/p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/'
/p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)'
/p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)'
/p:BARBuildId=$(BARBuildId)
/p:MaestroApiEndpoint='$(MaestroApiEndPoint)'
/p:BuildAssetRegistryToken='$(MaestroApiAccessToken)'
/p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/'
/p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
/p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/'
/p:Configuration=Release
/p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }}
/p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl)
/p:InstallersAzureAccountKey=$(dotnetcli-storage-key)
/p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl)
/p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key)
/p:PublishToAzureDevOpsNuGetFeeds=${{ parameters.publishToAzureDevOpsFeeds }}
/p:PublishToAzureDevOpsNuGetFeeds=true
/p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json'
/p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
/p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json'
/p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
/p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json'
/p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
${{ parameters.artifactsPublishingAdditionalParameters }}
- stage: NetCore_Dev5_Publish_Validation
displayName: .NET Core 5 Dev Publish Validation
variables:
- template: ../common-variables.yml
jobs:
- template: ../setup-maestro-vars.yml
- template: ../promote-build.yml
parameters:
ChannelId: ${{ variables.NetCore_5_Dev_Channel_Id }}
- template: ../../steps/promote-build.yml
parameters:
ChannelId: ${{ variables.NetCore_5_Dev_Channel_Id }}
eng/common/templates/post-build/channels/netcore-internal-30.yml
浏览文件 @ 11a8ba50
......@@ -90,40 +90,35 @@ stages:
AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw)
inputs:
filePath: eng\common\sdk-task.ps1
arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet
arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet
/p:IsStableBuild=$(IsStableBuild)
/p:IsInternalBuild=$(IsInternalBuild)
/p:RepositoryName=$(Build.Repository.Name)
/p:CommitSha=$(Build.SourceVersion)
/p:StaticInternalFeed=$(StaticInternalFeed)
/p:InternalChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl)
/p:InternalChecksumsTargetStaticFeedKey=$(InternalChecksumsBlobFeedKey)
/p:InternalInstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl)
/p:InternalInstallersTargetStaticFeedKey=$(InternalInstallersBlobFeedKey)
/p:NugetPath=$(NuGetExeToolPath)
/p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)'
/p:TargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)'
/p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)'
/p:BARBuildId=$(BARBuildId)
/p:MaestroApiEndpoint='$(MaestroApiEndPoint)'
/p:BuildAssetRegistryToken='$(MaestroApiAccessToken)'
/p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/'
/p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
/p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/'
/p:Configuration=Release
/p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)'
/p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)'
/p:BARBuildId=$(BARBuildId)
/p:MaestroApiEndpoint='$(MaestroApiEndPoint)'
/p:BuildAssetRegistryToken='$(MaestroApiAccessToken)'
/p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/'
/p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
/p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/'
/p:Configuration=Release
/p:PublishInstallersAndChecksums=true
/p:ChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl)
/p:ChecksumsTargetStaticFeedKey=$(InternalChecksumsBlobFeedKey)
/p:InstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl)
/p:InstallersTargetStaticFeedKey=$(InternalInstallersBlobFeedKey)
/p:PublishToAzureDevOpsNuGetFeeds=true
/p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v3/index.json'
/p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
/p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v3/index.json'
/p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
/p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-symbols/nuget/v3/index.json'
/p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
${{ parameters.artifactsPublishingAdditionalParameters }}
- template: ../trigger-subscription.yml
- template: ../../steps/promote-build.yml
parameters:
ChannelId: ${{ variables.InternalServicing_30_Channel_Id }}
- stage: NetCore_30_Internal_Servicing_Publish_Validation
displayName: .NET Core 3.0 Internal Servicing Publish Validation
variables:
- template: ../common-variables.yml
jobs:
- template: ../setup-maestro-vars.yml
- template: ../promote-build.yml
parameters:
ChannelId: ${{ variables.InternalServicing_30_Channel_Id }}
ChannelId: ${{ variables.InternalServicing_30_Channel_Id }}
\ No newline at end of file
eng/common/templates/post-build/channels/netcore-release-30.yml
浏览文件 @ 11a8ba50
parameters:
symbolPublishingAdditionalParameters: ''
artifactsPublishingAdditionalParameters: ''
publishInstallersAndChecksums: false
stages:
- stage: NetCore_Release30_Publish
......@@ -90,40 +91,36 @@ stages:
AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw)
inputs:
filePath: eng\common\sdk-task.ps1
arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet
arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet
/p:ArtifactsCategory=$(_DotNetArtifactsCategory)
/p:IsStableBuild=$(IsStableBuild)
/p:IsInternalBuild=$(IsInternalBuild)
/p:RepositoryName=$(Build.Repository.Name)
/p:CommitSha=$(Build.SourceVersion)
/p:StaticInternalFeed=$(StaticInternalFeed)
/p:InternalChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl)
/p:InternalChecksumsTargetStaticFeedKey=$(InternalChecksumsBlobFeedKey)
/p:InternalInstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl)
/p:InternalInstallersTargetStaticFeedKey=$(InternalInstallersBlobFeedKey)
/p:NugetPath=$(NuGetExeToolPath)
/p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)'
/p:TargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)'
/p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)'
/p:BARBuildId=$(BARBuildId)
/p:MaestroApiEndpoint='$(MaestroApiEndPoint)'
/p:BuildAssetRegistryToken='$(MaestroApiAccessToken)'
/p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/'
/p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
/p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/'
/p:Configuration=Release
/p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)'
/p:BARBuildId=$(BARBuildId)
/p:MaestroApiEndpoint='$(MaestroApiEndPoint)'
/p:BuildAssetRegistryToken='$(MaestroApiAccessToken)'
/p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/'
/p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
/p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/'
/p:Configuration=Release
/p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }}
/p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl)
/p:InstallersAzureAccountKey=$(dotnetcli-storage-key)
/p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl)
/p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key)
/p:PublishToAzureDevOpsNuGetFeeds=true
/p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json'
/p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
/p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json'
/p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
/p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-symbols/nuget/v3/index.json'
/p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
${{ parameters.artifactsPublishingAdditionalParameters }}
- template: ../trigger-subscription.yml
- template: ../../steps/promote-build.yml
parameters:
ChannelId: ${{ variables.PublicRelease_30_Channel_Id }}
- stage: NetCore_Release30_Publish_Validation
displayName: .NET Core 3.0 Release Publish Validation
variables:
- template: ../common-variables.yml
jobs:
- template: ../setup-maestro-vars.yml
- template: ../promote-build.yml
parameters:
ChannelId: ${{ variables.PublicRelease_30_Channel_Id }}
eng/common/templates/post-build/channels/netcore-release-31.yml
浏览文件 @ 11a8ba50
parameters:
symbolPublishingAdditionalParameters: ''
artifactsPublishingAdditionalParameters: ''
publishInstallersAndChecksums: false
stages:
- stage: NetCore_Release31_Publish
......@@ -96,14 +97,8 @@ stages:
/p:IsInternalBuild=$(IsInternalBuild)
/p:RepositoryName=$(Build.Repository.Name)
/p:CommitSha=$(Build.SourceVersion)
/p:StaticInternalFeed=$(StaticInternalFeed)
/p:InternalChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl)
/p:InternalChecksumsTargetStaticFeedKey=$(InternalChecksumsBlobFeedKey)
/p:InternalInstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl)
/p:InternalInstallersTargetStaticFeedKey=$(InternalInstallersBlobFeedKey)
/p:NugetPath=$(NuGetExeToolPath)
/p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)'
/p:TargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)'
/p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)'
/p:BARBuildId=$(BARBuildId)
/p:MaestroApiEndpoint='$(MaestroApiEndPoint)'
......@@ -117,19 +112,15 @@ stages:
/p:InstallersAzureAccountKey=$(dotnetcli-storage-key)
/p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl)
/p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key)
/p:PublishToAzureDevOpsNuGetFeeds=true
/p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json'
/p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
/p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json'
/p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
/p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json'
/p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
${{ parameters.artifactsPublishingAdditionalParameters }}
- template: ../trigger-subscription.yml
- template: ../../steps/promote-build.yml
parameters:
ChannelId: ${{ variables.PublicRelease_31_Channel_Id }}
- stage: NetCore_Release31_Publish_Validation
displayName: .NET Core 3.1 Release Publish Validation
variables:
- template: ../common-variables.yml
jobs:
- template: ../setup-maestro-vars.yml
- template: ../promote-build.yml
parameters:
ChannelId: ${{ variables.PublicRelease_31_Channel_Id }}
eng/common/templates/post-build/channels/netcore-tools-latest.yml
浏览文件 @ 11a8ba50
......@@ -2,7 +2,6 @@ parameters:
symbolPublishingAdditionalParameters: ''
artifactsPublishingAdditionalParameters: ''
publishInstallersAndChecksums: false
publishToAzureDevOpsFeeds: true
stages:
- stage: NetCore_Tools_Latest_Publish
......@@ -92,48 +91,36 @@ stages:
AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw)
inputs:
filePath: eng\common\sdk-task.ps1
arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet
arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet
/p:ArtifactsCategory=$(_DotNetArtifactsCategory)
/p:IsStableBuild=$(IsStableBuild)
/p:IsInternalBuild=$(IsInternalBuild)
/p:RepositoryName=$(Build.Repository.Name)
/p:CommitSha=$(Build.SourceVersion)
/p:StaticInternalFeed=$(StaticInternalFeed)
/p:InternalChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl)
/p:InternalChecksumsTargetStaticFeedKey=$(InternalChecksumsBlobFeedKey)
/p:InternalInstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl)
/p:InternalInstallersTargetStaticFeedKey=$(InternalInstallersBlobFeedKey)
/p:NugetPath=$(NuGetExeToolPath)
/p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)'
/p:TargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)'
/p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)'
/p:BARBuildId=$(BARBuildId)
/p:MaestroApiEndpoint='$(MaestroApiEndPoint)'
/p:BuildAssetRegistryToken='$(MaestroApiAccessToken)'
/p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/'
/p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
/p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/'
/p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)'
/p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)'
/p:BARBuildId=$(BARBuildId)
/p:MaestroApiEndpoint='$(MaestroApiEndPoint)'
/p:BuildAssetRegistryToken='$(MaestroApiAccessToken)'
/p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/'
/p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
/p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/'
/p:Configuration=Release
/p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }}
/p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl)
/p:InstallersAzureAccountKey=$(dotnetcli-storage-key)
/p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl)
/p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key)
/p:PublishToAzureDevOpsNuGetFeeds=${{ parameters.publishToAzureDevOpsFeeds }}
/p:PublishToAzureDevOpsNuGetFeeds=true
/p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
/p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
/p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
/p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)
/p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
/p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
/p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
${{ parameters.artifactsPublishingAdditionalParameters }}
- stage: NetCore_Tools_Latest_PublishValidation
displayName: .NET Tools - Latest Publish Validation
variables:
- template: ../common-variables.yml
jobs:
- template: ../setup-maestro-vars.yml
- template: ../promote-build.yml
parameters:
ChannelId: ${{ variables.NetCore_Tools_Latest_Channel_Id }}
- template: ../../steps/promote-build.yml
parameters:
ChannelId: ${{ variables.NetCore_Tools_Latest_Channel_Id }}
\ No newline at end of file
eng/common/templates/post-build/channels/public-validation-release.yml
浏览文件 @ 11a8ba50
parameters:
artifactsPublishingAdditionalParameters: ''
publishInstallersAndChecksums: false
publishToAzureDevOpsFeeds: true
stages:
- stage: PVR_Publish
......@@ -57,43 +56,36 @@ stages:
AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw)
inputs:
filePath: eng\common\sdk-task.ps1
arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet
arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet
/p:ArtifactsCategory=$(_DotNetValidationArtifactsCategory)
/p:IsStableBuild=$(IsStableBuild)
/p:IsInternalBuild=$(IsInternalBuild)
/p:RepositoryName=$(Build.Repository.Name)
/p:CommitSha=$(Build.SourceVersion)
/p:NugetPath=$(NuGetExeToolPath)
/p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)'
/p:TargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)'
/p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)'
/p:BARBuildId=$(BARBuildId)
/p:MaestroApiEndpoint='$(MaestroApiEndPoint)'
/p:BuildAssetRegistryToken='$(MaestroApiAccessToken)'
/p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/'
/p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
/p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/'
/p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)'
/p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)'
/p:BARBuildId=$(BARBuildId)
/p:MaestroApiEndpoint='$(MaestroApiEndPoint)'
/p:BuildAssetRegistryToken='$(MaestroApiAccessToken)'
/p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/'
/p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
/p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/'
/p:Configuration=Release
/p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }}
/p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl)
/p:InstallersAzureAccountKey=$(dotnetcli-storage-key)
/p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl)
/p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key)
/p:PublishToAzureDevOpsNuGetFeeds=${{ parameters.publishToAzureDevOpsFeeds }}
/p:PublishToAzureDevOpsNuGetFeeds=true
/p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
/p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
/p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
/p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
/p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
/p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
${{ parameters.artifactsPublishingAdditionalParameters }}
- stage: PVR_PublishValidation
displayName: .NET Tools - Validation Publish Validation
variables:
- template: ../common-variables.yml
jobs:
- template: ../setup-maestro-vars.yml
- template: ../promote-build.yml
parameters:
ChannelId: ${{ variables.PublicValidationRelease_30_Channel_Id }}
- template: ../../steps/promote-build.yml
parameters:
ChannelId: ${{ variables.PublicValidationRelease_30_Channel_Id }}
eng/common/templates/post-build/common-variables.yml
浏览文件 @ 11a8ba50
......@@ -55,10 +55,6 @@ variables:
# Feed Configurations
# These should include the suffix "/index.json"
# Configuration for the feed where packages from internal non-stable builds will be published to
- name: StaticInternalFeed
value: 'https://dnceng.pkgs.visualstudio.com/_packaging/dotnet-core-internal/nuget/v3/index.json'
# Default locations for Installers and checksums
# Public Locations
- name: ChecksumsBlobFeedUrl
......
eng/common/templates/post-build/post-build.yml
浏览文件 @ 11a8ba50
......@@ -4,7 +4,6 @@ parameters:
enableSymbolValidation: false
enableNugetValidation: true
publishInstallersAndChecksums: false
enableAzDONuGetFeeds: true
SDLValidationParameters:
enable: false
continueOnError: false
......@@ -101,7 +100,6 @@ stages:
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
enableAzDONuGetFeeds: ${{ parameters.enableAzDONuGetFeeds }}
- template: \eng\common\templates\post-build\channels\netcore-dev-30.yml
parameters:
......@@ -120,23 +118,23 @@ stages:
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
enableAzDONuGetFeeds: ${{ parameters.enableAzDONuGetFeeds }}
- template: \eng\common\templates\post-build\channels\public-validation-release.yml
parameters:
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
enableAzDONuGetFeeds: ${{ parameters.enableAzDONuGetFeeds }}
- template: \eng\common\templates\post-build\channels\netcore-release-30.yml
parameters:
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
- template: \eng\common\templates\post-build\channels\netcore-release-31.yml
parameters:
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
- template: \eng\common\templates\post-build\channels\netcore-internal-30.yml
parameters:
......
global.json
浏览文件 @ 11a8ba50
......@@ -12,8 +12,8 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19456.6",
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19456.6"
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19461.7",
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19461.7"
},
"native-tools": {
"strawberry-perl": "5.28.1.1-1",
......
packaging/Microsoft.DotNet.Arcade.Wpf.Sdk/Microsoft.DotNet.Arcade.Wpf.Sdk.ArchNeutral.csproj
浏览文件 @ 11a8ba50
......@@ -4,7 +4,7 @@
<TargetFramework>netcoreapp5.0</TargetFramework>
<Platforms>AnyCPU;x64</Platforms>
<!-- We ignore this warning because we want to pack powershell scripts that won't be executed as part of installing this package. -->
<NoWarn>NU5111</NoWarn>
<NoWarn>$(NoWarn);NU5111</NoWarn>
</PropertyGroup>
<PropertyGroup>
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或