Skip to content

Commit 3b4ce6b

Browse files
EvangelinkEvangelink
authored
Merge branch 'main' into post-process-modify-json
2 parents cf1cc5e + 8ca5983 commit 3b4ce6b

File tree

3 files changed

+71
-21
lines changed

3 files changed

+71
-21
lines changed

‎eng/Version.Details.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -246,26 +246,26 @@
246246
<Uri>https://github.com/dotnet/runtime</Uri>
247247
<Sha>4e278fe17f69ea31fbdcbab74ac47ec6fa84914b</Sha>
248248
</Dependency>
249-
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="9.0.0-preview.7.24356.1">
249+
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="9.0.0-preview.7.24358.1">
250250
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
251-
<Sha>0cca37b32178ab2fb6152bde07e1780faf3047c8</Sha>
251+
<Sha>0eeab8c29264f9337035f25fd8a3019c390e24a1</Sha>
252252
<SourceBuildTarball RepoName="windowsdesktop" ManagedOnly="true" />
253253
</Dependency>
254-
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0" Version="9.0.0-preview.7.24356.1">
254+
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0" Version="9.0.0-preview.7.24358.1">
255255
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
256-
<Sha>0cca37b32178ab2fb6152bde07e1780faf3047c8</Sha>
256+
<Sha>0eeab8c29264f9337035f25fd8a3019c390e24a1</Sha>
257257
</Dependency>
258-
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="9.0.0-preview.7.24356.1">
258+
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="9.0.0-preview.7.24358.1">
259259
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
260-
<Sha>0cca37b32178ab2fb6152bde07e1780faf3047c8</Sha>
260+
<Sha>0eeab8c29264f9337035f25fd8a3019c390e24a1</Sha>
261261
</Dependency>
262-
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0" Version="9.0.0-preview.7.24356.1">
262+
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0" Version="9.0.0-preview.7.24358.1">
263263
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
264-
<Sha>0cca37b32178ab2fb6152bde07e1780faf3047c8</Sha>
264+
<Sha>0eeab8c29264f9337035f25fd8a3019c390e24a1</Sha>
265265
</Dependency>
266-
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="9.0.0-preview.7.24355.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
266+
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="9.0.0-preview.7.24358.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
267267
<Uri>https://github.com/dotnet/wpf</Uri>
268-
<Sha>c1c7ee070a18ed4131c1ebfd06ae69dc9bacc220</Sha>
268+
<Sha>683b166f65e6a98d5cc1d909eb0adad4c9416209</Sha>
269269
</Dependency>
270270
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.0-preview.7.24358.3">
271271
<Uri>https://github.com/dotnet/aspnetcore</Uri>
@@ -382,13 +382,13 @@
382382
<SourceBuild RepoName="test-templates" ManagedOnly="true" />
383383
</Dependency>
384384
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
385-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="9.0.0-preview.7.24355.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
385+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="9.0.0-preview.7.24357.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
386386
<Uri>https://github.com/dotnet/winforms</Uri>
387-
<Sha>ebecf6f585267fa73352801c9ec31b98a6cae5ec</Sha>
387+
<Sha>10f120ddca8dc60568e4b9cb93667e90746aade3</Sha>
388388
</Dependency>
389-
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="9.0.0-preview.7.24355.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
389+
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="9.0.0-preview.7.24358.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
390390
<Uri>https://github.com/dotnet/wpf</Uri>
391-
<Sha>c1c7ee070a18ed4131c1ebfd06ae69dc9bacc220</Sha>
391+
<Sha>683b166f65e6a98d5cc1d909eb0adad4c9416209</Sha>
392392
</Dependency>
393393
<Dependency Name="Microsoft.Web.Xdt" Version="9.0.0-preview.24317.2">
394394
<Uri>https://github.com/dotnet/xdt</Uri>

‎eng/Versions.props

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
</PropertyGroup>
120120
<PropertyGroup>
121121
<!-- Dependency from https://github.com/dotnet/winforms -->
122-
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>9.0.0-preview.7.24355.1</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
122+
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>9.0.0-preview.7.24357.1</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
123123
</PropertyGroup>
124124
<PropertyGroup>
125125
<!-- Dependency from https://github.com/dotnet/test-templates -->
@@ -163,10 +163,10 @@
163163
</PropertyGroup>
164164
<PropertyGroup>
165165
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
166-
<VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>9.0.0-preview.7.24356.1</VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>
167-
<VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>9.0.0-preview.7.24356.1</VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>
168-
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>9.0.0-preview.7.24356.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
169-
<MicrosoftWindowsDesktopAppRefPackageVersion>9.0.0-preview.7.24356.1</MicrosoftWindowsDesktopAppRefPackageVersion>
166+
<VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>9.0.0-preview.7.24358.1</VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>
167+
<VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>9.0.0-preview.7.24358.1</VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>
168+
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>9.0.0-preview.7.24358.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
169+
<MicrosoftWindowsDesktopAppRefPackageVersion>9.0.0-preview.7.24358.1</MicrosoftWindowsDesktopAppRefPackageVersion>
170170
</PropertyGroup>
171171
<PropertyGroup>
172172
<!-- Dependencies from https://github.com/nuget/nuget.client -->
@@ -271,8 +271,8 @@
271271
</PropertyGroup>
272272
<PropertyGroup>
273273
<!-- Dependencies from https://github.com/dotnet/wpf -->
274-
<MicrosoftNETSdkWindowsDesktopPackageVersion>9.0.0-preview.7.24355.1</MicrosoftNETSdkWindowsDesktopPackageVersion>
275-
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>9.0.0-preview.7.24355.1</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
274+
<MicrosoftNETSdkWindowsDesktopPackageVersion>9.0.0-preview.7.24358.2</MicrosoftNETSdkWindowsDesktopPackageVersion>
275+
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>9.0.0-preview.7.24358.2</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
276276
</PropertyGroup>
277277
<PropertyGroup Label="Runtime and Apphost aliases">
278278
<!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 version above and create aliases without the winx64 here for clarity elsewhere. -->

