Skip to content

Commit 77f4073

Browse files
mmitchemmitche
committed
Merged PR 9224: Update dependencies from winforms
Update dependencies from winforms
1 parent 63385cc commit 77f4073

File tree

6 files changed

+73
-77
lines changed

6 files changed

+73
-77
lines changed

‎azure-pipelines.yml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ variables:
99
# clean the local repo on the build agents
1010
- name: Build.Repository.Clean
1111
value: true
12-
- name: _PublishUsingPipelines
13-
value: true
1412
- name: _DotNetArtifactsCategory
1513
value: WINDOWSDESKTOP
1614
- name: _DotNetValidationArtifactsCategory
@@ -62,15 +60,6 @@ stages:
6260
displayName: Build
6361
jobs:
6462
- template: /eng/pipeline.yml
65-
parameters:
66-
enablePublishUsingPipelines: $(_PublishUsingPipelines)
67-
${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
68-
# agent pool can't be read from a user-defined variable (Azure DevOps limitation)
69-
pool:
70-
name: NetCoreInternal-Pool
71-
queue: buildpool.windows.10.amd64.vs2019.pre
72-
# runAsPublic is used in expressions, which can't read from user-defined variables
73-
runAsPublic: false
7463

7564
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
7665
- template: eng\common\templates\post-build\post-build.yml

‎eng/Version.Details.xml‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,93 +1,93 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.Private.Winforms" Version="5.0.0-preview.8.20370.7">
5-
<Uri>https://github.com/dotnet/winforms</Uri>
6-
<Sha>c7af12f4a3b90f7635ba5847bc4fb5aa61a1e43f</Sha>
4+
<Dependency Name="Microsoft.Private.Winforms" Version="5.0.0-preview.8.20371.7">
5+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
6+
<Sha>3031d9767d9eec7ca66b07030187072cffb8b6e7</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.Win32.Registry" Version="5.0.0-preview.8.20363.2" CoherentParentDependency="Microsoft.Private.Winforms">
8+
<Dependency Name="Microsoft.Win32.Registry" Version="5.0.0-preview.8.20367.18" CoherentParentDependency="Microsoft.Private.Winforms">
99
<Uri>https://github.com/dotnet/runtime</Uri>
10-
<Sha>2d9dbbb538322a7cc05397f5e2e15d445c7d3ff0</Sha>
10+
<Sha>095788708c9e8764e0fb5b47d57fd6ec8efee91c</Sha>
1111
</Dependency>
12-
<Dependency Name="System.CodeDom" Version="5.0.0-preview.8.20363.2" CoherentParentDependency="Microsoft.Private.Winforms">
12+
<Dependency Name="System.CodeDom" Version="5.0.0-preview.8.20367.18" CoherentParentDependency="Microsoft.Private.Winforms">
1313
<Uri>https://github.com/dotnet/runtime</Uri>
14-
<Sha>2d9dbbb538322a7cc05397f5e2e15d445c7d3ff0</Sha>
14+
<Sha>095788708c9e8764e0fb5b47d57fd6ec8efee91c</Sha>
1515
</Dependency>
16-
<Dependency Name="System.Configuration.ConfigurationManager" Version="5.0.0-preview.8.20363.2" CoherentParentDependency="Microsoft.Private.Winforms">
16+
<Dependency Name="System.Configuration.ConfigurationManager" Version="5.0.0-preview.8.20367.18" CoherentParentDependency="Microsoft.Private.Winforms">
1717
<Uri>https://github.com/dotnet/runtime</Uri>
18-
<Sha>2d9dbbb538322a7cc05397f5e2e15d445c7d3ff0</Sha>
18+
<Sha>095788708c9e8764e0fb5b47d57fd6ec8efee91c</Sha>
1919
</Dependency>
20-
<Dependency Name="System.Diagnostics.EventLog" Version="5.0.0-preview.8.20363.2" CoherentParentDependency="Microsoft.Private.Winforms">
20+
<Dependency Name="System.Diagnostics.EventLog" Version="5.0.0-preview.8.20367.18" CoherentParentDependency="Microsoft.Private.Winforms">
2121
<Uri>https://github.com/dotnet/runtime</Uri>
22-
<Sha>2d9dbbb538322a7cc05397f5e2e15d445c7d3ff0</Sha>
22+
<Sha>095788708c9e8764e0fb5b47d57fd6ec8efee91c</Sha>
2323
</Dependency>
24-
<Dependency Name="System.DirectoryServices" Version="5.0.0-preview.8.20363.2" CoherentParentDependency="Microsoft.Private.Winforms">
24+
<Dependency Name="System.DirectoryServices" Version="5.0.0-preview.8.20367.18" CoherentParentDependency="Microsoft.Private.Winforms">
2525
<Uri>https://github.com/dotnet/runtime</Uri>
26-
<Sha>2d9dbbb538322a7cc05397f5e2e15d445c7d3ff0</Sha>
26+
<Sha>095788708c9e8764e0fb5b47d57fd6ec8efee91c</Sha>
2727
</Dependency>
28-
<Dependency Name="System.Drawing.Common" Version="5.0.0-preview.8.20363.2" CoherentParentDependency="Microsoft.Private.Winforms">
28+
<Dependency Name="System.Drawing.Common" Version="5.0.0-preview.8.20367.18" CoherentParentDependency="Microsoft.Private.Winforms">
2929
<Uri>https://github.com/dotnet/runtime</Uri>
30-
<Sha>2d9dbbb538322a7cc05397f5e2e15d445c7d3ff0</Sha>
30+
<Sha>095788708c9e8764e0fb5b47d57fd6ec8efee91c</Sha>
3131
</Dependency>
3232
<Dependency Name="System.Reflection.Emit" Version="5.0.0-alpha.1.19563.6">
3333
<Uri>https://github.com/dotnet/corefx</Uri>
3434
<Sha>5cee7c97d602f294e27c582d4dab81ec388f1d7b</Sha>
3535
</Dependency>
36-
<Dependency Name="System.Reflection.MetadataLoadContext" Version="5.0.0-preview.8.20363.2" CoherentParentDependency="Microsoft.Private.Winforms">
36+
<Dependency Name="System.Reflection.MetadataLoadContext" Version="5.0.0-preview.8.20367.18" CoherentParentDependency="Microsoft.Private.Winforms">
3737
<Uri>https://github.com/dotnet/runtime</Uri>
38-
<Sha>2d9dbbb538322a7cc05397f5e2e15d445c7d3ff0</Sha>
38+
<Sha>095788708c9e8764e0fb5b47d57fd6ec8efee91c</Sha>
3939
</Dependency>
40-
<Dependency Name="System.Security.AccessControl" Version="5.0.0-preview.8.20363.2" CoherentParentDependency="Microsoft.Private.Winforms">
40+
<Dependency Name="System.Security.AccessControl" Version="5.0.0-preview.8.20367.18" CoherentParentDependency="Microsoft.Private.Winforms">
4141
<Uri>https://github.com/dotnet/runtime</Uri>
42-
<Sha>2d9dbbb538322a7cc05397f5e2e15d445c7d3ff0</Sha>
42+
<Sha>095788708c9e8764e0fb5b47d57fd6ec8efee91c</Sha>
4343
</Dependency>
44-
<Dependency Name="System.Security.Cryptography.Xml" Version="5.0.0-preview.8.20363.2" CoherentParentDependency="Microsoft.Private.Winforms">
44+
<Dependency Name="System.Security.Cryptography.Xml" Version="5.0.0-preview.8.20367.18" CoherentParentDependency="Microsoft.Private.Winforms">
4545
<Uri>https://github.com/dotnet/runtime</Uri>
46-
<Sha>2d9dbbb538322a7cc05397f5e2e15d445c7d3ff0</Sha>
46+
<Sha>095788708c9e8764e0fb5b47d57fd6ec8efee91c</Sha>
4747
</Dependency>
48-
<Dependency Name="System.Security.Permissions" Version="5.0.0-preview.8.20363.2" CoherentParentDependency="Microsoft.Private.Winforms">
48+
<Dependency Name="System.Security.Permissions" Version="5.0.0-preview.8.20367.18" CoherentParentDependency="Microsoft.Private.Winforms">
4949
<Uri>https://github.com/dotnet/runtime</Uri>
50-
<Sha>2d9dbbb538322a7cc05397f5e2e15d445c7d3ff0</Sha>
50+
<Sha>095788708c9e8764e0fb5b47d57fd6ec8efee91c</Sha>
5151
</Dependency>
52-
<Dependency Name="System.Security.Principal.Windows" Version="5.0.0-preview.8.20363.2" CoherentParentDependency="Microsoft.Private.Winforms">
52+
<Dependency Name="System.Security.Principal.Windows" Version="5.0.0-preview.8.20367.18" CoherentParentDependency="Microsoft.Private.Winforms">
5353
<Uri>https://github.com/dotnet/runtime</Uri>
54-
<Sha>2d9dbbb538322a7cc05397f5e2e15d445c7d3ff0</Sha>
54+
<Sha>095788708c9e8764e0fb5b47d57fd6ec8efee91c</Sha>
5555
</Dependency>
56-
<Dependency Name="System.Windows.Extensions" Version="5.0.0-preview.8.20363.2" CoherentParentDependency="Microsoft.Private.Winforms">
56+
<Dependency Name="System.Windows.Extensions" Version="5.0.0-preview.8.20367.18" CoherentParentDependency="Microsoft.Private.Winforms">
5757
<Uri>https://github.com/dotnet/runtime</Uri>
58-
<Sha>2d9dbbb538322a7cc05397f5e2e15d445c7d3ff0</Sha>
58+
<Sha>095788708c9e8764e0fb5b47d57fd6ec8efee91c</Sha>
5959
</Dependency>
60-
<Dependency Name="Microsoft.NETCore.Platforms" Version="5.0.0-preview.8.20363.2" CoherentParentDependency="Microsoft.Private.Winforms">
60+
<Dependency Name="Microsoft.NETCore.Platforms" Version="5.0.0-preview.8.20367.18" CoherentParentDependency="Microsoft.Private.Winforms">
6161
<Uri>https://github.com/dotnet/runtime</Uri>
62-
<Sha>2d9dbbb538322a7cc05397f5e2e15d445c7d3ff0</Sha>
62+
<Sha>095788708c9e8764e0fb5b47d57fd6ec8efee91c</Sha>
6363
</Dependency>
6464
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="5.0.0-preview.8.20365.6">
6565
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
6666
<Sha>1767b8f41417eb598d8a3e2e7c64894abb3be553</Sha>
6767
</Dependency>
68-
<Dependency Name="System.IO.Packaging" Version="5.0.0-preview.8.20363.2" CoherentParentDependency="Microsoft.Private.Winforms">
68+
<Dependency Name="System.IO.Packaging" Version="5.0.0-preview.8.20367.18" CoherentParentDependency="Microsoft.Private.Winforms">
6969
<Uri>https://github.com/dotnet/runtime</Uri>
70-
<Sha>2d9dbbb538322a7cc05397f5e2e15d445c7d3ff0</Sha>
70+
<Sha>095788708c9e8764e0fb5b47d57fd6ec8efee91c</Sha>
7171
</Dependency>
7272
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="5.0.0-alpha1.19562.1">
7373
<Uri>https://github.com/dotnet/coreclr</Uri>
7474
<Sha>d5bb8bf2437d447750cf0203dd55bb5160ff36b8</Sha>
7575
</Dependency>
76-
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="5.0.0-preview.8.20363.2" CoherentParentDependency="Microsoft.Private.Winforms">
76+
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="5.0.0-preview.8.20367.18" CoherentParentDependency="Microsoft.Private.Winforms">
7777
<Uri>https://github.com/dotnet/runtime</Uri>
78-
<Sha>2d9dbbb538322a7cc05397f5e2e15d445c7d3ff0</Sha>
78+
<Sha>095788708c9e8764e0fb5b47d57fd6ec8efee91c</Sha>
7979
</Dependency>
80-
<Dependency Name="Microsoft.NETCore.ILAsm" Version="5.0.0-preview.8.20363.2" CoherentParentDependency="Microsoft.Private.Winforms">
80+
<Dependency Name="Microsoft.NETCore.ILAsm" Version="5.0.0-preview.8.20367.18" CoherentParentDependency="Microsoft.Private.Winforms">
8181
<Uri>https://github.com/dotnet/runtime</Uri>
82-
<Sha>2d9dbbb538322a7cc05397f5e2e15d445c7d3ff0</Sha>
82+
<Sha>095788708c9e8764e0fb5b47d57fd6ec8efee91c</Sha>
8383
</Dependency>
84-
<Dependency Name="System.Resources.Extensions" Version="5.0.0-preview.8.20363.2" CoherentParentDependency="Microsoft.Private.Winforms">
84+
<Dependency Name="System.Resources.Extensions" Version="5.0.0-preview.8.20367.18" CoherentParentDependency="Microsoft.Private.Winforms">
8585
<Uri>https://github.com/dotnet/runtime</Uri>
86-
<Sha>2d9dbbb538322a7cc05397f5e2e15d445c7d3ff0</Sha>
86+
<Sha>095788708c9e8764e0fb5b47d57fd6ec8efee91c</Sha>
8787
</Dependency>
88-
<Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.0-preview.8.20363.2" CoherentParentDependency="Microsoft.Private.Winforms">
88+
<Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.0-preview.8.20367.18" CoherentParentDependency="Microsoft.Private.Winforms">
8989
<Uri>https://github.com/dotnet/runtime</Uri>
90-
<Sha>2d9dbbb538322a7cc05397f5e2e15d445c7d3ff0</Sha>
90+
<Sha>095788708c9e8764e0fb5b47d57fd6ec8efee91c</Sha>
9191
</Dependency>
9292
</ProductDependencies>
9393
<ToolsetDependencies>

‎eng/Versions.props‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,40 +4,40 @@
44
<VersionPrefix>5.0.0</VersionPrefix>
55
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
66
<PreReleaseVersionIteration>8</PreReleaseVersionIteration>
7-
<SystemIOPackagingVersion>5.0.0-preview.8.20363.2</SystemIOPackagingVersion>
8-
<SystemResourcesExtensionsVersion>5.0.0-preview.8.20363.2</SystemResourcesExtensionsVersion>
7+
<SystemIOPackagingVersion>5.0.0-preview.8.20367.18</SystemIOPackagingVersion>
8+
<SystemResourcesExtensionsVersion>5.0.0-preview.8.20367.18</SystemResourcesExtensionsVersion>
99
</PropertyGroup>
1010
<!-- NuGet Package Versions -->
1111
<PropertyGroup>
12-
<MicrosoftPrivateWinformsVersion>5.0.0-preview.8.20370.7</MicrosoftPrivateWinformsVersion>
12+
<MicrosoftPrivateWinformsVersion>5.0.0-preview.8.20371.7</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>5.0.0-preview.8.20363.2</MicrosoftNETCoreILDAsmVersion>
18-
<MicrosoftNETCoreILAsmVersion>5.0.0-preview.8.20363.2</MicrosoftNETCoreILAsmVersion>
17+
<MicrosoftNETCoreILDAsmVersion>5.0.0-preview.8.20367.18</MicrosoftNETCoreILDAsmVersion>
18+
<MicrosoftNETCoreILAsmVersion>5.0.0-preview.8.20367.18</MicrosoftNETCoreILAsmVersion>
1919
</PropertyGroup>
2020
<!-- Packages that come from https://github.com/dotnet/core-setup -->
2121
<PropertyGroup>
22-
<MicrosoftNETCoreAppInternalVersion>5.0.0-preview.8.20363.2</MicrosoftNETCoreAppInternalVersion>
23-
<MicrosoftNETCorePlatformsVersion>5.0.0-preview.8.20363.2</MicrosoftNETCorePlatformsVersion>
24-
<SystemDrawingCommonVersion>5.0.0-preview.8.20363.2</SystemDrawingCommonVersion>
25-
<SystemDirectoryServicesVersion>5.0.0-preview.8.20363.2</SystemDirectoryServicesVersion>
26-
<SystemReflectionMetadataLoadContextVersion>5.0.0-preview.8.20363.2</SystemReflectionMetadataLoadContextVersion>
22+
<MicrosoftNETCoreAppInternalVersion>5.0.0-preview.8.20367.18</MicrosoftNETCoreAppInternalVersion>
23+
<MicrosoftNETCorePlatformsVersion>5.0.0-preview.8.20367.18</MicrosoftNETCorePlatformsVersion>
24+
<SystemDrawingCommonVersion>5.0.0-preview.8.20367.18</SystemDrawingCommonVersion>
25+
<SystemDirectoryServicesVersion>5.0.0-preview.8.20367.18</SystemDirectoryServicesVersion>
26+
<SystemReflectionMetadataLoadContextVersion>5.0.0-preview.8.20367.18</SystemReflectionMetadataLoadContextVersion>
2727
</PropertyGroup>
2828
<!-- Packages that come from https://github.com/dotnet/corefx via core-setup coherency parent dependency -->
2929
<PropertyGroup>
30-
<MicrosoftWin32RegistryPackageVersion>5.0.0-preview.8.20363.2</MicrosoftWin32RegistryPackageVersion>
31-
<SystemCodeDomPackageVersion>5.0.0-preview.8.20363.2</SystemCodeDomPackageVersion>
32-
<SystemConfigurationConfigurationManagerPackageVersion>5.0.0-preview.8.20363.2</SystemConfigurationConfigurationManagerPackageVersion>
33-
<SystemDiagnosticsEventLogPackageVersion>5.0.0-preview.8.20363.2</SystemDiagnosticsEventLogPackageVersion>
30+
<MicrosoftWin32RegistryPackageVersion>5.0.0-preview.8.20367.18</MicrosoftWin32RegistryPackageVersion>
31+
<SystemCodeDomPackageVersion>5.0.0-preview.8.20367.18</SystemCodeDomPackageVersion>
32+
<SystemConfigurationConfigurationManagerPackageVersion>5.0.0-preview.8.20367.18</SystemConfigurationConfigurationManagerPackageVersion>
33+
<SystemDiagnosticsEventLogPackageVersion>5.0.0-preview.8.20367.18</SystemDiagnosticsEventLogPackageVersion>
3434
<SystemReflectionEmitPackageVersion>5.0.0-alpha.1.19563.6</SystemReflectionEmitPackageVersion>
3535
<SystemReflectionTypeExtensionsPackageVersion>4.6.0-preview4.19176.11</SystemReflectionTypeExtensionsPackageVersion>
36-
<SystemSecurityAccessControlPackageVersion>5.0.0-preview.8.20363.2</SystemSecurityAccessControlPackageVersion>
37-
<SystemSecurityCryptographyXmlPackageVersion>5.0.0-preview.8.20363.2</SystemSecurityCryptographyXmlPackageVersion>
38-
<SystemSecurityPermissionsPackageVersion>5.0.0-preview.8.20363.2</SystemSecurityPermissionsPackageVersion>
39-
<SystemSecurityPrincipalWindowsPackageVersion>5.0.0-preview.8.20363.2</SystemSecurityPrincipalWindowsPackageVersion>
40-
<SystemWindowsExtensionsPackageVersion>5.0.0-preview.8.20363.2</SystemWindowsExtensionsPackageVersion>
36+
<SystemSecurityAccessControlPackageVersion>5.0.0-preview.8.20367.18</SystemSecurityAccessControlPackageVersion>
37+
<SystemSecurityCryptographyXmlPackageVersion>5.0.0-preview.8.20367.18</SystemSecurityCryptographyXmlPackageVersion>
38+
<SystemSecurityPermissionsPackageVersion>5.0.0-preview.8.20367.18</SystemSecurityPermissionsPackageVersion>
39+
<SystemSecurityPrincipalWindowsPackageVersion>5.0.0-preview.8.20367.18</SystemSecurityPrincipalWindowsPackageVersion>
40+
<SystemWindowsExtensionsPackageVersion>5.0.0-preview.8.20367.18</SystemWindowsExtensionsPackageVersion>
4141
</PropertyGroup>
4242
<!-- Packages that come from https://github.com/dotnet/arcade -->
4343
<PropertyGroup>

‎eng/pipeline.yml‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
#
55

66
parameters:
7-
# Needed because runAsPublic is used in template expressions, which can't read from user-defined variables
8-
# Defaults to true
9-
runAsPublic: true
107
repoName: dotnet/wpf
118

129
jobs:
@@ -16,7 +13,7 @@ jobs:
1613
enablePublishBuildArtifacts: true
1714
enablePublishTestResults: false # tests run in helix
1815
enablePublishBuildAssets: true
19-
enablePublishUsingPipelines: $(_PublishUsingPipelines)
16+
enablePublishUsingPipelines: true
2017
enableTelemetry: true
2118
helixRepo: $(repoName)
2219

@@ -72,7 +69,7 @@ jobs:
7269

7370

7471
# Override some values if we're building internally
75-
- ${{ if eq(parameters.runAsPublic, 'false') }}:
72+
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
7673
# note: You have to use list syntax here (- name: value) or you will get errors about declaring the same variable multiple times
7774
- name: _PublishType
7875
value: blob
@@ -95,7 +92,7 @@ jobs:
9592
value: /p:DotNetPublishBlobFeedKey=$(dotnetfeed-storage-access-key-1)
9693
/p:DotNetPublishBlobFeedUrl=$(_PublishBlobFeedUrl)
9794
/p:DotNetPublishToBlobFeed=$(_DotNetPublishToBlobFeed)
98-
/p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines)
95+
/p:DotNetPublishUsingPipelines=true
9996
/p:DotNetArtifactsCategory=$(_DotNetArtifactsCategory)
10097
/p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat)
10198
/p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat)
@@ -111,21 +108,22 @@ jobs:
111108
value: '' #if _HelixToken is set, Creator must be empty
112109
- name: _TestHelixAgentPool
113110
value: 'Windows.10.Amd64.ClientRS5' # Preferred: 'Windows.10.Amd64%3bWindows.7.Amd64%3bWindows.10.Amd64.ClientRS5'
111+
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
114112
- group: DotNet-MSRC-Storage
115113
- name: _InternalRuntimeDownloadArgs
116114
value: /p:DotNetRuntimeSourceFeed=https://dotnetclimsrc.blob.core.windows.net/dotnet
117115
/p:DotNetRuntimeSourceFeedKey=$(dotnetclimsrc-read-sas-token-base64)
118116

