Skip to content

Commit 43373ce

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Source code updates from dotnet/dotnet (#13869)
[main] Source code updates from dotnet/dotnet
1 parent 72071d1 commit 43373ce

File tree

7 files changed

+132
-79
lines changed

7 files changed

+132
-79
lines changed

‎Directory.Packages.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
<PackageVersion Include="System.Windows.Forms.DataVisualization" Version="1.0.0-prerelease.20110.1" />
2828

2929
<!-- Arcade -->
30+
<PackageVersion Include="Microsoft.DotNet.Build.Tasks.Templating" Version="$(MicrosoftDotNetBuildTasksTemplatingPackageVersion)" />
3031
<PackageVersion Include="Microsoft.DotNet.GenFacades" Version="$(MicrosoftDotNetGenFacadesPackageVersion)" />
3132

3233
<!-- Test related -->

‎eng/Version.Details.props‎

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,35 +6,37 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet/dotnet dependencies -->
9-
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25460.106</MicrosoftDotNetArcadeSdkPackageVersion>
10-
<MicrosoftDotNetCMakeSdkPackageVersion>11.0.0-beta.25460.106</MicrosoftDotNetCMakeSdkPackageVersion>
11-
<MicrosoftDotNetGenFacadesPackageVersion>11.0.0-beta.25460.106</MicrosoftDotNetGenFacadesPackageVersion>
12-
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25460.106</MicrosoftDotNetHelixSdkPackageVersion>
13-
<MicrosoftDotNetRemoteExecutorPackageVersion>11.0.0-beta.25460.106</MicrosoftDotNetRemoteExecutorPackageVersion>
14-
<MicrosoftDotNetXUnitV3ExtensionsPackageVersion>11.0.0-beta.25460.106</MicrosoftDotNetXUnitV3ExtensionsPackageVersion>
15-
<MicrosoftNETSdkILPackageVersion>10.0.0-rc.1.25460.106</MicrosoftNETSdkILPackageVersion>
16-
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.1.25460.106</MicrosoftNETCoreAppRefPackageVersion>
17-
<MicrosoftNETCoreILAsmPackageVersion>10.0.0-rc.1.25460.106</MicrosoftNETCoreILAsmPackageVersion>
18-
<MicrosoftNETCoreILDAsmPackageVersion>10.0.0-rc.1.25460.106</MicrosoftNETCoreILDAsmPackageVersion>
19-
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.1.25460.106</MicrosoftNETCorePlatformsPackageVersion>
20-
<MicrosoftWin32SystemEventsPackageVersion>10.0.0-rc.1.25460.106</MicrosoftWin32SystemEventsPackageVersion>
21-
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>10.0.0-rc.1.25460.106</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
22-
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>10.0.0-rc.1.25460.106</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
23-
<SystemCodeDomPackageVersion>10.0.0-rc.1.25460.106</SystemCodeDomPackageVersion>
24-
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-rc.1.25460.106</SystemConfigurationConfigurationManagerPackageVersion>
25-
<SystemFormatsNrbfPackageVersion>10.0.0-rc.1.25460.106</SystemFormatsNrbfPackageVersion>
26-
<SystemIOHashingPackageVersion>10.0.0-rc.1.25460.106</SystemIOHashingPackageVersion>
27-
<SystemReflectionMetadataLoadContextPackageVersion>10.0.0-rc.1.25460.106</SystemReflectionMetadataLoadContextPackageVersion>
28-
<SystemResourcesExtensionsPackageVersion>10.0.0-rc.1.25460.106</SystemResourcesExtensionsPackageVersion>
29-
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-rc.1.25460.106</SystemRuntimeSerializationFormattersPackageVersion>
30-
<SystemTextEncodingsWebPackageVersion>10.0.0-rc.1.25460.106</SystemTextEncodingsWebPackageVersion>
31-
<SystemTextJsonPackageVersion>10.0.0-rc.1.25460.106</SystemTextJsonPackageVersion>
32-
<SystemWindowsExtensionsPackageVersion>10.0.0-rc.1.25460.106</SystemWindowsExtensionsPackageVersion>
9+
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25462.102</MicrosoftDotNetArcadeSdkPackageVersion>
10+
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.25462.102</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
11+
<MicrosoftDotNetCMakeSdkPackageVersion>11.0.0-beta.25462.102</MicrosoftDotNetCMakeSdkPackageVersion>
12+
<MicrosoftDotNetGenFacadesPackageVersion>11.0.0-beta.25462.102</MicrosoftDotNetGenFacadesPackageVersion>
13+
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25462.102</MicrosoftDotNetHelixSdkPackageVersion>
14+
<MicrosoftDotNetRemoteExecutorPackageVersion>11.0.0-beta.25462.102</MicrosoftDotNetRemoteExecutorPackageVersion>
15+
<MicrosoftDotNetXUnitV3ExtensionsPackageVersion>11.0.0-beta.25462.102</MicrosoftDotNetXUnitV3ExtensionsPackageVersion>
16+
<MicrosoftNETSdkILPackageVersion>10.0.0-rc.1.25462.102</MicrosoftNETSdkILPackageVersion>
17+
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.1.25462.102</MicrosoftNETCoreAppRefPackageVersion>
18+
<MicrosoftNETCoreILAsmPackageVersion>10.0.0-rc.1.25462.102</MicrosoftNETCoreILAsmPackageVersion>
19+
<MicrosoftNETCoreILDAsmPackageVersion>10.0.0-rc.1.25462.102</MicrosoftNETCoreILDAsmPackageVersion>
20+
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.1.25462.102</MicrosoftNETCorePlatformsPackageVersion>
21+
<MicrosoftWin32SystemEventsPackageVersion>10.0.0-rc.1.25462.102</MicrosoftWin32SystemEventsPackageVersion>
22+
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>10.0.0-rc.1.25462.102</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
23+
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>10.0.0-rc.1.25462.102</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
24+
<SystemCodeDomPackageVersion>10.0.0-rc.1.25462.102</SystemCodeDomPackageVersion>
25+
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-rc.1.25462.102</SystemConfigurationConfigurationManagerPackageVersion>
26+
<SystemFormatsNrbfPackageVersion>10.0.0-rc.1.25462.102</SystemFormatsNrbfPackageVersion>
27+
<SystemIOHashingPackageVersion>10.0.0-rc.1.25462.102</SystemIOHashingPackageVersion>
28+
<SystemReflectionMetadataLoadContextPackageVersion>10.0.0-rc.1.25462.102</SystemReflectionMetadataLoadContextPackageVersion>
29+
<SystemResourcesExtensionsPackageVersion>10.0.0-rc.1.25462.102</SystemResourcesExtensionsPackageVersion>
30+
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-rc.1.25462.102</SystemRuntimeSerializationFormattersPackageVersion>
31+
<SystemTextEncodingsWebPackageVersion>10.0.0-rc.1.25462.102</SystemTextEncodingsWebPackageVersion>
32+
<SystemTextJsonPackageVersion>10.0.0-rc.1.25462.102</SystemTextJsonPackageVersion>
33+
<SystemWindowsExtensionsPackageVersion>10.0.0-rc.1.25462.102</SystemWindowsExtensionsPackageVersion>
3334
</PropertyGroup>
3435
<!--Property group for alternate package version names-->
3536
<PropertyGroup>
3637
<!-- dotnet/dotnet dependencies -->
3738
<MicrosoftDotNetArcadeSdkVersion>$(MicrosoftDotNetArcadeSdkPackageVersion)</MicrosoftDotNetArcadeSdkVersion>
39+
<MicrosoftDotNetBuildTasksTemplatingVersion>$(MicrosoftDotNetBuildTasksTemplatingPackageVersion)</MicrosoftDotNetBuildTasksTemplatingVersion>
3840
<MicrosoftDotNetCMakeSdkVersion>$(MicrosoftDotNetCMakeSdkPackageVersion)</MicrosoftDotNetCMakeSdkVersion>
3941
<MicrosoftDotNetGenFacadesVersion>$(MicrosoftDotNetGenFacadesPackageVersion)</MicrosoftDotNetGenFacadesVersion>
4042
<MicrosoftDotNetHelixSdkVersion>$(MicrosoftDotNetHelixSdkPackageVersion)</MicrosoftDotNetHelixSdkVersion>

‎eng/Version.Details.xml‎

Lines changed: 53 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -6,106 +6,110 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
66
And you can check these with "darc get-dependencies <dash dash>target-repo "winforms"
77
-->
88
<Dependencies>
9-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="winforms" Sha="a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f" BarId="282722" />
9+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="winforms" Sha="4a5547e595c1de7151072ac48abd1e23cdd9e085" BarId="283019" />
1010
<ProductDependencies>
11-
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.1.25460.106">
11+
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.1.25462.102">
1212
<Uri>https://github.com/dotnet/dotnet</Uri>
13-
<Sha>a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f</Sha>
13+
<Sha>4a5547e595c1de7151072ac48abd1e23cdd9e085</Sha>
1414
</Dependency>
15-
<Dependency Name="System.Resources.Extensions" Version="10.0.0-rc.1.25460.106">
15+
<Dependency Name="System.Resources.Extensions" Version="10.0.0-rc.1.25462.102">
1616
<Uri>https://github.com/dotnet/dotnet</Uri>
17-
<Sha>a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f</Sha>
17+
<Sha>4a5547e595c1de7151072ac48abd1e23cdd9e085</Sha>
1818
</Dependency>
19-
<Dependency Name="System.Windows.Extensions" Version="10.0.0-rc.1.25460.106">
19+
<Dependency Name="System.Windows.Extensions" Version="10.0.0-rc.1.25462.102">
2020
<Uri>https://github.com/dotnet/dotnet</Uri>
21-
<Sha>a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f</Sha>
21+
<Sha>4a5547e595c1de7151072ac48abd1e23cdd9e085</Sha>
2222
</Dependency>
23-
<Dependency Name="Microsoft.NET.Sdk.IL" Version="10.0.0-rc.1.25460.106">
23+
<Dependency Name="Microsoft.NET.Sdk.IL" Version="10.0.0-rc.1.25462.102">
2424
<Uri>https://github.com/dotnet/dotnet</Uri>
25-
<Sha>a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f</Sha>
25+
<Sha>4a5547e595c1de7151072ac48abd1e23cdd9e085</Sha>
2626
</Dependency>
27-
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.0-rc.1.25460.106">
27+
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.0-rc.1.25462.102">
2828
<Uri>https://github.com/dotnet/dotnet</Uri>
29-
<Sha>a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f</Sha>
29+
<Sha>4a5547e595c1de7151072ac48abd1e23cdd9e085</Sha>
3030
</Dependency>
31-
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="10.0.0-rc.1.25460.106">
31+
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="10.0.0-rc.1.25462.102">
3232
<Uri>https://github.com/dotnet/dotnet</Uri>
33-
<Sha>a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f</Sha>
33+
<Sha>4a5547e595c1de7151072ac48abd1e23cdd9e085</Sha>
3434
</Dependency>
35-
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="10.0.0-rc.1.25460.106">
35+
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="10.0.0-rc.1.25462.102">
3636
<Uri>https://github.com/dotnet/dotnet</Uri>
37-
<Sha>a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f</Sha>
37+
<Sha>4a5547e595c1de7151072ac48abd1e23cdd9e085</Sha>
3838
</Dependency>
39-
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-rc.1.25460.106">
39+
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-rc.1.25462.102">
4040
<Uri>https://github.com/dotnet/dotnet</Uri>
41-
<Sha>a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f</Sha>
41+
<Sha>4a5547e595c1de7151072ac48abd1e23cdd9e085</Sha>
4242
</Dependency>
43-
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="10.0.0-rc.1.25460.106">
43+
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="10.0.0-rc.1.25462.102">
4444
<Uri>https://github.com/dotnet/dotnet</Uri>
45-
<Sha>a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f</Sha>
45+
<Sha>4a5547e595c1de7151072ac48abd1e23cdd9e085</Sha>
4646
</Dependency>
47-
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-rc.1.25460.106">
47+
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-rc.1.25462.102">
4848
<Uri>https://github.com/dotnet/dotnet</Uri>
49-
<Sha>a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f</Sha>
49+
<Sha>4a5547e595c1de7151072ac48abd1e23cdd9e085</Sha>
5050
</Dependency>
51-
<Dependency Name="System.Text.Json" Version="10.0.0-rc.1.25460.106">
51+
<Dependency Name="System.Text.Json" Version="10.0.0-rc.1.25462.102">
5252
<Uri>https://github.com/dotnet/dotnet</Uri>
53-
<Sha>a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f</Sha>
53+
<Sha>4a5547e595c1de7151072ac48abd1e23cdd9e085</Sha>
5454
</Dependency>
55-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.1.25460.106">
55+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.1.25462.102">
5656
<Uri>https://github.com/dotnet/dotnet</Uri>
57-
<Sha>a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f</Sha>
57+
<Sha>4a5547e595c1de7151072ac48abd1e23cdd9e085</Sha>
5858
</Dependency>
59-
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-rc.1.25460.106">
59+
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-rc.1.25462.102">
6060
<Uri>https://github.com/dotnet/dotnet</Uri>
61-
<Sha>a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f</Sha>
61+
<Sha>4a5547e595c1de7151072ac48abd1e23cdd9e085</Sha>
6262
</Dependency>
63-
<Dependency Name="Microsoft.Win32.SystemEvents" Version="10.0.0-rc.1.25460.106">
63+
<Dependency Name="Microsoft.Win32.SystemEvents" Version="10.0.0-rc.1.25462.102">
6464
<Uri>https://github.com/dotnet/dotnet</Uri>
65-
<Sha>a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f</Sha>
65+
<Sha>4a5547e595c1de7151072ac48abd1e23cdd9e085</Sha>
6666
</Dependency>
67-
<Dependency Name="System.CodeDom" Version="10.0.0-rc.1.25460.106">
67+
<Dependency Name="System.CodeDom" Version="10.0.0-rc.1.25462.102">
6868
<Uri>https://github.com/dotnet/dotnet</Uri>
69-
<Sha>a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f</Sha>
69+
<Sha>4a5547e595c1de7151072ac48abd1e23cdd9e085</Sha>
7070
</Dependency>
71-
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-rc.1.25460.106">
71+
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-rc.1.25462.102">
7272
<Uri>https://github.com/dotnet/dotnet</Uri>
73-
<Sha>a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f</Sha>
73+
<Sha>4a5547e595c1de7151072ac48abd1e23cdd9e085</Sha>
7474
</Dependency>
75-
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-rc.1.25460.106">
75+
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-rc.1.25462.102">
7676
<Uri>https://github.com/dotnet/dotnet</Uri>
77-
<Sha>a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f</Sha>
77+
<Sha>4a5547e595c1de7151072ac48abd1e23cdd9e085</Sha>
7878
</Dependency>
79-
<Dependency Name="System.IO.Hashing" Version="10.0.0-rc.1.25460.106">
79+
<Dependency Name="System.IO.Hashing" Version="10.0.0-rc.1.25462.102">
8080
<Uri>https://github.com/dotnet/dotnet</Uri>
81-
<Sha>a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f</Sha>
81+
<Sha>4a5547e595c1de7151072ac48abd1e23cdd9e085</Sha>
8282
</Dependency>
8383
</ProductDependencies>
8484
<ToolsetDependencies>
8585
<!-- Arcade -->
86-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25460.106">
86+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25462.102">
8787
<Uri>https://github.com/dotnet/dotnet</Uri>
88-
<Sha>a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f</Sha>
88+
<Sha>4a5547e595c1de7151072ac48abd1e23cdd9e085</Sha>
8989
</Dependency>
90-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="11.0.0-beta.25460.106">
90+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="11.0.0-beta.25462.102">
9191
<Uri>https://github.com/dotnet/dotnet</Uri>
92-
<Sha>a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f</Sha>
92+
<Sha>4a5547e595c1de7151072ac48abd1e23cdd9e085</Sha>
9393
</Dependency>
94-
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="11.0.0-beta.25460.106">
94+
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="11.0.0-beta.25462.102">
9595
<Uri>https://github.com/dotnet/dotnet</Uri>
96-
<Sha>a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f</Sha>
96+
<Sha>4a5547e595c1de7151072ac48abd1e23cdd9e085</Sha>
9797
</Dependency>
98-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25460.106">
98+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25462.102">
9999
<Uri>https://github.com/dotnet/dotnet</Uri>
100-
<Sha>a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f</Sha>
100+
<Sha>4a5547e595c1de7151072ac48abd1e23cdd9e085</Sha>
101101
</Dependency>
102-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="11.0.0-beta.25460.106">
102+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="11.0.0-beta.25462.102">
103103
<Uri>https://github.com/dotnet/dotnet</Uri>
104-
<Sha>a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f</Sha>
104+
<Sha>4a5547e595c1de7151072ac48abd1e23cdd9e085</Sha>
105105
</Dependency>
106-
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="11.0.0-beta.25460.106">
106+
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="11.0.0-beta.25462.102">
107107
<Uri>https://github.com/dotnet/dotnet</Uri>
108-
<Sha>a5396f9feba85ccf4370b5a5dcebb6a77ff2f68f</Sha>
108+
<Sha>4a5547e595c1de7151072ac48abd1e23cdd9e085</Sha>
109+
</Dependency>
110+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.25462.102">
111+
<Uri>https://github.com/dotnet/dotnet</Uri>
112+
<Sha>4a5547e595c1de7151072ac48abd1e23cdd9e085</Sha>
109113
</Dependency>
110114
</ToolsetDependencies>
111115
</Dependencies>

‎eng/packageContent.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
/>
6666

6767
<ItemGroup>
68-
<PackageFile Include="$(TargetPath)" PackagePath="$(PackagePath)" />
68+
<PackageFile Include="$(TargetPath)" PackagePath="$(PackagePath)" IsPackable="$(IsPackable)" PackageId="$(PackageId)" PackageVersion="$(PackageVersion)" />
6969
<PackageFile Condition="'$(IncludePdbInPackage)' == 'true'" Include="$(TargetDir)$(TargetName).pdb" PackagePath="$(PackagePath)" />
7070
<PackageFile Condition="'$(ProduceReferenceAssembly)' == 'true'" Include="$(TargetRefPath)" PackagePath="$(RefPackagePath)" />
7171
<PackageFile Condition="'$(ProduceReferenceAssembly)' == 'true' Or '$(PackageAsRefAndLib)' == 'true'"

‎global.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
}
2222
},
2323
"msbuild-sdks": {
24-
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25460.106",
25-
"Microsoft.DotNet.CMake.Sdk": "11.0.0-beta.25460.106",
26-
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25460.106",
24+
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25462.102",
25+
"Microsoft.DotNet.CMake.Sdk": "11.0.0-beta.25462.102",
26+
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25462.102",
2727
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
28-
"Microsoft.NET.Sdk.IL": "10.0.0-rc.1.25460.106"
28+
"Microsoft.NET.Sdk.IL": "10.0.0-rc.1.25462.102"
2929
},
3030
"native-tools": {
3131
"cmake": "latest"

‎pkg/Microsoft.Private.Winforms/Microsoft.Private.Winforms.csproj‎

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@
114114
<ProjectReference Include="..\..\src\System.Windows.Forms.Analyzers.CodeFixes.CSharp\System.Windows.Forms.Analyzers.CodeFixes.CSharp.csproj" />
115115
<ProjectReference Include="..\..\src\System.Windows.Forms.Analyzers.CodeFixes.VisualBasic\System.Windows.Forms.Analyzers.CodeFixes.VisualBasic.vbproj" />
116116

117+
<PackageReference Include="Microsoft.DotNet.Build.Tasks.Templating" PrivateAssets="All" />
117118
</ItemGroup>
118119

119120
<!-- Force the output item type for all project references to "TfmSpecificPackageFile", which makes them get packed -->
@@ -127,9 +128,44 @@
127128
</ItemGroup>
128129
</Target>
129130

130-
<!-- Call custom targets (defined below) when creating the package -->
131131
<PropertyGroup>
132+
<!-- Call custom targets (defined below) when creating the package -->
132133
<TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificBuildOutput);ResolveReferences</TargetsForTfmSpecificContentInPackage>
134+
<BeforePack>$(BeforePack);GenerateTransportPropsFile</BeforePack>
135+
136+
<TransportPropsFileInputPath>$(MSBuildThisFileDirectory)build\$(MSBuildProjectName).props</TransportPropsFileInputPath>
137+
<TransportPropsFileOutputPath>$(IntermediateOutputPath)$(MSBuildProjectName).props</TransportPropsFileOutputPath>
133138
</PropertyGroup>
134139