‎src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -504,6 +504,16 @@ Copyright (c) .NET Foundation. All rights reserved.
504504
Value="$(_AggressiveAttributeTrimming)"
505505
Trim="true" />
506506

507+
<RuntimeHostConfigurationOption Include="System.ComponentModel.DefaultValueAttribute.IsSupported"
508+
Condition="'$(_DefaultValueAttributeSupport)' != ''"
509+
Value="$(_DefaultValueAttributeSupport)"
510+
Trim="true" />
511+
512+
<RuntimeHostConfigurationOption Include="System.ComponentModel.Design.IDesignerHost.IsSupported"
513+
Condition="'$(_DesignerHostSupport)' != ''"
514+
Value="$(_DesignerHostSupport)"
515+
Trim="true" />
516+
507517
<RuntimeHostConfigurationOption Include="System.ComponentModel.TypeConverter.EnableUnsafeBinaryFormatterInDesigntimeLicenseContextSerialization"
508518
Condition="'$(EnableUnsafeBinaryFormatterInDesigntimeLicenseContextSerialization)' != ''"
509519
Value="$(EnableUnsafeBinaryFormatterInDesigntimeLicenseContextSerialization)"
@@ -534,6 +544,11 @@ Copyright (c) .NET Foundation. All rights reserved.
534544
Value="$(EventSourceSupport)"
535545
Trim="true" />
536546

547+
<RuntimeHostConfigurationOption Include="System.Drawing.Design.UITypeEditor.IsSupported"
548+
Condition="'$(_WinFormsUITypeEditorSupport)' != ''"
549+
Value="$(_WinFormsUITypeEditorSupport)"
550+
Trim="true" />
551+
537552
<RuntimeHostConfigurationOption Include="System.GC.Concurrent"
538553
Condition="'$(ConcurrentGarbageCollection)' != ''"
539554
Value="$(ConcurrentGarbageCollection)" />
@@ -683,6 +698,41 @@ Copyright (c) .NET Foundation. All rights reserved.
683698
Value="$(UseWindowsThreadPool)"
684699
Trim="true" />
685700

701+
<RuntimeHostConfigurationOption Include="System.Windows.Forms.ActiveXImpl.IsSupported"
702+
Condition="'$(_ActiveXImplSupport)' != ''"
703+
Value="$(_ActiveXImplSupport)"
704+
Trim="true" />
705+
706+
<RuntimeHostConfigurationOption Include="System.Windows.Forms.Binding.IsSupported"
707+
Condition="'$(_WinFormsBindingSupport)' != ''"
708+
Value="$(_WinFormsBindingSupport)"
709+
Trim="true" />
710+
711+
<RuntimeHostConfigurationOption Include="System.Windows.Forms.Control.AreDesignTimeFeaturesSupported"
712+
Condition="'$(_WinFormsDesignTimeFeaturesSupport)' != ''"
713+
Value="$(_WinFormsDesignTimeFeaturesSupport)"
714+
Trim="true" />
715+
716+
<RuntimeHostConfigurationOption Include="System.Windows.Forms.Control.UseComponentModelRegisteredTypes"
717+
Condition="'$(_UseComponentModelRegisteredTypes)' != ''"
718+
Value="$(_UseComponentModelRegisteredTypes)"
719+
Trim="true" />
720+
721+
<RuntimeHostConfigurationOption Include="System.Windows.Forms.ImageIndexConverter.IsSupported"
722+
Condition="'$(_WinFormsImageIndexConverterSupport)' != ''"
723+
Value="$(_WinFormsImageIndexConverterSupport)"
724+
Trim="true" />
725+
726+
<RuntimeHostConfigurationOption Include="System.Windows.Forms.MdiWindowDialog.IsSupported"
727+
Condition="'$(_MdiWindowDialogSupport)' != ''"
728+
Value="$(_MdiWindowDialogSupport)"
729+
Trim="true" />
730+
731+
<RuntimeHostConfigurationOption Include="System.Windows.Forms.Primitives.TypeConverterHelper.UseComponentModelRegisteredTypes"
732+
Condition="'$(_UseComponentModelRegisteredTypes)' != ''"
733+
Value="$(_UseComponentModelRegisteredTypes)"
734+
Trim="true" />
735+
686736
<RuntimeHostConfigurationOption Include="System.Xml.XmlResolver.IsNetworkingEnabledByDefault"
687737
Condition="'$(XmlResolverIsNetworkingEnabledByDefault)' != ''"
688738
Value="$(XmlResolverIsNetworkingEnabledByDefault)"

0 commit comments

Comments
 (0)