Skip to content

W
wpf

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

通知 1
Star 1
Fork 0
W
wpf

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

未验证 提交 33c71d68 编写于 作者: R Ryland 提交者： GitHub
浏览文件
操作

Merge branch 'master' into darc-master-517e56a7-57b7-479f-a0c7-234ad51161f4

上级 520d6cef f2b27de8
隐藏空白更改
内联 并排
Showing with 117 addition and 111 deletion
eng/Version.Details.xml
浏览文件 @ 33c71d68
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Private.Winforms" Version="6.0.0-preview.3.21158.7">
<Dependency Name="Microsoft.Private.Winforms" Version="6.0.0-preview.3.21162.1">
<Uri>https://github.com/dotnet/winforms</Uri>
<Sha>2cdbcecfbf5238928afd8800c67c9758a7db00d4</Sha>
<Sha>b8014c7e3d454863169551b227f4843619dc3f44</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.0-preview.3.21158.7">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.0-preview.3.21162.1">
<Uri>https://github.com/dotnet/winforms</Uri>
<Sha>2cdbcecfbf5238928afd8800c67c9758a7db00d4</Sha>
<Sha>b8014c7e3d454863169551b227f4843619dc3f44</Sha>
</Dependency>
<Dependency Name="Microsoft.Win32.Registry" Version="6.0.0-preview.3.21154.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.Win32.Registry" Version="6.0.0-preview.3.21162.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d11c029b30219d4dcd100e2d816747bbe73e18bc</Sha>
<Sha>1353e3819dd65e4826ae4f8efa04f25923fad47e</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="6.0.0-preview.3.21154.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.CodeDom" Version="6.0.0-preview.3.21162.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d11c029b30219d4dcd100e2d816747bbe73e18bc</Sha>
<Sha>1353e3819dd65e4826ae4f8efa04f25923fad47e</Sha>
</Dependency>
<Dependency Name="System.Configuration.ConfigurationManager" Version="6.0.0-preview.3.21154.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Configuration.ConfigurationManager" Version="6.0.0-preview.3.21162.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d11c029b30219d4dcd100e2d816747bbe73e18bc</Sha>
<Sha>1353e3819dd65e4826ae4f8efa04f25923fad47e</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.EventLog" Version="6.0.0-preview.3.21154.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Diagnostics.EventLog" Version="6.0.0-preview.3.21162.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d11c029b30219d4dcd100e2d816747bbe73e18bc</Sha>
<Sha>1353e3819dd65e4826ae4f8efa04f25923fad47e</Sha>
</Dependency>
<Dependency Name="System.DirectoryServices" Version="6.0.0-preview.3.21154.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.DirectoryServices" Version="6.0.0-preview.3.21162.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d11c029b30219d4dcd100e2d816747bbe73e18bc</Sha>
<Sha>1353e3819dd65e4826ae4f8efa04f25923fad47e</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common" Version="6.0.0-preview.3.21154.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Drawing.Common" Version="6.0.0-preview.3.21162.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d11c029b30219d4dcd100e2d816747bbe73e18bc</Sha>
<Sha>1353e3819dd65e4826ae4f8efa04f25923fad47e</Sha>
</Dependency>
<Dependency Name="System.Reflection.Emit" Version="5.0.0-alpha.1.19563.6">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>5cee7c97d602f294e27c582d4dab81ec388f1d7b</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="6.0.0-preview.3.21154.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Reflection.MetadataLoadContext" Version="6.0.0-preview.3.21162.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d11c029b30219d4dcd100e2d816747bbe73e18bc</Sha>
<Sha>1353e3819dd65e4826ae4f8efa04f25923fad47e</Sha>
</Dependency>
<Dependency Name="System.Security.AccessControl" Version="6.0.0-preview.3.21154.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Security.AccessControl" Version="6.0.0-preview.3.21162.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d11c029b30219d4dcd100e2d816747bbe73e18bc</Sha>
<Sha>1353e3819dd65e4826ae4f8efa04f25923fad47e</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Xml" Version="6.0.0-preview.3.21154.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Security.Cryptography.Xml" Version="6.0.0-preview.3.21162.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d11c029b30219d4dcd100e2d816747bbe73e18bc</Sha>
<Sha>1353e3819dd65e4826ae4f8efa04f25923fad47e</Sha>
</Dependency>
<Dependency Name="System.Security.Permissions" Version="6.0.0-preview.3.21154.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Security.Permissions" Version="6.0.0-preview.3.21162.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d11c029b30219d4dcd100e2d816747bbe73e18bc</Sha>
<Sha>1353e3819dd65e4826ae4f8efa04f25923fad47e</Sha>
</Dependency>
<Dependency Name="System.Security.Principal.Windows" Version="6.0.0-preview.3.21154.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Security.Principal.Windows" Version="6.0.0-preview.3.21162.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d11c029b30219d4dcd100e2d816747bbe73e18bc</Sha>
<Sha>1353e3819dd65e4826ae4f8efa04f25923fad47e</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions" Version="6.0.0-preview.3.21154.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Windows.Extensions" Version="6.0.0-preview.3.21162.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d11c029b30219d4dcd100e2d816747bbe73e18bc</Sha>
<Sha>1353e3819dd65e4826ae4f8efa04f25923fad47e</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.0-preview.3.21154.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.0-preview.3.21162.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d11c029b30219d4dcd100e2d816747bbe73e18bc</Sha>
<Sha>1353e3819dd65e4826ae4f8efa04f25923fad47e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="6.0.0-preview.3.21153.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
<Sha>ecb3f21318ba7ed895c2061ac4cee461a9a6ab54</Sha>
</Dependency>
<Dependency Name="System.IO.Packaging" Version="6.0.0-preview.3.21154.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.IO.Packaging" Version="6.0.0-preview.3.21162.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d11c029b30219d4dcd100e2d816747bbe73e18bc</Sha>
<Sha>1353e3819dd65e4826ae4f8efa04f25923fad47e</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="6.0.0-preview.3.21154.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="6.0.0-preview.3.21162.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d11c029b30219d4dcd100e2d816747bbe73e18bc</Sha>
<Sha>1353e3819dd65e4826ae4f8efa04f25923fad47e</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.0-preview.3.21154.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.0-preview.3.21162.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d11c029b30219d4dcd100e2d816747bbe73e18bc</Sha>
<Sha>1353e3819dd65e4826ae4f8efa04f25923fad47e</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="6.0.0-preview.3.21154.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Resources.Extensions" Version="6.0.0-preview.3.21162.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d11c029b30219d4dcd100e2d816747bbe73e18bc</Sha>
<Sha>1353e3819dd65e4826ae4f8efa04f25923fad47e</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-preview.3.21154.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-preview.3.21162.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d11c029b30219d4dcd100e2d816747bbe73e18bc</Sha>
<Sha>1353e3819dd65e4826ae4f8efa04f25923fad47e</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.0-preview.3.21154.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.0-preview.3.21162.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d11c029b30219d4dcd100e2d816747bbe73e18bc</Sha>
<Sha>1353e3819dd65e4826ae4f8efa04f25923fad47e</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.0-preview.3.21154.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.0-preview.3.21162.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d11c029b30219d4dcd100e2d816747bbe73e18bc</Sha>
<Sha>1353e3819dd65e4826ae4f8efa04f25923fad47e</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21152.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21160.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f95dc73e2028d630d67b782c9dcccbe464cf9677</Sha>
<Sha>7f13798e5f567b72ffe63205bf49839245f0f8c1</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21152.1">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21160.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f95dc73e2028d630d67b782c9dcccbe464cf9677</Sha>
<Sha>7f13798e5f567b72ffe63205bf49839245f0f8c1</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21152.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21160.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f95dc73e2028d630d67b782c9dcccbe464cf9677</Sha>
<Sha>7f13798e5f567b72ffe63205bf49839245f0f8c1</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21152.1">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21160.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f95dc73e2028d630d67b782c9dcccbe464cf9677</Sha>
<Sha>7f13798e5f567b72ffe63205bf49839245f0f8c1</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21152.1">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21160.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f95dc73e2028d630d67b782c9dcccbe464cf9677</Sha>
<Sha>7f13798e5f567b72ffe63205bf49839245f0f8c1</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
eng/Versions.props
浏览文件 @ 33c71d68
......@@ -4,48 +4,48 @@
<VersionPrefix>6.0.0</VersionPrefix>
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
<PreReleaseVersionIteration>3</PreReleaseVersionIteration>
<SystemIOPackagingVersion>6.0.0-preview.3.21154.7</SystemIOPackagingVersion>
<SystemResourcesExtensionsVersion>6.0.0-preview.3.21154.7</SystemResourcesExtensionsVersion>
<SystemIOPackagingVersion>6.0.0-preview.3.21162.1</SystemIOPackagingVersion>
<SystemResourcesExtensionsVersion>6.0.0-preview.3.21162.1</SystemResourcesExtensionsVersion>
</PropertyGroup>
<!-- NuGet Package Versions -->
<PropertyGroup>
<MicrosoftPrivateWinformsVersion>6.0.0-preview.3.21158.7</MicrosoftPrivateWinformsVersion>
<MicrosoftPrivateWinformsVersion>6.0.0-preview.3.21162.1</MicrosoftPrivateWinformsVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/coreclr -->
<PropertyGroup>
<MicrosoftNETCoreRuntimeCoreCLRVersion>5.0.0-alpha1.19562.1</MicrosoftNETCoreRuntimeCoreCLRVersion>
<MicrosoftNETCoreILDAsmVersion>6.0.0-preview.3.21154.7</MicrosoftNETCoreILDAsmVersion>
<MicrosoftNETCoreILAsmVersion>6.0.0-preview.3.21154.7</MicrosoftNETCoreILAsmVersion>
<MicrosoftNETCoreILDAsmVersion>6.0.0-preview.3.21162.1</MicrosoftNETCoreILDAsmVersion>
<MicrosoftNETCoreILAsmVersion>6.0.0-preview.3.21162.1</MicrosoftNETCoreILAsmVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/core-setup -->
<PropertyGroup>
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.0-preview.3.21154.7</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<MicrosoftNETCoreAppRefVersion>6.0.0-preview.3.21154.7</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.0-preview.3.21154.7</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETCorePlatformsVersion>6.0.0-preview.3.21154.7</MicrosoftNETCorePlatformsVersion>
<SystemDrawingCommonVersion>6.0.0-preview.3.21154.7</SystemDrawingCommonVersion>
<SystemDirectoryServicesVersion>6.0.0-preview.3.21154.7</SystemDirectoryServicesVersion>
<SystemReflectionMetadataLoadContextVersion>6.0.0-preview.3.21154.7</SystemReflectionMetadataLoadContextVersion>
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.0-preview.3.21162.1</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<MicrosoftNETCoreAppRefVersion>6.0.0-preview.3.21162.1</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.0-preview.3.21162.1</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETCorePlatformsVersion>6.0.0-preview.3.21162.1</MicrosoftNETCorePlatformsVersion>
<SystemDrawingCommonVersion>6.0.0-preview.3.21162.1</SystemDrawingCommonVersion>
<SystemDirectoryServicesVersion>6.0.0-preview.3.21162.1</SystemDirectoryServicesVersion>
<SystemReflectionMetadataLoadContextVersion>6.0.0-preview.3.21162.1</SystemReflectionMetadataLoadContextVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/corefx via core-setup coherency parent dependency -->
<PropertyGroup>
<MicrosoftWin32RegistryPackageVersion>6.0.0-preview.3.21154.7</MicrosoftWin32RegistryPackageVersion>
<SystemCodeDomPackageVersion>6.0.0-preview.3.21154.7</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>6.0.0-preview.3.21154.7</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>6.0.0-preview.3.21154.7</SystemDiagnosticsEventLogPackageVersion>
<MicrosoftWin32RegistryPackageVersion>6.0.0-preview.3.21162.1</MicrosoftWin32RegistryPackageVersion>
<SystemCodeDomPackageVersion>6.0.0-preview.3.21162.1</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>6.0.0-preview.3.21162.1</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>6.0.0-preview.3.21162.1</SystemDiagnosticsEventLogPackageVersion>
<SystemReflectionEmitPackageVersion>5.0.0-alpha.1.19563.6</SystemReflectionEmitPackageVersion>
<SystemReflectionTypeExtensionsPackageVersion>4.6.0-preview4.19176.11</SystemReflectionTypeExtensionsPackageVersion>
<SystemSecurityAccessControlPackageVersion>6.0.0-preview.3.21154.7</SystemSecurityAccessControlPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>6.0.0-preview.3.21154.7</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>6.0.0-preview.3.21154.7</SystemSecurityPermissionsPackageVersion>
<SystemSecurityPrincipalWindowsPackageVersion>6.0.0-preview.3.21154.7</SystemSecurityPrincipalWindowsPackageVersion>
<SystemWindowsExtensionsPackageVersion>6.0.0-preview.3.21154.7</SystemWindowsExtensionsPackageVersion>
<SystemSecurityAccessControlPackageVersion>6.0.0-preview.3.21162.1</SystemSecurityAccessControlPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>6.0.0-preview.3.21162.1</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>6.0.0-preview.3.21162.1</SystemSecurityPermissionsPackageVersion>
<SystemSecurityPrincipalWindowsPackageVersion>6.0.0-preview.3.21162.1</SystemSecurityPrincipalWindowsPackageVersion>
<SystemWindowsExtensionsPackageVersion>6.0.0-preview.3.21162.1</SystemWindowsExtensionsPackageVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/arcade -->
<PropertyGroup>
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.21152.1</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>6.0.0-beta.21152.1</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.21152.1</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.21160.7</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>6.0.0-beta.21160.7</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.21160.7</MicrosoftDotNetGenAPIVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/corefxlab -->
<PropertyGroup>
......
eng/common/native/install-tool.ps1
浏览文件 @ 33c71d68
......@@ -105,7 +105,7 @@ try {
Write-Error "There are multiple copies of $ToolName in $($ToolInstallDirectory): `n$(@($ToolFilePath | out-string))"
exit 1
} elseif (@($ToolFilePath).Length -Lt 1) {
Write-Host "$ToolName was not found in $ToolFilePath."
Write-Host "$ToolName was not found in $ToolInstallDirectory."
exit 1
}
......
eng/common/performance/performance-setup.ps1
浏览文件 @ 33c71d68
......@@ -18,7 +18,8 @@ Param(
[switch] $Internal,
[switch] $Compare,
[string] $MonoDotnet="",
[string] $Configurations="CompilationMode=$CompilationMode RunKind=$Kind"
[string] $Configurations="CompilationMode=$CompilationMode RunKind=$Kind",
[string] $LogicalMachine=""
)
$RunFromPerformanceRepo = ($Repository -eq "dotnet/performance") -or ($Repository -eq "dotnet-performance")
......@@ -33,26 +34,23 @@ $Creator = $env:BUILD_DEFINITIONNAME
$PerfLabArguments = ""
$HelixSourcePrefix = "pr"
$Queue = "Windows.10.Amd64.ClientRS4.DevEx.15.8.Open"
# TODO: Implement a better logic to determine if Framework is .NET Core or >= .NET 5.
if ($Framework.StartsWith("netcoreapp") -or ($Framework -eq "net5.0")) {
$Queue = "Windows.10.Amd64.ClientRS5.Open"
}
if ($Compare) {
$Queue = "Windows.10.Amd64.19H1.Tiger.Perf.Open"
$PerfLabArguments = ""
$ExtraBenchmarkDotNetArguments = ""
}
$Queue = ""
if ($Internal) {
$Queue = "Windows.10.Amd64.19H1.Tiger.Perf"
switch ($LogicalMachine) {
"perftiger" { $Queue = "Windows.10.Amd64.19H1.Tiger.Perf" }
"perfowl" { $Queue = "Windows.10.Amd64.20H2.Owl.Perf" }
"perfsurf" { $Queue = "Windows.10.Arm64.Perf.Surf" }
Default { $Queue = "Windows.10.Amd64.19H1.Tiger.Perf" }
}
$PerfLabArguments = "--upload-to-perflab-container"
$ExtraBenchmarkDotNetArguments = ""
$Creator = ""
$HelixSourcePrefix = "official"
}
else {
$Queue = "Windows.10.Amd64.ClientRS4.DevEx.15.8.Open"
}
if($MonoInterpreter)
{
......
eng/common/performance/performance-setup.sh
浏览文件 @ 33c71d68
......@@ -27,6 +27,7 @@ using_mono=false
wasm_runtime_loc=
using_wasm=false
use_latest_dotnet=false
logical_machine=
while (($# > 0)); do
lowerI="$(echo $1 | tr "[:upper:]" "[:lower:]")"
......@@ -55,6 +56,10 @@ while (($# > 0)); do
compilation_mode=$2
shift 2
;;
--logicalmachine)
logical_machine=$2
shift 2
;;
--repository)
repository=$2
shift 2
......@@ -179,19 +184,6 @@ queue=Ubuntu.1804.Amd64.Open
creator=$BUILD_DEFINITIONNAME
helix_source_prefix="pr"
if [[ "$compare" == true ]]; then
extra_benchmark_dotnet_arguments=
perflab_arguments=
# No open queues for arm64
if [[ "$architecture" = "arm64" ]]; then
echo "Compare not available for arm64"
exit 1
fi
queue=Ubuntu.1804.Amd64.Tiger.Perf.Open
fi
if [[ "$internal" == true ]]; then
perflab_arguments="--upload-to-perflab-container"
helix_source_prefix="official"
......@@ -201,7 +193,11 @@ if [[ "$internal" == true ]]; then
if [[ "$architecture" = "arm64" ]]; then
queue=Ubuntu.1804.Arm64.Perf
else
queue=Ubuntu.1804.Amd64.Tiger.Perf
if [[ "$logical_machine" = "perfowl" ]]; then
queue=Ubuntu.1804.Amd64.Owl.Perf
else
queue=Ubuntu.1804.Amd64.Tiger.Perf
fi
fi
if [[ "$alpine" = "true" ]]; then
......
eng/common/post-build/publish-using-darc.ps1
浏览文件 @ 33c71d68
......@@ -60,7 +60,7 @@ try {
--id $buildId `
--publishing-infra-version $PublishingInfraVersion `
--default-channels `
--source-branch master `
--source-branch main `
--azdev-pat $AzdoToken `
--bar-uri $MaestroApiEndPoint `
--password $MaestroToken `
......
eng/common/templates/job/execute-sdl.yml
浏览文件 @ 33c71d68
......@@ -45,6 +45,7 @@ jobs:
buildId: $(AzDOBuildId)
artifactName: ${{ artifactName }}
downloadPath: $(Build.ArtifactStagingDirectory)\artifacts
checkDownloadedFiles: true
- ${{ if eq(parameters.artifactNames, '') }}:
- task: DownloadBuildArtifacts@0
displayName: Download Build Artifacts
......@@ -57,6 +58,7 @@ jobs:
downloadType: specific files
itemPattern: "**"
downloadPath: $(Build.ArtifactStagingDirectory)\artifacts
checkDownloadedFiles: true
- powershell: eng/common/sdl/extract-artifact-packages.ps1
-InputPath $(Build.ArtifactStagingDirectory)\artifacts\BlobArtifacts
-ExtractPath $(Build.ArtifactStagingDirectory)\artifacts\BlobArtifacts
......
eng/common/templates/job/publish-build-assets.yml
浏览文件 @ 33c71d68
......@@ -52,6 +52,7 @@ jobs:
inputs:
artifactName: AssetManifests
downloadPath: '$(Build.StagingDirectory)/Download'
checkDownloadedFiles: true
condition: ${{ parameters.condition }}
continueOnError: ${{ parameters.continueOnError }}
......
eng/common/templates/phases/publish-build-assets.yml
浏览文件 @ 33c71d68
......@@ -20,6 +20,7 @@ phases:
inputs:
artifactName: AssetManifests
downloadPath: '$(Build.StagingDirectory)/Download'
checkDownloadedFiles: true
condition: ${{ parameters.condition }}
continueOnError: ${{ parameters.continueOnError }}
- task: AzureKeyVault@1
......
eng/common/templates/post-build/channels/generic-internal-channel.yml
浏览文件 @ 33c71d68
......@@ -58,6 +58,7 @@ stages:
PdbArtifacts/**
BlobArtifacts/**
downloadPath: '$(Build.ArtifactStagingDirectory)'
checkDownloadedFiles: true
# This is necessary whenever we want to publish/restore to an AzDO private feed
# Since sdk-task.ps1 tries to restore packages we need to do this authentication here
......@@ -124,6 +125,7 @@ stages:
BlobArtifacts/**
AssetManifests/**
downloadPath: '$(Build.ArtifactStagingDirectory)'
checkDownloadedFiles: true
- task: NuGetToolInstaller@1
displayName: 'Install NuGet.exe'
......
eng/common/templates/post-build/channels/generic-public-channel.yml
浏览文件 @ 33c71d68
......@@ -56,6 +56,7 @@ stages:
PdbArtifacts/**
BlobArtifacts/**
downloadPath: '$(Build.ArtifactStagingDirectory)'
checkDownloadedFiles: true
# This is necessary whenever we want to publish/restore to an AzDO private feed
# Since sdk-task.ps1 tries to restore packages we need to do this authentication here
......@@ -123,6 +124,7 @@ stages:
BlobArtifacts/**
AssetManifests/**
downloadPath: '$(Build.ArtifactStagingDirectory)'
checkDownloadedFiles: true
- task: NuGetToolInstaller@1
displayName: 'Install NuGet.exe'
......
eng/common/templates/post-build/post-build.yml
浏览文件 @ 33c71d68
......@@ -117,6 +117,7 @@ stages:
pipeline: $(AzDOPipelineId)
buildId: $(AzDOBuildId)
artifactName: PackageArtifacts
checkDownloadedFiles: true
- task: PowerShell@2
displayName: Validate
......@@ -149,6 +150,7 @@ stages:
pipeline: $(AzDOPipelineId)
buildId: $(AzDOBuildId)
artifactName: PackageArtifacts
checkDownloadedFiles: true
itemPattern: |
**
!**/Microsoft.SourceBuild.Intermediate.*.nupkg
......@@ -205,6 +207,7 @@ stages:
pipeline: $(AzDOPipelineId)
buildId: $(AzDOBuildId)
artifactName: BlobArtifacts
checkDownloadedFiles: true
- task: PowerShell@2
displayName: Validate
......
eng/common/templates/post-build/setup-maestro-vars.yml
浏览文件 @ 33c71d68
......@@ -18,6 +18,7 @@ jobs:
inputs:
buildType: current
artifactName: ReleaseConfigs
checkDownloadedFiles: true
- task: PowerShell@2
name: setReleaseVars
......
global.json
浏览文件 @ 33c71d68
......@@ -12,8 +12,8 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21152.1",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21152.1"
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21160.7",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21160.7"
},
"sdk": {
"version": "6.0.100-preview.1.21103.13"
......
src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/MarkupCompilePass2.cs
浏览文件 @ 33c71d68
......@@ -484,7 +484,7 @@ private ITaskFileService TaskFileService
//
// return value:
//
// If cache doesn't exist, or both LocalAppDef and LocallXaml Pages do not exist, return false
// If cache doesn't exist, or both LocalAppDef and LocalXaml Pages do not exist, return false
// to indicate no further work required.
// otherwise, return true.
//
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或