140+
<Target Name="GenerateTransportPropsFile"
141+
Condition="'@(ProjectReference)' != ''"
142+
DependsOnTargets="BuildOnlySettings;ResolveReferences"
143+
Inputs="$(MSBuildThisFileFullPath);$(TransportPropsFileInputPath)"
144+
Outputs="$(TransportPropsFileOutputPath)">
145+
<ItemGroup>
146+
<WinformsWindowsDesktopPackageLibrary Include="@(TfmSpecificPackageFile->WithMetadataValue('Extension', '.dll')->WithMetadataValue('IsPackable', 'true'))" />
147+
</ItemGroup>
148+
149+
<PropertyGroup>
150+
<WinformsWindowsDesktopPackageLibraries>@(WinformsWindowsDesktopPackageLibrary->'&lt;WinformsWindowsDesktopPackageLibrary Include=&quot;%(Filename)%(Extension)&quot; PackageId=&quot;%(PackageId)&quot; PackageVersion=&quot;%(PackageVersion)&quot; /&gt;', '
151+
')</WinformsWindowsDesktopPackageLibraries>
152+
</PropertyGroup>
153+
154+
<ItemGroup>
155+
<TransportPropsTemplateProperty Include="WinformsWindowsDesktopPackageLibraries=$(WinformsWindowsDesktopPackageLibraries)" />
156+
</ItemGroup>
157+
158+
<Error Condition="'@(WinformsWindowsDesktopPackageLibrary)' == ''"
159+
Text="Unexpected build error: No packable references were found." />
160+
161+
<GenerateFileFromTemplate
162+
TemplateFile="$(TransportPropsFileInputPath)"
163+
Properties="@(TransportPropsTemplateProperty)"
164+
OutputPath="$(TransportPropsFileOutputPath)" />
165+
166+
<ItemGroup>
167+
<None Include="$(TransportPropsFileOutputPath)" Pack="true" PackagePath="build/" />
168+
</ItemGroup>
169+
</Target>
170+
135171
</Project>

0 commit comments

Comments
 (0)