119117
strategy:
120118
matrix:
121-
${{ if eq(parameters.runAsPublic, 'true') }}:
119+
${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
122120
Build_Debug_x86:
123121
_BuildConfig: Debug
124122
# override some variables for debug
125123
# _SignType has to be real for package publishing to succeed - do not override to test.
126124
Build_Release_x86:
127125
_BuildConfig: Release
128-
${{ if eq(parameters.runAsPublic, 'true') }}:
126+
${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
129127
Build_Debug_x64:
130128
_BuildConfig: Debug
131129
# override some variables for debug

‎src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/dataobject.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1768,7 +1768,10 @@ private int SaveObjectToHandle(IntPtr handle, Object data, bool doNotReallocate)
17681768

17691769
formatter = new BinaryFormatter();
17701770

1771+
#pragma warning disable MSLIB0003 // Type or member is obsolete
17711772
formatter.Serialize(stream, data);
1773+
#pragma warning restore MSLIB0003 // Type or member is obsolete
1774+
17721775
return SaveStreamToHandle(handle, stream, doNotReallocate);
17731776
}
17741777
}
@@ -3122,7 +3125,9 @@ private Object ReadObjectFromHandle(IntPtr handle, bool restrictDeserialization)
31223125
}
31233126
try
31243127
{
3128+
#pragma warning disable MSLIB0003 // Type or member is obsolete
31253129
value = formatter.Deserialize(stream);
3130+
#pragma warning restore MSLIB0003 // Type or member is obsolete
31263131
}
31273132
catch (RestrictedTypeDeserializationException)
31283133
{

0 commit comments

Comments
 (0)