Skip to content

Commit a7897c7

Browse files
jonfortescuejonfortescue
committed
Merge branch 'main' into LocalizationTests
2 parents 03d9d5e + 91e3511 commit a7897c7

File tree

16 files changed

+149
-101
lines changed

16 files changed

+149
-101
lines changed

‎azure-pipelines.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,10 @@ trigger:
3636
batch: true
3737
branches:
3838
include:
39+
- main
3940
- release/3.*
4041
- release/5.*
42+
- release/6.*
4143
- internal/release/5.*
4244
- experimental/*
4345
paths:
@@ -48,9 +50,11 @@ pr:
4850
autoCancel: true
4951
branches:
5052
include:
53+
- main
5154
- release/3.*
5255
- internal/release/3.*
5356
- release/5.*
57+
- release/6.*
5458
- experimental/*
5559
paths:
5660
exclude:

‎eng/Version.Details.xml‎

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,123 +1,123 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.Private.Winforms" Version="6.0.0-preview.3.21166.1">
4+
<Dependency Name="Microsoft.Private.Winforms" Version="6.0.0-preview.3.21171.3">
55
<Uri>https://github.com/dotnet/winforms</Uri>
6-
<Sha>fb0c086b43ba84b4ec8610457419f71f184f6e34</Sha>
6+
<Sha>ed3f2e2ea00a5ea85811bd817d144bc0ce66abc7</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.0-preview.3.21166.1">
8+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.0-preview.3.21171.3">
99
<Uri>https://github.com/dotnet/winforms</Uri>
10-
<Sha>fb0c086b43ba84b4ec8610457419f71f184f6e34</Sha>
10+
<Sha>ed3f2e2ea00a5ea85811bd817d144bc0ce66abc7</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.Win32.Registry" Version="6.0.0-preview.3.21162.1" CoherentParentDependency="Microsoft.Private.Winforms">
12+
<Dependency Name="Microsoft.Win32.Registry" Version="6.0.0-preview.3.21168.7" CoherentParentDependency="Microsoft.Private.Winforms">
1313
<Uri>https://github.com/dotnet/runtime</Uri>
14-
<Sha>1353e3819dd65e4826ae4f8efa04f25923fad47e</Sha>
14+
<Sha>f58730b33782d34ac6b221d9d2b5ecaf93d9f37a</Sha>
1515
</Dependency>
16-
<Dependency Name="System.CodeDom" Version="6.0.0-preview.3.21162.1" CoherentParentDependency="Microsoft.Private.Winforms">
16+
<Dependency Name="System.CodeDom" Version="6.0.0-preview.3.21168.7" CoherentParentDependency="Microsoft.Private.Winforms">
1717
<Uri>https://github.com/dotnet/runtime</Uri>
18-
<Sha>1353e3819dd65e4826ae4f8efa04f25923fad47e</Sha>
18+
<Sha>f58730b33782d34ac6b221d9d2b5ecaf93d9f37a</Sha>
1919
</Dependency>
20-
<Dependency Name="System.Configuration.ConfigurationManager" Version="6.0.0-preview.3.21162.1" CoherentParentDependency="Microsoft.Private.Winforms">
20+
<Dependency Name="System.Configuration.ConfigurationManager" Version="6.0.0-preview.3.21168.7" CoherentParentDependency="Microsoft.Private.Winforms">
2121
<Uri>https://github.com/dotnet/runtime</Uri>
22-
<Sha>1353e3819dd65e4826ae4f8efa04f25923fad47e</Sha>
22+
<Sha>f58730b33782d34ac6b221d9d2b5ecaf93d9f37a</Sha>
2323
</Dependency>
24-
<Dependency Name="System.Diagnostics.EventLog" Version="6.0.0-preview.3.21162.1" CoherentParentDependency="Microsoft.Private.Winforms">
24+
<Dependency Name="System.Diagnostics.EventLog" Version="6.0.0-preview.3.21168.7" CoherentParentDependency="Microsoft.Private.Winforms">
2525
<Uri>https://github.com/dotnet/runtime</Uri>
26-
<Sha>1353e3819dd65e4826ae4f8efa04f25923fad47e</Sha>
26+
<Sha>f58730b33782d34ac6b221d9d2b5ecaf93d9f37a</Sha>
2727
</Dependency>
28-
<Dependency Name="System.DirectoryServices" Version="6.0.0-preview.3.21162.1" CoherentParentDependency="Microsoft.Private.Winforms">
28+
<Dependency Name="System.DirectoryServices" Version="6.0.0-preview.3.21168.7" CoherentParentDependency="Microsoft.Private.Winforms">
2929
<Uri>https://github.com/dotnet/runtime</Uri>
30-
<Sha>1353e3819dd65e4826ae4f8efa04f25923fad47e</Sha>
30+
<Sha>f58730b33782d34ac6b221d9d2b5ecaf93d9f37a</Sha>
3131
</Dependency>
32-
<Dependency Name="System.Drawing.Common" Version="6.0.0-preview.3.21162.1" CoherentParentDependency="Microsoft.Private.Winforms">
32+
<Dependency Name="System.Drawing.Common" Version="6.0.0-preview.3.21168.7" CoherentParentDependency="Microsoft.Private.Winforms">
3333
<Uri>https://github.com/dotnet/runtime</Uri>
34-
<Sha>1353e3819dd65e4826ae4f8efa04f25923fad47e</Sha>
34+
<Sha>f58730b33782d34ac6b221d9d2b5ecaf93d9f37a</Sha>
3535
</Dependency>
3636
<Dependency Name="System.Reflection.Emit" Version="5.0.0-alpha.1.19563.6">
3737
<Uri>https://github.com/dotnet/corefx</Uri>
3838
<Sha>5cee7c97d602f294e27c582d4dab81ec388f1d7b</Sha>
3939
</Dependency>
40-
<Dependency Name="System.Reflection.MetadataLoadContext" Version="6.0.0-preview.3.21162.1" CoherentParentDependency="Microsoft.Private.Winforms">
40+
<Dependency Name="System.Reflection.MetadataLoadContext" Version="6.0.0-preview.3.21168.7" CoherentParentDependency="Microsoft.Private.Winforms">
4141
<Uri>https://github.com/dotnet/runtime</Uri>
42-
<Sha>1353e3819dd65e4826ae4f8efa04f25923fad47e</Sha>
42+
<Sha>f58730b33782d34ac6b221d9d2b5ecaf93d9f37a</Sha>
4343
</Dependency>
44-
<Dependency Name="System.Security.AccessControl" Version="6.0.0-preview.3.21162.1" CoherentParentDependency="Microsoft.Private.Winforms">
44+
<Dependency Name="System.Security.AccessControl" Version="6.0.0-preview.3.21168.7" CoherentParentDependency="Microsoft.Private.Winforms">
4545
<Uri>https://github.com/dotnet/runtime</Uri>
46-
<Sha>1353e3819dd65e4826ae4f8efa04f25923fad47e</Sha>
46+
<Sha>f58730b33782d34ac6b221d9d2b5ecaf93d9f37a</Sha>
4747
</Dependency>
48-
<Dependency Name="System.Security.Cryptography.Xml" Version="6.0.0-preview.3.21162.1" CoherentParentDependency="Microsoft.Private.Winforms">
48+
<Dependency Name="System.Security.Cryptography.Xml" Version="6.0.0-preview.3.21168.7" CoherentParentDependency="Microsoft.Private.Winforms">
4949
<Uri>https://github.com/dotnet/runtime</Uri>
50-
<Sha>1353e3819dd65e4826ae4f8efa04f25923fad47e</Sha>
50+
<Sha>f58730b33782d34ac6b221d9d2b5ecaf93d9f37a</Sha>
5151
</Dependency>
52-
<Dependency Name="System.Security.Permissions" Version="6.0.0-preview.3.21162.1" CoherentParentDependency="Microsoft.Private.Winforms">
52+
<Dependency Name="System.Security.Permissions" Version="6.0.0-preview.3.21168.7" CoherentParentDependency="Microsoft.Private.Winforms">
5353
<Uri>https://github.com/dotnet/runtime</Uri>
54-
<Sha>1353e3819dd65e4826ae4f8efa04f25923fad47e</Sha>
54+
<Sha>f58730b33782d34ac6b221d9d2b5ecaf93d9f37a</Sha>
5555
</Dependency>
56-
<Dependency Name="System.Security.Principal.Windows" Version="6.0.0-preview.3.21162.1" CoherentParentDependency="Microsoft.Private.Winforms">
56+
<Dependency Name="System.Security.Principal.Windows" Version="6.0.0-preview.3.21168.7" CoherentParentDependency="Microsoft.Private.Winforms">
5757
<Uri>https://github.com/dotnet/runtime</Uri>
58-
<Sha>1353e3819dd65e4826ae4f8efa04f25923fad47e</Sha>
58+
<Sha>f58730b33782d34ac6b221d9d2b5ecaf93d9f37a</Sha>
5959
</Dependency>
60-
<Dependency Name="System.Windows.Extensions" Version="6.0.0-preview.3.21162.1" CoherentParentDependency="Microsoft.Private.Winforms">
60+
<Dependency Name="System.Windows.Extensions" Version="6.0.0-preview.3.21168.7" CoherentParentDependency="Microsoft.Private.Winforms">
6161
<Uri>https://github.com/dotnet/runtime</Uri>
62-
<Sha>1353e3819dd65e4826ae4f8efa04f25923fad47e</Sha>
62+
<Sha>f58730b33782d34ac6b221d9d2b5ecaf93d9f37a</Sha>
6363
</Dependency>
64-
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.0-preview.3.21162.1" CoherentParentDependency="Microsoft.Private.Winforms">
64+
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.0-preview.3.21168.7" CoherentParentDependency="Microsoft.Private.Winforms">
6565
<Uri>https://github.com/dotnet/runtime</Uri>
66-
<Sha>1353e3819dd65e4826ae4f8efa04f25923fad47e</Sha>
66+
<Sha>f58730b33782d34ac6b221d9d2b5ecaf93d9f37a</Sha>
6767
</Dependency>
68-
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="6.0.0-preview.3.21153.2">
68+
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="6.0.0-preview.4.21176.2">
6969
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
70-
<Sha>ecb3f21318ba7ed895c2061ac4cee461a9a6ab54</Sha>
70+
<Sha>055db037f18f379618d537fc361959b69d3c6744</Sha>
7171
</Dependency>
72-
<Dependency Name="System.IO.Packaging" Version="6.0.0-preview.3.21162.1" CoherentParentDependency="Microsoft.Private.Winforms">
72+
<Dependency Name="System.IO.Packaging" Version="6.0.0-preview.3.21168.7" CoherentParentDependency="Microsoft.Private.Winforms">
7373
<Uri>https://github.com/dotnet/runtime</Uri>
74-
<Sha>1353e3819dd65e4826ae4f8efa04f25923fad47e</Sha>
74+
<Sha>f58730b33782d34ac6b221d9d2b5ecaf93d9f37a</Sha>
7575
</Dependency>
76-
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="6.0.0-preview.3.21162.1" CoherentParentDependency="Microsoft.Private.Winforms">
76+
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="6.0.0-preview.3.21168.7" CoherentParentDependency="Microsoft.Private.Winforms">
7777
<Uri>https://github.com/dotnet/runtime</Uri>
78-
<Sha>1353e3819dd65e4826ae4f8efa04f25923fad47e</Sha>
78+
<Sha>f58730b33782d34ac6b221d9d2b5ecaf93d9f37a</Sha>
7979
</Dependency>
80-
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.0-preview.3.21162.1" CoherentParentDependency="Microsoft.Private.Winforms">
80+
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.0-preview.3.21168.7" CoherentParentDependency="Microsoft.Private.Winforms">
8181
<Uri>https://github.com/dotnet/runtime</Uri>
82-
<Sha>1353e3819dd65e4826ae4f8efa04f25923fad47e</Sha>
82+
<Sha>f58730b33782d34ac6b221d9d2b5ecaf93d9f37a</Sha>
8383
</Dependency>
84-
<Dependency Name="System.Resources.Extensions" Version="6.0.0-preview.3.21162.1" CoherentParentDependency="Microsoft.Private.Winforms">
84+
<Dependency Name="System.Resources.Extensions" Version="6.0.0-preview.3.21168.7" CoherentParentDependency="Microsoft.Private.Winforms">
8585
<Uri>https://github.com/dotnet/runtime</Uri>
86-
<Sha>1353e3819dd65e4826ae4f8efa04f25923fad47e</Sha>
86+
<Sha>f58730b33782d34ac6b221d9d2b5ecaf93d9f37a</Sha>
8787
</Dependency>
88-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-preview.3.21162.1" CoherentParentDependency="Microsoft.Private.Winforms">
88+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-preview.3.21168.7" CoherentParentDependency="Microsoft.Private.Winforms">
8989
<Uri>https://github.com/dotnet/runtime</Uri>
90-
<Sha>1353e3819dd65e4826ae4f8efa04f25923fad47e</Sha>
90+
<Sha>f58730b33782d34ac6b221d9d2b5ecaf93d9f37a</Sha>
9191
</Dependency>
92-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.0-preview.3.21162.1" CoherentParentDependency="Microsoft.Private.Winforms">
92+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.0-preview.3.21168.7" CoherentParentDependency="Microsoft.Private.Winforms">
9393
<Uri>https://github.com/dotnet/runtime</Uri>
94-
<Sha>1353e3819dd65e4826ae4f8efa04f25923fad47e</Sha>
94+
<Sha>f58730b33782d34ac6b221d9d2b5ecaf93d9f37a</Sha>
9595
</Dependency>
96-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.0-preview.3.21162.1" CoherentParentDependency="Microsoft.Private.Winforms">
96+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.0-preview.3.21168.7" CoherentParentDependency="Microsoft.Private.Winforms">
9797
<Uri>https://github.com/dotnet/runtime</Uri>
98-
<Sha>1353e3819dd65e4826ae4f8efa04f25923fad47e</Sha>
98+
<Sha>f58730b33782d34ac6b221d9d2b5ecaf93d9f37a</Sha>
9999
</Dependency>
100100
</ProductDependencies>
101101
<ToolsetDependencies>
102-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21160.7">
102+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21167.3">
103103
<Uri>https://github.com/dotnet/arcade</Uri>
104-
<Sha>7f13798e5f567b72ffe63205bf49839245f0f8c1</Sha>
104+
<Sha>0ca849f0b71866b007fedaaa938cee63f8d056a6</Sha>
105105
</Dependency>
106-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21160.7">
106+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21167.3">
107107
<Uri>https://github.com/dotnet/arcade</Uri>
108-
<Sha>7f13798e5f567b72ffe63205bf49839245f0f8c1</Sha>
108+
<Sha>0ca849f0b71866b007fedaaa938cee63f8d056a6</Sha>
109109
</Dependency>
110-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21160.7">
110+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21167.3">
111111
<Uri>https://github.com/dotnet/arcade</Uri>
112-
<Sha>7f13798e5f567b72ffe63205bf49839245f0f8c1</Sha>
112+
<Sha>0ca849f0b71866b007fedaaa938cee63f8d056a6</Sha>
113113
</Dependency>
114-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21160.7">
114+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21167.3">
115115
<Uri>https://github.com/dotnet/arcade</Uri>
116-
<Sha>7f13798e5f567b72ffe63205bf49839245f0f8c1</Sha>
116+
<Sha>0ca849f0b71866b007fedaaa938cee63f8d056a6</Sha>
117117
</Dependency>
118-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21160.7">
118+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21167.3">
119119
<Uri>https://github.com/dotnet/arcade</Uri>
120-
<Sha>7f13798e5f567b72ffe63205bf49839245f0f8c1</Sha>
120+
<Sha>0ca849f0b71866b007fedaaa938cee63f8d056a6</Sha>
121121
</Dependency>
122122
</ToolsetDependencies>
123123
</Dependencies>

‎eng/Versions.props‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,49 +3,49 @@
33
<PropertyGroup>
44
<VersionPrefix>6.0.0</VersionPrefix>
55
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
6-
<PreReleaseVersionIteration>3</PreReleaseVersionIteration>
7-
<SystemIOPackagingVersion>6.0.0-preview.3.21162.1</SystemIOPackagingVersion>
8-
<SystemResourcesExtensionsVersion>6.0.0-preview.3.21162.1</SystemResourcesExtensionsVersion>
6+
<PreReleaseVersionIteration>4</PreReleaseVersionIteration>
7+
<SystemIOPackagingVersion>6.0.0-preview.3.21168.7</SystemIOPackagingVersion>
8+
<SystemResourcesExtensionsVersion>6.0.0-preview.3.21168.7</SystemResourcesExtensionsVersion>
99
</PropertyGroup>
1010
<!-- NuGet Package Versions -->
1111
<PropertyGroup>
12-
<MicrosoftPrivateWinformsVersion>6.0.0-preview.3.21166.1</MicrosoftPrivateWinformsVersion>
12+
<MicrosoftPrivateWinformsVersion>6.0.0-preview.3.21171.3</MicrosoftPrivateWinformsVersion>
1313
</PropertyGroup>
1414
<!-- Packages that come from https://github.com/dotnet/coreclr -->
1515
<PropertyGroup>
1616
<MicrosoftNETCoreRuntimeCoreCLRVersion>5.0.0-alpha1.19562.1</MicrosoftNETCoreRuntimeCoreCLRVersion>
17-
<MicrosoftNETCoreILDAsmVersion>6.0.0-preview.3.21162.1</MicrosoftNETCoreILDAsmVersion>
18-
<MicrosoftNETCoreILAsmVersion>6.0.0-preview.3.21162.1</MicrosoftNETCoreILAsmVersion>
17+
<MicrosoftNETCoreILDAsmVersion>6.0.0-preview.3.21168.7</MicrosoftNETCoreILDAsmVersion>
18+
<MicrosoftNETCoreILAsmVersion>6.0.0-preview.3.21168.7</MicrosoftNETCoreILAsmVersion>
1919
</PropertyGroup>
2020
<!-- Packages that come from https://github.com/dotnet/core-setup -->
2121
<PropertyGroup>
22-
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.0-preview.3.21162.1</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
23-
<MicrosoftNETCoreAppRefVersion>6.0.0-preview.3.21162.1</MicrosoftNETCoreAppRefVersion>
24-
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.0-preview.3.21162.1</MicrosoftNETCoreAppRuntimewinx64Version>
25-
<MicrosoftNETCorePlatformsVersion>6.0.0-preview.3.21162.1</MicrosoftNETCorePlatformsVersion>
26-
<SystemDrawingCommonVersion>6.0.0-preview.3.21162.1</SystemDrawingCommonVersion>
27-
<SystemDirectoryServicesVersion>6.0.0-preview.3.21162.1</SystemDirectoryServicesVersion>
28-
<SystemReflectionMetadataLoadContextVersion>6.0.0-preview.3.21162.1</SystemReflectionMetadataLoadContextVersion>
22+
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.0-preview.3.21168.7</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
23+
<MicrosoftNETCoreAppRefVersion>6.0.0-preview.3.21168.7</MicrosoftNETCoreAppRefVersion>
24+
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.0-preview.3.21168.7</MicrosoftNETCoreAppRuntimewinx64Version>
25+
<MicrosoftNETCorePlatformsVersion>6.0.0-preview.3.21168.7</MicrosoftNETCorePlatformsVersion>
26+
<SystemDrawingCommonVersion>6.0.0-preview.3.21168.7</SystemDrawingCommonVersion>
27+
<SystemDirectoryServicesVersion>6.0.0-preview.3.21168.7</SystemDirectoryServicesVersion>
28+
<SystemReflectionMetadataLoadContextVersion>6.0.0-preview.3.21168.7</SystemReflectionMetadataLoadContextVersion>
2929
</PropertyGroup>
3030
<!-- Packages that come from https://github.com/dotnet/corefx via core-setup coherency parent dependency -->
3131
<PropertyGroup>
32-
<MicrosoftWin32RegistryPackageVersion>6.0.0-preview.3.21162.1</MicrosoftWin32RegistryPackageVersion>
33-
<SystemCodeDomPackageVersion>6.0.0-preview.3.21162.1</SystemCodeDomPackageVersion>
34-
<SystemConfigurationConfigurationManagerPackageVersion>6.0.0-preview.3.21162.1</SystemConfigurationConfigurationManagerPackageVersion>
35-
<SystemDiagnosticsEventLogPackageVersion>6.0.0-preview.3.21162.1</SystemDiagnosticsEventLogPackageVersion>
32+
<MicrosoftWin32RegistryPackageVersion>6.0.0-preview.3.21168.7</MicrosoftWin32RegistryPackageVersion>
33+
<SystemCodeDomPackageVersion>6.0.0-preview.3.21168.7</SystemCodeDomPackageVersion>
34+
<SystemConfigurationConfigurationManagerPackageVersion>6.0.0-preview.3.21168.7</SystemConfigurationConfigurationManagerPackageVersion>
35+
<SystemDiagnosticsEventLogPackageVersion>6.0.0-preview.3.21168.7</SystemDiagnosticsEventLogPackageVersion>
3636
<SystemReflectionEmitPackageVersion>5.0.0-alpha.1.19563.6</SystemReflectionEmitPackageVersion>
3737
<SystemReflectionTypeExtensionsPackageVersion>4.6.0-preview4.19176.11</SystemReflectionTypeExtensionsPackageVersion>
38-
<SystemSecurityAccessControlPackageVersion>6.0.0-preview.3.21162.1</SystemSecurityAccessControlPackageVersion>
39-
<SystemSecurityCryptographyXmlPackageVersion>6.0.0-preview.3.21162.1</SystemSecurityCryptographyXmlPackageVersion>
40-
<SystemSecurityPermissionsPackageVersion>6.0.0-preview.3.21162.1</SystemSecurityPermissionsPackageVersion>
41-
<SystemSecurityPrincipalWindowsPackageVersion>6.0.0-preview.3.21162.1</SystemSecurityPrincipalWindowsPackageVersion>
42-
<SystemWindowsExtensionsPackageVersion>6.0.0-preview.3.21162.1</SystemWindowsExtensionsPackageVersion>
38+
<SystemSecurityAccessControlPackageVersion>6.0.0-preview.3.21168.7</SystemSecurityAccessControlPackageVersion>
39+
<SystemSecurityCryptographyXmlPackageVersion>6.0.0-preview.3.21168.7</SystemSecurityCryptographyXmlPackageVersion>
40+
<SystemSecurityPermissionsPackageVersion>6.0.0-preview.3.21168.7</SystemSecurityPermissionsPackageVersion>
41+
<SystemSecurityPrincipalWindowsPackageVersion>6.0.0-preview.3.21168.7</SystemSecurityPrincipalWindowsPackageVersion>
42+
<SystemWindowsExtensionsPackageVersion>6.0.0-preview.3.21168.7</SystemWindowsExtensionsPackageVersion>
4343
</PropertyGroup>
4444
<!-- Packages that come from https://github.com/dotnet/arcade -->
4545
<PropertyGroup>
46-
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.21160.7</MicrosoftDotNetApiCompatVersion>
47-
<MicrosoftDotNetCodeAnalysisPackageVersion>6.0.0-beta.21160.7</MicrosoftDotNetCodeAnalysisPackageVersion>
48-
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.21160.7</MicrosoftDotNetGenAPIVersion>
46+
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.21167.3</MicrosoftDotNetApiCompatVersion>
47+
<MicrosoftDotNetCodeAnalysisPackageVersion>6.0.0-beta.21167.3</MicrosoftDotNetCodeAnalysisPackageVersion>
48+
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.21167.3</MicrosoftDotNetGenAPIVersion>
4949
</PropertyGroup>
5050
<!-- Packages that come from https://github.com/dotnet/corefxlab -->
5151
<PropertyGroup>
@@ -89,6 +89,6 @@
8989
<SystemReflectionMetadataLoadContextPackage>System.Reflection.MetadataLoadContext</SystemReflectionMetadataLoadContextPackage>
9090
</PropertyGroup>
9191
<PropertyGroup>
92-
<MicrosoftDotNetWpfDncEngVersion>6.0.0-preview.3.21153.2</MicrosoftDotNetWpfDncEngVersion>
92+
<MicrosoftDotNetWpfDncEngVersion>6.0.0-preview.4.21176.2</MicrosoftDotNetWpfDncEngVersion>
9393
</PropertyGroup>
9494
</Project>

‎eng/common/templates/steps/perf-send-to-helix.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ steps:
2929
sendParams: $(Build.SourcesDirectory)/eng/common/performance/${{ parameters.ProjectFile }} /restore /t:Test /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/SendToHelix.binlog
3030
displayName: ${{ parameters.DisplayNamePrefix }}
3131
condition: ${{ parameters.condition }}
32-
continueOnError: ${{ parameters.continueOnError }}
32+
shouldContinueOnError: ${{ parameters.continueOnError }}
3333
environment:
3434
BuildConfig: $(_BuildConfig)
3535
HelixSource: ${{ parameters.HelixSource }}

0 commit comments

Comments
 (0)