Skip to content

Commit 2d0963f

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[release/10.0] Source code updates from dotnet/dotnet (#11089)
* Backflow from https://github.com/dotnet/dotnet / 9eb0ecd build 282024 [[ commit created by automation ]] * Update dependencies from https://github.com/dotnet/dotnet build 282024 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25427.104 -> 10.0.0-beta.25454.105) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.2.25427.104 -> 10.0.0-rc.2.25454.105) Added Dependencies: Microsoft.Build.Framework, Microsoft.Build.Utilities.Core (Version 15.9.20) --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent e26cd3e commit 2d0963f

File tree

11 files changed

+103
-78
lines changed

11 files changed

+103
-78
lines changed

‎build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ while [[ -h $source ]]; do
1313
done
1414

1515
scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
16-
"$scriptroot/eng/common/build.sh" --build --restore $@
16+
"$scriptroot/eng/common/build.sh" --restore --build $@

‎eng/Build.props‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<Project>
2+
3+
<!-- Only build the Microsoft.NET.Sdk.WindowsDesktop package on non-Windows. -->
4+
<ItemGroup Condition="'$(OS)' != 'Windows_NT'">
5+
<ProjectToBuild Include="$(RepoRoot)packaging/Microsoft.NET.Sdk.WindowsDesktop/Microsoft.NET.Sdk.WindowsDesktop.ArchNeutral.csproj" />
6+
<ProjectToBuild Include="$(RepoRoot)packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/Microsoft.DotNet.Wpf.ProjectTemplates.ArchNeutral.csproj" />
7+
</ItemGroup>
8+
9+
</Project>

‎eng/Tools.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<!-- Pre-download vcxproj dependencies as vcxprojs in this repo don't support NuGet package download. -->
9-
<ItemGroup>
9+
<ItemGroup Condition="'$(OS)' == 'Windows_NT'">
1010
<PackageDownload Include="Microsoft.NETCore.App.Ref" Version="[$(MicrosoftNETCoreAppRefVersion)]" Condition="'$(MicrosoftNETCoreAppRefVersion)' != ''" />
1111
<PackageDownload Include="Microsoft.NETCore.App.Runtime.$(_RuntimeIdentifier)" Version="[$(MicrosoftNETCoreAppRefVersion)]" Condition="'$(MicrosoftNETCoreAppRefVersion)' != ''" />
1212
<PackageDownload Include="Microsoft.NETCore.App.Host.$(_RuntimeIdentifier)" Version="[$(MicrosoftNETCoreAppRefVersion)]" Condition="'$(MicrosoftNETCoreAppRefVersion)' != ''" />

‎eng/Version.Details.props‎

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,36 +6,40 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet/dotnet dependencies -->
9-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25427.104</MicrosoftDotNetArcadeSdkPackageVersion>
10-
<MicrosoftDotNetCodeAnalysisPackageVersion>10.0.0-beta.25427.104</MicrosoftDotNetCodeAnalysisPackageVersion>
11-
<MicrosoftDotNetGenAPIPackageVersion>10.0.0-beta.25427.104</MicrosoftDotNetGenAPIPackageVersion>
12-
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25427.104</MicrosoftDotNetHelixSdkPackageVersion>
13-
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-rc.2.25427.104</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
14-
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.2.25427.104</MicrosoftNETCoreAppRefPackageVersion>
15-
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.2.25427.104</MicrosoftNETCorePlatformsPackageVersion>
16-
<MicrosoftPrivateWinformsPackageVersion>10.0.0-rc.2.25427.104</MicrosoftPrivateWinformsPackageVersion>
9+
<MicrosoftBuildFrameworkPackageVersion>15.9.20</MicrosoftBuildFrameworkPackageVersion>
10+
<MicrosoftBuildUtilitiesCorePackageVersion>15.9.20</MicrosoftBuildUtilitiesCorePackageVersion>
11+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25454.105</MicrosoftDotNetArcadeSdkPackageVersion>
12+
<MicrosoftDotNetCodeAnalysisPackageVersion>10.0.0-beta.25454.105</MicrosoftDotNetCodeAnalysisPackageVersion>
13+
<MicrosoftDotNetGenAPIPackageVersion>10.0.0-beta.25454.105</MicrosoftDotNetGenAPIPackageVersion>
14+
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25454.105</MicrosoftDotNetHelixSdkPackageVersion>
15+
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-rc.2.25454.105</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
16+
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.2.25454.105</MicrosoftNETCoreAppRefPackageVersion>
17+
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.2.25454.105</MicrosoftNETCorePlatformsPackageVersion>
18+
<MicrosoftPrivateWinformsPackageVersion>10.0.0-rc.2.25454.105</MicrosoftPrivateWinformsPackageVersion>
1719
<MicrosoftSourceLinkAzureReposGitPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkAzureReposGitPackageVersion>
1820
<MicrosoftSourceLinkGitHubPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkGitHubPackageVersion>
19-
<SystemCodeDomPackageVersion>10.0.0-rc.2.25427.104</SystemCodeDomPackageVersion>
20-
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-rc.2.25427.104</SystemConfigurationConfigurationManagerPackageVersion>
21-
<SystemDiagnosticsEventLogPackageVersion>10.0.0-rc.2.25427.104</SystemDiagnosticsEventLogPackageVersion>
22-
<SystemDirectoryServicesPackageVersion>10.0.0-rc.2.25427.104</SystemDirectoryServicesPackageVersion>
23-
<SystemDrawingCommonPackageVersion>10.0.0-rc.2.25427.104</SystemDrawingCommonPackageVersion>
24-
<SystemFormatsNrbfPackageVersion>10.0.0-rc.2.25427.104</SystemFormatsNrbfPackageVersion>
25-
<SystemIOPackagingPackageVersion>10.0.0-rc.2.25427.104</SystemIOPackagingPackageVersion>
26-
<SystemPrivateWindowsCoreTestUtilitiesPackageVersion>10.0.0-rc.2.25427.104</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
27-
<SystemReflectionMetadataLoadContextPackageVersion>10.0.0-rc.2.25427.104</SystemReflectionMetadataLoadContextPackageVersion>
28-
<SystemResourcesExtensionsPackageVersion>10.0.0-rc.2.25427.104</SystemResourcesExtensionsPackageVersion>
29-
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-rc.2.25427.104</SystemRuntimeSerializationFormattersPackageVersion>
30-
<SystemSecurityCryptographyXmlPackageVersion>10.0.0-rc.2.25427.104</SystemSecurityCryptographyXmlPackageVersion>
31-
<SystemSecurityPermissionsPackageVersion>10.0.0-rc.2.25427.104</SystemSecurityPermissionsPackageVersion>
32-
<SystemWindowsExtensionsPackageVersion>10.0.0-rc.2.25427.104</SystemWindowsExtensionsPackageVersion>
21+
<SystemCodeDomPackageVersion>10.0.0-rc.2.25454.105</SystemCodeDomPackageVersion>
22+
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-rc.2.25454.105</SystemConfigurationConfigurationManagerPackageVersion>
23+
<SystemDiagnosticsEventLogPackageVersion>10.0.0-rc.2.25454.105</SystemDiagnosticsEventLogPackageVersion>
24+
<SystemDirectoryServicesPackageVersion>10.0.0-rc.2.25454.105</SystemDirectoryServicesPackageVersion>
25+
<SystemDrawingCommonPackageVersion>10.0.0-rc.2.25454.105</SystemDrawingCommonPackageVersion>
26+
<SystemFormatsNrbfPackageVersion>10.0.0-rc.2.25454.105</SystemFormatsNrbfPackageVersion>
27+
<SystemIOPackagingPackageVersion>10.0.0-rc.2.25454.105</SystemIOPackagingPackageVersion>
28+
<SystemPrivateWindowsCoreTestUtilitiesPackageVersion>10.0.0-rc.2.25454.105</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
29+
<SystemReflectionMetadataLoadContextPackageVersion>10.0.0-rc.2.25454.105</SystemReflectionMetadataLoadContextPackageVersion>
30+
<SystemResourcesExtensionsPackageVersion>10.0.0-rc.2.25454.105</SystemResourcesExtensionsPackageVersion>
31+
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-rc.2.25454.105</SystemRuntimeSerializationFormattersPackageVersion>
32+
<SystemSecurityCryptographyXmlPackageVersion>10.0.0-rc.2.25454.105</SystemSecurityCryptographyXmlPackageVersion>
33+
<SystemSecurityPermissionsPackageVersion>10.0.0-rc.2.25454.105</SystemSecurityPermissionsPackageVersion>
34+
<SystemWindowsExtensionsPackageVersion>10.0.0-rc.2.25454.105</SystemWindowsExtensionsPackageVersion>
3335
<!-- _git/dotnet-wpf-int dependencies -->
3436
<MicrosoftDotNetWpfDncEngPackageVersion>10.0.0-preview.7.25317.2</MicrosoftDotNetWpfDncEngPackageVersion>
3537
</PropertyGroup>
3638
<!--Property group for alternate package version names-->
3739
<PropertyGroup>
3840
<!-- dotnet/dotnet dependencies -->
41+
<MicrosoftBuildFrameworkVersion>$(MicrosoftBuildFrameworkPackageVersion)</MicrosoftBuildFrameworkVersion>
42+
<MicrosoftBuildUtilitiesCoreVersion>$(MicrosoftBuildUtilitiesCorePackageVersion)</MicrosoftBuildUtilitiesCoreVersion>
3943
<MicrosoftDotNetArcadeSdkVersion>$(MicrosoftDotNetArcadeSdkPackageVersion)</MicrosoftDotNetArcadeSdkVersion>
4044
<MicrosoftDotNetCodeAnalysisVersion>$(MicrosoftDotNetCodeAnalysisPackageVersion)</MicrosoftDotNetCodeAnalysisVersion>
4145
<MicrosoftDotNetGenAPIVersion>$(MicrosoftDotNetGenAPIPackageVersion)</MicrosoftDotNetGenAPIVersion>

‎eng/Version.Details.xml‎

Lines changed: 53 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,100 +1,108 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3" BarId="281128" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad" BarId="282024" />
44
<ProductDependencies>
5-
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.0-rc.2.25427.104">
5+
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.0-rc.2.25454.105">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3</Sha>
7+
<Sha>9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-rc.2.25427.104">
9+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-rc.2.25454.105">
1010
<Uri>https://github.com/dotnet/dotnet</Uri>
11-
<Sha>7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3</Sha>
11+
<Sha>9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad</Sha>
1212
</Dependency>
13-
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-rc.2.25427.104">
13+
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-rc.2.25454.105">
1414
<Uri>https://github.com/dotnet/dotnet</Uri>
15-
<Sha>7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3</Sha>
15+
<Sha>9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad</Sha>
1616
</Dependency>
17-
<Dependency Name="System.Windows.Extensions" Version="10.0.0-rc.2.25427.104">
17+
<Dependency Name="System.Windows.Extensions" Version="10.0.0-rc.2.25454.105">
1818
<Uri>https://github.com/dotnet/dotnet</Uri>
19-
<Sha>7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3</Sha>
19+
<Sha>9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.2.25427.104">
21+
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.2.25454.105">
2222
<Uri>https://github.com/dotnet/dotnet</Uri>
23-
<Sha>7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3</Sha>
23+
<Sha>9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad</Sha>
2424
</Dependency>
2525
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="10.0.0-preview.7.25317.2">
2626
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
2727
<Sha>8a6c1d81657ef04c040f598cafacf8f5a33abda2</Sha>
2828
</Dependency>
29-
<Dependency Name="System.Resources.Extensions" Version="10.0.0-rc.2.25427.104">
29+
<Dependency Name="System.Resources.Extensions" Version="10.0.0-rc.2.25454.105">
3030
<Uri>https://github.com/dotnet/dotnet</Uri>
31-
<Sha>7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3</Sha>
31+
<Sha>9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad</Sha>
3232
</Dependency>
33-
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-rc.2.25427.104">
33+
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-rc.2.25454.105">
3434
<Uri>https://github.com/dotnet/dotnet</Uri>
35-
<Sha>7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3</Sha>
35+
<Sha>9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.2.25427.104">
37+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.2.25454.105">
3838
<Uri>https://github.com/dotnet/dotnet</Uri>
39-
<Sha>7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3</Sha>
39+
<Sha>9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad</Sha>
4040
</Dependency>
41-
<Dependency Name="System.CodeDom" Version="10.0.0-rc.2.25427.104">
41+
<Dependency Name="System.CodeDom" Version="10.0.0-rc.2.25454.105">
4242
<Uri>https://github.com/dotnet/dotnet</Uri>
43-
<Sha>7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3</Sha>
43+
<Sha>9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad</Sha>
4444
</Dependency>
45-
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-rc.2.25427.104">
45+
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-rc.2.25454.105">
4646
<Uri>https://github.com/dotnet/dotnet</Uri>
47-
<Sha>7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3</Sha>
47+
<Sha>9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad</Sha>
4848
</Dependency>
49-
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.0-rc.2.25427.104">
49+
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.0-rc.2.25454.105">
5050
<Uri>https://github.com/dotnet/dotnet</Uri>
51-
<Sha>7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3</Sha>
51+
<Sha>9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad</Sha>
5252
</Dependency>
53-
<Dependency Name="System.DirectoryServices" Version="10.0.0-rc.2.25427.104">
53+
<Dependency Name="System.DirectoryServices" Version="10.0.0-rc.2.25454.105">
5454
<Uri>https://github.com/dotnet/dotnet</Uri>
55-
<Sha>7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3</Sha>
55+
<Sha>9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad</Sha>
5656
</Dependency>
57-
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-rc.2.25427.104">
57+
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-rc.2.25454.105">
5858
<Uri>https://github.com/dotnet/dotnet</Uri>
59-
<Sha>7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3</Sha>
59+
<Sha>9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad</Sha>
6060
</Dependency>
61-
<Dependency Name="System.IO.Packaging" Version="10.0.0-rc.2.25427.104">
61+
<Dependency Name="System.IO.Packaging" Version="10.0.0-rc.2.25454.105">
6262
<Uri>https://github.com/dotnet/dotnet</Uri>
63-
<Sha>7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3</Sha>
63+
<Sha>9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad</Sha>
6464
</Dependency>
65-
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0-rc.2.25427.104">
65+
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0-rc.2.25454.105">
6666
<Uri>https://github.com/dotnet/dotnet</Uri>
67-
<Sha>7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3</Sha>
67+
<Sha>9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad</Sha>
6868
</Dependency>
69-
<Dependency Name="System.Security.Permissions" Version="10.0.0-rc.2.25427.104">
69+
<Dependency Name="System.Security.Permissions" Version="10.0.0-rc.2.25454.105">
7070
<Uri>https://github.com/dotnet/dotnet</Uri>
71-
<Sha>7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3</Sha>
71+
<Sha>9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad</Sha>
7272
</Dependency>
73-
<Dependency Name="System.Drawing.Common" Version="10.0.0-rc.2.25427.104">
73+
<Dependency Name="System.Drawing.Common" Version="10.0.0-rc.2.25454.105">
7474
<Uri>https://github.com/dotnet/dotnet</Uri>
75-
<Sha>7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3</Sha>
75+
<Sha>9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad</Sha>
76+
</Dependency>
77+
<Dependency Name="Microsoft.Build.Framework" Version="15.9.20">
78+
<Uri>https://github.com/dotnet/dotnet</Uri>
79+
<Sha>520c71b5277fc1f72dbec14da03ca55205d6c8e5</Sha>
80+
</Dependency>
81+
<Dependency Name="Microsoft.Build.Utilities.Core" Version="15.9.20">
82+
<Uri>https://github.com/dotnet/dotnet</Uri>
83+
<Sha>520c71b5277fc1f72dbec14da03ca55205d6c8e5</Sha>
7684
</Dependency>
7785
</ProductDependencies>
7886
<ToolsetDependencies>
79-
<Dependency Name="System.Private.Windows.Core.TestUtilities" Version="10.0.0-rc.2.25427.104">
87+
<Dependency Name="System.Private.Windows.Core.TestUtilities" Version="10.0.0-rc.2.25454.105">
8088
<Uri>https://github.com/dotnet/dotnet</Uri>
81-
<Sha>7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3</Sha>
89+
<Sha>9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad</Sha>
8290
</Dependency>
83-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25427.104">
91+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25454.105">
8492
<Uri>https://github.com/dotnet/dotnet</Uri>
85-
<Sha>7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3</Sha>
93+
<Sha>9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad</Sha>
8694
</Dependency>
87-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25427.104">
95+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25454.105">
8896
<Uri>https://github.com/dotnet/dotnet</Uri>
89-
<Sha>7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3</Sha>
97+
<Sha>9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad</Sha>
9098
</Dependency>
91-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25427.104">
99+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25454.105">
92100
<Uri>https://github.com/dotnet/dotnet</Uri>
93-
<Sha>7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3</Sha>
101+
<Sha>9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad</Sha>
94102
</Dependency>
95-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25427.104">
103+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25454.105">
96104
<Uri>https://github.com/dotnet/dotnet</Uri>
97-
<Sha>7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3</Sha>
105+
<Sha>9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad</Sha>
98106
</Dependency>
99107
<!-- TODO: Unpin sourcelink dependencies: https://github.com/dotnet/wpf/issues/11042 -->
100108
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0-beta.23409.2" Pinned="true">

‎eng/Versions.props‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@
3939
</PropertyGroup>
4040
<!-- Other Packages that require manual updating-->
4141
<PropertyGroup>
42-
<MicrosoftBuildFrameworkPackageVersion>15.9.20</MicrosoftBuildFrameworkPackageVersion>
43-
<MicrosoftBuildUtilitiesCorePackageVersion>15.9.20</MicrosoftBuildUtilitiesCorePackageVersion>
4442
<!--
4543
Also in global.json
4644
Used in Wpf.Cpp.PrivateTools.props/targets

‎eng/WpfArcadeSdk/tools/ApiCompat.targets‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<RunNetFrameworkApiCompat Condition="'$(Net48CompatNeededProjects)'!=''
99
and $(Net48CompatNeededProjects.Contains('$(MSBuildProjectName);'))
1010
and !($(MSBuildProjectName.Contains('_wpftmp')))">true</RunNetFrameworkApiCompat>
11+
<RunNetFrameworkApiCompat Condition="'$(OS)' != 'Windows_NT'">false</RunNetFrameworkApiCompat>
1112
</PropertyGroup>
1213

1314
<!-- Only enable Ref API Compat for the lib projects using hand-crafted reference assemblies,

‎eng/common/sdk-task.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ show_usage() {
1010

1111
echo "Advanced settings:"
1212
echo " --excludeCIBinarylog Don't output binary log (short: -nobl)"
13-
echo " --noWarnAsError Do not warn as error
13+
echo " --noWarnAsError Do not warn as error"
1414
echo ""
1515
echo "Command line arguments not listed above are passed thru to msbuild."
1616
}

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
}
2525
},
2626
"msbuild-sdks": {
27-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25427.104",
28-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25427.104",
27+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25454.105",
28+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25454.105",
2929
"Microsoft.Build.NoTargets": "3.7.56"
3030
},
3131
"native-tools": {

‎packaging/Microsoft.NET.Sdk.WindowsDesktop/Microsoft.NET.Sdk.WindowsDesktop.ArchNeutral.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@
2727
<PackagingContent Include="useSharedDesignerContext.txt" SubFolder="root" />
2828
</ItemGroup>
2929

30+
<ItemGroup>
31+
<ProjectReference Include="$(RepoRoot)src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
32+
</ItemGroup>
33+
3034
<!-- Windows Forms validation and packaging -->
3135
<Import Project="Microsoft.NET.Sdk.WindowsDesktop.WinForms.Packaging.targets" />
3236

0 commit comments

Comments
 (0)