Skip to content

W
wpf

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

通知 1
Star 1
Fork 0
W
wpf

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

提交 a7897c73 编写于 作者: J Jon Fortescue
浏览文件
操作

Merge branch 'main' into LocalizationTests

上级 03d9d5ee 91e35110
隐藏空白更改
内联 并排
Showing with 149 addition and 101 deletion
azure-pipelines.yml
浏览文件 @ a7897c73
......@@ -36,8 +36,10 @@ trigger:
batch: true
branches:
include:
- main
- release/3.*
- release/5.*
- release/6.*
- internal/release/5.*
- experimental/*
paths:
......@@ -48,9 +50,11 @@ pr:
autoCancel: true
branches:
include:
- main
- release/3.*
- internal/release/3.*
- release/5.*
- release/6.*
- experimental/*
paths:
exclude:
......
eng/Version.Details.xml
浏览文件 @ a7897c73
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Private.Winforms" Version="6.0.0-preview.3.21166.1">
<Dependency Name="Microsoft.Private.Winforms" Version="6.0.0-preview.3.21171.3">
<Uri>https://github.com/dotnet/winforms</Uri>
<Sha>fb0c086b43ba84b4ec8610457419f71f184f6e34</Sha>
<Sha>ed3f2e2ea00a5ea85811bd817d144bc0ce66abc7</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.0-preview.3.21166.1">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.0-preview.3.21171.3">
<Uri>https://github.com/dotnet/winforms</Uri>
<Sha>fb0c086b43ba84b4ec8610457419f71f184f6e34</Sha>
<Sha>ed3f2e2ea00a5ea85811bd817d144bc0ce66abc7</Sha>
</Dependency>
<Dependency Name="Microsoft.Win32.Registry" Version="6.0.0-preview.3.21162.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.Win32.Registry" Version="6.0.0-preview.3.21168.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>1353e3819dd65e4826ae4f8efa04f25923fad47e</Sha>
<Sha>f58730b33782d34ac6b221d9d2b5ecaf93d9f37a</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="6.0.0-preview.3.21162.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.CodeDom" Version="6.0.0-preview.3.21168.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>1353e3819dd65e4826ae4f8efa04f25923fad47e</Sha>
<Sha>f58730b33782d34ac6b221d9d2b5ecaf93d9f37a</Sha>
</Dependency>
<Dependency Name="System.Configuration.ConfigurationManager" Version="6.0.0-preview.3.21162.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Configuration.ConfigurationManager" Version="6.0.0-preview.3.21168.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>1353e3819dd65e4826ae4f8efa04f25923fad47e</Sha>
<Sha>f58730b33782d34ac6b221d9d2b5ecaf93d9f37a</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.EventLog" Version="6.0.0-preview.3.21162.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Diagnostics.EventLog" Version="6.0.0-preview.3.21168.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>1353e3819dd65e4826ae4f8efa04f25923fad47e</Sha>
<Sha>f58730b33782d34ac6b221d9d2b5ecaf93d9f37a</Sha>
</Dependency>
<Dependency Name="System.DirectoryServices" Version="6.0.0-preview.3.21162.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.DirectoryServices" Version="6.0.0-preview.3.21168.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>1353e3819dd65e4826ae4f8efa04f25923fad47e</Sha>
<Sha>f58730b33782d34ac6b221d9d2b5ecaf93d9f37a</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common" Version="6.0.0-preview.3.21162.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Drawing.Common" Version="6.0.0-preview.3.21168.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>1353e3819dd65e4826ae4f8efa04f25923fad47e</Sha>
<Sha>f58730b33782d34ac6b221d9d2b5ecaf93d9f37a</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.21162.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Reflection.MetadataLoadContext" Version="6.0.0-preview.3.21168.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>1353e3819dd65e4826ae4f8efa04f25923fad47e</Sha>
<Sha>f58730b33782d34ac6b221d9d2b5ecaf93d9f37a</Sha>
</Dependency>
<Dependency Name="System.Security.AccessControl" Version="6.0.0-preview.3.21162.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Security.AccessControl" Version="6.0.0-preview.3.21168.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>1353e3819dd65e4826ae4f8efa04f25923fad47e</Sha>
<Sha>f58730b33782d34ac6b221d9d2b5ecaf93d9f37a</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Xml" Version="6.0.0-preview.3.21162.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Security.Cryptography.Xml" Version="6.0.0-preview.3.21168.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>1353e3819dd65e4826ae4f8efa04f25923fad47e</Sha>
<Sha>f58730b33782d34ac6b221d9d2b5ecaf93d9f37a</Sha>
</Dependency>
<Dependency Name="System.Security.Permissions" Version="6.0.0-preview.3.21162.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Security.Permissions" Version="6.0.0-preview.3.21168.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>1353e3819dd65e4826ae4f8efa04f25923fad47e</Sha>
<Sha>f58730b33782d34ac6b221d9d2b5ecaf93d9f37a</Sha>
</Dependency>
<Dependency Name="System.Security.Principal.Windows" Version="6.0.0-preview.3.21162.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Security.Principal.Windows" Version="6.0.0-preview.3.21168.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>1353e3819dd65e4826ae4f8efa04f25923fad47e</Sha>
<Sha>f58730b33782d34ac6b221d9d2b5ecaf93d9f37a</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions" Version="6.0.0-preview.3.21162.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Windows.Extensions" Version="6.0.0-preview.3.21168.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>1353e3819dd65e4826ae4f8efa04f25923fad47e</Sha>
<Sha>f58730b33782d34ac6b221d9d2b5ecaf93d9f37a</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.0-preview.3.21162.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.0-preview.3.21168.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>1353e3819dd65e4826ae4f8efa04f25923fad47e</Sha>
<Sha>f58730b33782d34ac6b221d9d2b5ecaf93d9f37a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="6.0.0-preview.3.21153.2">
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="6.0.0-preview.4.21176.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
<Sha>ecb3f21318ba7ed895c2061ac4cee461a9a6ab54</Sha>
<Sha>055db037f18f379618d537fc361959b69d3c6744</Sha>
</Dependency>
<Dependency Name="System.IO.Packaging" Version="6.0.0-preview.3.21162.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.IO.Packaging" Version="6.0.0-preview.3.21168.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>1353e3819dd65e4826ae4f8efa04f25923fad47e</Sha>
<Sha>f58730b33782d34ac6b221d9d2b5ecaf93d9f37a</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="6.0.0-preview.3.21162.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="6.0.0-preview.3.21168.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>1353e3819dd65e4826ae4f8efa04f25923fad47e</Sha>
<Sha>f58730b33782d34ac6b221d9d2b5ecaf93d9f37a</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.0-preview.3.21162.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.0-preview.3.21168.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>1353e3819dd65e4826ae4f8efa04f25923fad47e</Sha>
<Sha>f58730b33782d34ac6b221d9d2b5ecaf93d9f37a</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="6.0.0-preview.3.21162.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Resources.Extensions" Version="6.0.0-preview.3.21168.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>1353e3819dd65e4826ae4f8efa04f25923fad47e</Sha>
<Sha>f58730b33782d34ac6b221d9d2b5ecaf93d9f37a</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-preview.3.21162.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-preview.3.21168.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>1353e3819dd65e4826ae4f8efa04f25923fad47e</Sha>
<Sha>f58730b33782d34ac6b221d9d2b5ecaf93d9f37a</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.0-preview.3.21162.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.0-preview.3.21168.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>1353e3819dd65e4826ae4f8efa04f25923fad47e</Sha>
<Sha>f58730b33782d34ac6b221d9d2b5ecaf93d9f37a</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.0-preview.3.21162.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.0-preview.3.21168.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>1353e3819dd65e4826ae4f8efa04f25923fad47e</Sha>
<Sha>f58730b33782d34ac6b221d9d2b5ecaf93d9f37a</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21160.7">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21167.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7f13798e5f567b72ffe63205bf49839245f0f8c1</Sha>
<Sha>0ca849f0b71866b007fedaaa938cee63f8d056a6</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21160.7">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21167.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7f13798e5f567b72ffe63205bf49839245f0f8c1</Sha>
<Sha>0ca849f0b71866b007fedaaa938cee63f8d056a6</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21160.7">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21167.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7f13798e5f567b72ffe63205bf49839245f0f8c1</Sha>
<Sha>0ca849f0b71866b007fedaaa938cee63f8d056a6</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21160.7">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21167.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7f13798e5f567b72ffe63205bf49839245f0f8c1</Sha>
<Sha>0ca849f0b71866b007fedaaa938cee63f8d056a6</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21160.7">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21167.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7f13798e5f567b72ffe63205bf49839245f0f8c1</Sha>
<Sha>0ca849f0b71866b007fedaaa938cee63f8d056a6</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
eng/Versions.props
浏览文件 @ a7897c73
......@@ -3,49 +3,49 @@
<PropertyGroup>
<VersionPrefix>6.0.0</VersionPrefix>
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
<PreReleaseVersionIteration>3</PreReleaseVersionIteration>
<SystemIOPackagingVersion>6.0.0-preview.3.21162.1</SystemIOPackagingVersion>
<SystemResourcesExtensionsVersion>6.0.0-preview.3.21162.1</SystemResourcesExtensionsVersion>
<PreReleaseVersionIteration>4</PreReleaseVersionIteration>
<SystemIOPackagingVersion>6.0.0-preview.3.21168.7</SystemIOPackagingVersion>
<SystemResourcesExtensionsVersion>6.0.0-preview.3.21168.7</SystemResourcesExtensionsVersion>
</PropertyGroup>
<!-- NuGet Package Versions -->
<PropertyGroup>
<MicrosoftPrivateWinformsVersion>6.0.0-preview.3.21166.1</MicrosoftPrivateWinformsVersion>
<MicrosoftPrivateWinformsVersion>6.0.0-preview.3.21171.3</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.21162.1</MicrosoftNETCoreILDAsmVersion>
<MicrosoftNETCoreILAsmVersion>6.0.0-preview.3.21162.1</MicrosoftNETCoreILAsmVersion>
<MicrosoftNETCoreILDAsmVersion>6.0.0-preview.3.21168.7</MicrosoftNETCoreILDAsmVersion>
<MicrosoftNETCoreILAsmVersion>6.0.0-preview.3.21168.7</MicrosoftNETCoreILAsmVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/core-setup -->
<PropertyGroup>
<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>
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.0-preview.3.21168.7</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<MicrosoftNETCoreAppRefVersion>6.0.0-preview.3.21168.7</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.0-preview.3.21168.7</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETCorePlatformsVersion>6.0.0-preview.3.21168.7</MicrosoftNETCorePlatformsVersion>
<SystemDrawingCommonVersion>6.0.0-preview.3.21168.7</SystemDrawingCommonVersion>
<SystemDirectoryServicesVersion>6.0.0-preview.3.21168.7</SystemDirectoryServicesVersion>
<SystemReflectionMetadataLoadContextVersion>6.0.0-preview.3.21168.7</SystemReflectionMetadataLoadContextVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/corefx via core-setup coherency parent dependency -->
<PropertyGroup>
<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>
<MicrosoftWin32RegistryPackageVersion>6.0.0-preview.3.21168.7</MicrosoftWin32RegistryPackageVersion>
<SystemCodeDomPackageVersion>6.0.0-preview.3.21168.7</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>6.0.0-preview.3.21168.7</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>6.0.0-preview.3.21168.7</SystemDiagnosticsEventLogPackageVersion>
<SystemReflectionEmitPackageVersion>5.0.0-alpha.1.19563.6</SystemReflectionEmitPackageVersion>
<SystemReflectionTypeExtensionsPackageVersion>4.6.0-preview4.19176.11</SystemReflectionTypeExtensionsPackageVersion>
<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>
<SystemSecurityAccessControlPackageVersion>6.0.0-preview.3.21168.7</SystemSecurityAccessControlPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>6.0.0-preview.3.21168.7</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>6.0.0-preview.3.21168.7</SystemSecurityPermissionsPackageVersion>
<SystemSecurityPrincipalWindowsPackageVersion>6.0.0-preview.3.21168.7</SystemSecurityPrincipalWindowsPackageVersion>
<SystemWindowsExtensionsPackageVersion>6.0.0-preview.3.21168.7</SystemWindowsExtensionsPackageVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/arcade -->
<PropertyGroup>
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.21160.7</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>6.0.0-beta.21160.7</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.21160.7</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.21167.3</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>6.0.0-beta.21167.3</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.21167.3</MicrosoftDotNetGenAPIVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/corefxlab -->
<PropertyGroup>
......@@ -89,6 +89,6 @@
<SystemReflectionMetadataLoadContextPackage>System.Reflection.MetadataLoadContext</SystemReflectionMetadataLoadContextPackage>
</PropertyGroup>
<PropertyGroup>
<MicrosoftDotNetWpfDncEngVersion>6.0.0-preview.3.21153.2</MicrosoftDotNetWpfDncEngVersion>
<MicrosoftDotNetWpfDncEngVersion>6.0.0-preview.4.21176.2</MicrosoftDotNetWpfDncEngVersion>
</PropertyGroup>
</Project>
eng/common/templates/steps/perf-send-to-helix.yml
浏览文件 @ a7897c73
......@@ -29,7 +29,7 @@ steps:
sendParams: $(Build.SourcesDirectory)/eng/common/performance/${{ parameters.ProjectFile }} /restore /t:Test /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/SendToHelix.binlog
displayName: ${{ parameters.DisplayNamePrefix }}
condition: ${{ parameters.condition }}
continueOnError: ${{ parameters.continueOnError }}
shouldContinueOnError: ${{ parameters.continueOnError }}
environment:
BuildConfig: $(_BuildConfig)
HelixSource: ${{ parameters.HelixSource }}
......
global.json
浏览文件 @ a7897c73
......@@ -12,8 +12,8 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21160.7",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21160.7"
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21167.3",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21167.3"
},
"sdk": {
"version": "6.0.100-preview.1.21103.13"
......
src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft.WinFX.targets
浏览文件 @ a7897c73
......@@ -369,7 +369,7 @@
</PropertyGroup>
<Target Name="_CompileTemporaryAssembly" DependsOnTargets="$(_CompileTemporaryAssemblyDependsOn)" />
<Target Name="_CompileTemporaryAssembly" DependsOnTargets="$(_CompileTemporaryAssemblyDependsOn)" Returns="$(IntermediateOutputPath)$(TargetFileName)"/>
<Target Name="MarkupCompilePass2ForMainAssembly"
......@@ -473,11 +473,14 @@
IncludePackageReferencesDuringMarkupCompilation="$(IncludePackageReferencesDuringMarkupCompilation)"
Analyzers="$(Analyzers)"
TemporaryTargetAssemblyProjectName="$(_TemporaryTargetAssemblyProjectName)"
MSBuildProjectExtensionsPath="$(MSBuildProjectExtensionsPath)"
>
<Output TaskParameter="TemporaryAssemblyForLocalTypeReference" PropertyName="_AssemblyForLocalTypeReference" />
</GenerateTemporaryTargetAssembly>
<CreateItem Include="$(IntermediateOutputPath)$(TargetFileName)" >
<CreateItem Include="$(_AssemblyForLocalTypeReference)">
<Output TaskParameter="Include" ItemName="AssemblyForLocalTypeReference" />
</CreateItem>
......@@ -992,3 +995,4 @@
<!-- End of the project file, Do not add any more propeties, items, targets etc. -->
</Project>
src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/GenerateTemporaryTargetAssembly.cs
浏览文件 @ a7897c73
......@@ -179,7 +179,18 @@ private bool ExecuteLegacyGenerateTemporaryTargetAssembly()
globalProperties[assemblyNamePropertyName] = AssemblyName;
globalProperties[targetAssemblyProjectNamePropertyName] = currentProjectName;
retValue = BuildEngine.BuildProjectFile(tempProj, new string[] { CompileTargetName }, globalProperties, null);
Dictionary<string, ITaskItem[]> targetOutputs = new Dictionary<string, ITaskItem[]>();
retValue = BuildEngine.BuildProjectFile(tempProj, new string[] { CompileTargetName }, globalProperties, targetOutputs);
// If the inner build succeeds, retrieve the path to the local type assembly from the task's TargetOutputs.
if (retValue)
{
// See Microsoft.WinFX.targets: TargetOutputs from '_CompileTemporaryAssembly' will always contain one item.
// <Target Name="_CompileTemporaryAssembly" DependsOnTargets="$(_CompileTemporaryAssemblyDependsOn)" Returns="$(IntermediateOutputPath)$(TargetFileName)"/>
Debug.Assert(targetOutputs.ContainsKey(CompileTargetName));
Debug.Assert(targetOutputs[CompileTargetName].Length == 1);
TemporaryAssemblyForLocalTypeReference = targetOutputs[CompileTargetName][0].ItemSpec;
}
// Delete the temporary project file and generated files unless diagnostic mode has been requested
if (!GenerateTemporaryTargetAssemblyDebuggingInformation)
......@@ -260,6 +271,7 @@ private bool ExecuteGenerateTemporaryTargetAssemblyWithPackageReferenceSupport()
( nameof(AssemblyName), AssemblyName ),
( nameof(IntermediateOutputPath), IntermediateOutputPath ),
( nameof(BaseIntermediateOutputPath), BaseIntermediateOutputPath ),
( nameof(MSBuildProjectExtensionsPath), MSBuildProjectExtensionsPath),
( "_TargetAssemblyProjectName", Path.GetFileNameWithoutExtension(CurrentProject)),
( nameof(Analyzers), Analyzers )
};
......@@ -276,7 +288,18 @@ private bool ExecuteGenerateTemporaryTargetAssemblyWithPackageReferenceSupport()
//
// Compile the temporary target assembly project
//
retValue = BuildEngine.BuildProjectFile(TemporaryTargetAssemblyProjectName, new string[] { CompileTargetName }, globalProperties, null);
Dictionary<string, ITaskItem[]> targetOutputs = new Dictionary<string, ITaskItem[]>();
retValue = BuildEngine.BuildProjectFile(TemporaryTargetAssemblyProjectName, new string[] { CompileTargetName }, globalProperties, targetOutputs);
// If the inner build succeeds, retrieve the path to the local type assembly from the task's TargetOutputs.
if (retValue)
{
// See Microsoft.WinFX.targets: TargetOutputs from '_CompileTemporaryAssembly' will always contain one item.
// <Target Name="_CompileTemporaryAssembly" DependsOnTargets="$(_CompileTemporaryAssemblyDependsOn)" Returns="$(IntermediateOutputPath)$(TargetFileName)"/>
Debug.Assert(targetOutputs.ContainsKey(CompileTargetName));
Debug.Assert(targetOutputs[CompileTargetName].Length == 1);
TemporaryAssemblyForLocalTypeReference = targetOutputs[CompileTargetName][0].ItemSpec;
}
// Delete the temporary project file and generated files unless diagnostic mode has been requested
if (!GenerateTemporaryTargetAssemblyDebuggingInformation)
......@@ -499,6 +522,31 @@ public string IncludePackageReferencesDuringMarkupCompilation
public string TemporaryTargetAssemblyProjectName
{ get; set; }
/// <summary>
///
/// MSBuildProjectExtensionsPath
///
/// Required for PackageReference support.
///
/// MSBuildProjectExtensionsPath may be overridden and must be passed into the temporary project.
///
/// This is required for some VS publishing scenarios.
///
/// </summary>
public string MSBuildProjectExtensionsPath
{ get; set; }
/// <summary>
///
/// TemporaryAssemblyForLocalTypeReference
///
/// The path of the generated temporary local type assembly.
///
/// </summary>
[Output]
public string TemporaryAssemblyForLocalTypeReference
{ get; set; }
#endregion Public Properties
//------------------------------------------------------
......@@ -732,7 +780,7 @@ static private void ReplaceImplicitImports(XmlDocument xmlProjectDoc)
// <Import Project = "Sdk.props" Sdk="Microsoft.NET.Sdk" />
//
XmlNode nodeImportProps = xmlProjectDoc.CreateElement("Import", root.NamespaceURI);
XmlAttribute projectAttribute = xmlProjectDoc.CreateAttribute("Project", root.NamespaceURI);
XmlAttribute projectAttribute = xmlProjectDoc.CreateAttribute("Project");
projectAttribute.Value = "Sdk.props";
nodeImportProps.Attributes.Append(projectAttribute);
nodeImportProps.Attributes.Append(xmlAttribute);
......@@ -746,9 +794,9 @@ static private void ReplaceImplicitImports(XmlDocument xmlProjectDoc)
// <Import Project = "Sdk.targets" Sdk="Microsoft.NET.Sdk"
//
XmlNode nodeImportTargets = xmlProjectDoc.CreateElement("Import", root.NamespaceURI);
XmlAttribute projectAttribute2 = xmlProjectDoc.CreateAttribute("Project", root.NamespaceURI);
XmlAttribute projectAttribute2 = xmlProjectDoc.CreateAttribute("Project");
projectAttribute2.Value = "Sdk.targets";
XmlAttribute projectAttribute3 = xmlProjectDoc.CreateAttribute("Sdk", root.NamespaceURI);
XmlAttribute projectAttribute3 = xmlProjectDoc.CreateAttribute("Sdk");
projectAttribute3.Value = sdkValue;
nodeImportTargets.Attributes.Append(projectAttribute2);
nodeImportTargets.Attributes.Append(projectAttribute3);
......@@ -809,3 +857,4 @@ static private void ReplaceImplicitImports(XmlDocument xmlProjectDoc)
#endregion GenerateProjectForLocalTypeReference Task class
}
src/Microsoft.DotNet.Wpf/src/ReachFramework/AlphaFlattener/metrodevice.cs
浏览文件 @ a7897c73
......@@ -17,7 +17,6 @@
using System.Printing.Interop;
using System.Security;
using System.Text;
using System.Drawing.Printing;
using MS.Utility;
namespace Microsoft.Internal.AlphaFlattener
......
src/Microsoft.DotNet.Wpf/src/ReachFramework/MS/Internal/Printing/Configuration/SafeWinSpoolPrinterHandle.cs
浏览文件 @ a7897c73
......@@ -7,7 +7,6 @@
namespace MS.Internal.Printing.Configuration
{
using System;
using System.Drawing.Printing;
using System.Runtime.InteropServices;
using System.Security;
......
src/Microsoft.DotNet.Wpf/src/ReachFramework/MS/Internal/Printing/Configuration/UnsafeNativeMethods.cs
浏览文件 @ a7897c73
......@@ -10,7 +10,6 @@
namespace MS.Internal.Printing.Configuration
{
using System;
using System.Drawing.Printing;
using System.Printing;
using System.Runtime.ConstrainedExecution;
using System.Runtime.InteropServices;
......
src/Microsoft.DotNet.Wpf/src/ReachFramework/MS/Internal/Printing/Configuration/WinSpoolPrinterCapabilities.cs
浏览文件 @ a7897c73
......@@ -11,7 +11,6 @@ namespace MS.Internal.Printing.Configuration
{
using System;
using System.Collections.Generic;
using System.Drawing.Printing;
using System.Runtime.InteropServices;
using System.Security;
using MS.Internal.PrintWin32Thunk;
......
src/Microsoft.DotNet.Wpf/src/ReachFramework/PrintConfig/FallbackPTProvider.cs
浏览文件 @ a7897c73
......@@ -20,7 +20,6 @@ namespace MS.Internal.Printing.Configuration
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing.Printing;
using System.Globalization;
using System.IO;
using System.Printing;
......
src/Microsoft.DotNet.Wpf/src/ReachFramework/PrintConfig/PTConverter.cs
浏览文件 @ a7897c73
......@@ -22,7 +22,6 @@
using System.Printing;
using MS.Internal.Printing.Configuration;
using System.Security;
using System.Drawing.Printing;
//[assembly:System.Runtime.InteropServices.ComVisibleAttribute(false)]
......
src/Microsoft.DotNet.Wpf/src/ReachFramework/PrintConfig/PTProvider.cs
浏览文件 @ a7897c73
......@@ -36,7 +36,6 @@
using System.Collections.Generic;
using System.Threading;
using System.Diagnostics;
using System.Drawing.Printing;
using MS.Internal.PrintWin32Thunk;
namespace MS.Internal.Printing.Configuration
......
src/Microsoft.DotNet.Wpf/src/ReachFramework/PrintConfig/PTProviderBase.cs
浏览文件 @ a7897c73
......@@ -18,7 +18,6 @@
using System.Printing;
using System.Printing.Interop;
using System.Security;
using System.Drawing.Printing;
namespace MS.Internal.Printing.Configuration
{
......
src/Microsoft.DotNet.Wpf/src/ReachFramework/Serialization/manager/NGCSerializationManager.cs
浏览文件 @ a7897c73
......@@ -20,7 +20,6 @@
using System.Windows.Media;
using System.Windows.Markup;
using System.Printing;
using System.Drawing.Printing;
using MS.Utility;
using Microsoft.Internal.AlphaFlattener;
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或