Skip to content

Commit 601f3c5

Browse files
ViktorHoferViktorHofer
committed
Use live runtime references for vcxproj
Fixes #9490 Unblocks dotnet/sdk#43015 When building wpf inside the VMR, a 10.0.100 SDK is used. WPF currently still targets net9.0. As WPF directly depends on runtime, it already uses 10.0.0-alpha versions of the targeting and runtime packs for managed projects. Enable this for vcxprojs as well so that the host packages can also be restored from the flowing runtime dependency. Fixes errors like these: > The Apphost pack is not installed and NuGet package restore is not supported. Upgrade Visual Studio, remove global.json if it specifies a certain SDK version, and uninstall the newer SDK. For more options visit https://aka.ms/targeting-apphost-pack-missing Pack Type:Apphost, Pack directory: D:\a\_work\1\vmr\.dotnet\packs\Microsoft.NETCore.App.Host.win-x64, targetframework: net9.0, Pack PackageId: Microsoft.NETCore.App.Host.win-x64, Pack Package Version: 9.0.0-rc.2.24473.5
1 parent 3a1f918 commit 601f3c5

File tree

6 files changed

+4
-246
lines changed

6 files changed

+4
-246
lines changed

Diff for: ‎eng/Tools.props

-15
This file was deleted.

Diff for: ‎eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.props

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<!-- workaround for package downgrade in Microsoft.NetCore.Platforms -->
33
<PropertyGroup>
44
<DisableImplicitNETCorePlatformsReference>true</DisableImplicitNETCorePlatformsReference>
5+
<EnableManagedPackageReferenceSupport>true</EnableManagedPackageReferenceSupport>
56
</PropertyGroup>
67

78
</Project>

Diff for: ‎eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets

+1-64
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,7 @@
66
<ItemGroup>
77
<PackageReference Include="Microsoft.NETCore.Platforms"
88
Version="$(MicrosoftNETCorePlatformsVersion)"
9-
Condition="'$(MSBuildProjectExtension)'!='.vcxproj'"/>
10-
11-
<AdditionalPackageReference Include="Microsoft.NETCore.Platforms"
12-
Version="$(MicrosoftNETCorePlatformsVersion)"
13-
Condition="'$(ManagedCxx)'=='true'"/>
9+
Condition="'$(MSBuildProjectExtension)'!='.vcxproj' or '$(ManagedCxx)'=='true'"/>
1410

1511
<!--
1612
Workaround - this should be removed when our tests are converted from Microsoft.NET.Sdk.WindowsDesktop => Microsoft.NET.Sdk
@@ -42,63 +38,4 @@
4238
Condition="'$(UseOOBNETCoreAppAppHostPack)' == 'true'" />
4339
</ItemGroup>
4440

45-
<!-- These properties can be removed when vcxproj's NuGet support gets enabled. -->
46-
<PropertyGroup>
47-
<EnableTargetingPackDownload Condition="'$(UseOOBNETCoreAppTargetingPack)' == 'true' and '$(MSBuildProjectExtension)' == '.vcxproj'">false</EnableTargetingPackDownload>
48-
<EnableRuntimePackDownload Condition="'$(UseOOBNETCoreAppRuntimePack)' == 'true' and '$(MSBuildProjectExtension)' == '.vcxproj'">false</EnableRuntimePackDownload>
49-
<GenerateErrorForMissingTargetingPacks Condition="'$(EnableTargetingPackDownload)' == 'false'">false</GenerateErrorForMissingTargetingPacks>
50-
51-
<EnableAppHostPackDownload Condition="'$(UseOOBNETCoreAppAppHostPack)' == 'true' and '$(MSBuildProjectExtension)' == '.vcxproj'">false</EnableAppHostPackDownload>
52-
</PropertyGroup>
53-
54-
<!-- Update paths for resolved packs which is necessary when the packs couldn't be resolved.
55-
This happens when package download is disabled and the package isn't available in the SDK's packs folder.
56-
This entire target can be removed when vcxproj's NuGet support gets enabled. -->
57-
<Target Name="UpdateOOBPacks"
58-
Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"
59-
AfterTargets="ResolveFrameworkReferences">
60-
<ItemGroup>
61-
<Error Text="'MicrosoftNETCoreAppRefVersion' is not set. Please set it to the version of the targeting pack you want to use." Condition="'$(UseOOBNETCoreAppTargetingPack)' == 'true' and '$(MicrosoftNETCoreAppRefVersion)' == ''" />
62-
<Error Text="'MicrosoftNETCoreAppRuntimewinx64Version' is not set. Please set it to the version of the runtime pack you want to use." Condition="('$(UseOOBNETCoreAppRuntimePack)' == 'true' or '$(UseOOBNETCoreAppAppHostPack)' == 'true') and '$(MicrosoftNETCoreAppRuntimewinx64Version)' == ''" />
63-
64-
<ResolvedTargetingPack Path="$(NuGetPackageRoot)microsoft.netcore.app.ref\$(MicrosoftNETCoreAppRefVersion)"
65-
NuGetPackageVersion="$(MicrosoftNETCoreAppRefVersion)"
66-
PackageDirectory="$(NuGetPackageRoot)microsoft.netcore.app.ref\$(MicrosoftNETCoreAppRefVersion)"
67-
Condition="'$(UseOOBNETCoreAppTargetingPack)' == 'true' and '$(EnableTargetingPackDownload)' == 'false' and '%(ResolvedTargetingPack.RuntimeFrameworkName)' == 'Microsoft.NETCore.App'" />
68-
69-
<ResolvedRuntimePack PackageDirectory="$(NuGetPackageRoot)microsoft.netcore.app.runtime.%(RuntimeIdentifier)\$(MicrosoftNETCoreAppRuntimewinx64Version)"
70-
NuGetPackageVersion="$(MicrosoftNETCoreAppRuntimewinx64Version)"
71-
Condition="'$(UseOOBNETCoreAppRuntimePack)' == 'true' and '$(EnableRuntimePackDownload)' == 'false' and '%(ResolvedRuntimePack.FrameworkName)' == 'Microsoft.NETCore.App'" />
72-
</ItemGroup>
73-
74-
<PropertyGroup>
75-
<_ResolvedRuntimePackPath>@(ResolvedRuntimePack->WithMetadataValue('FrameworkName', 'Microsoft.NETCore.App')->Metadata('Path'))</_ResolvedRuntimePackPath>
76-
</PropertyGroup>
77-
78-
<ItemGroup>
79-
<ResolvedFrameworkReference Condition="'%(Identity)' == 'Microsoft.NETCore.App'">
80-
<TargetingPackPath Condition="'$(UseOOBNETCoreAppTargetingPack)' == 'true' and '$(EnableTargetingPackDownload)' == 'false'">$(NuGetPackageRoot)microsoft.netcore.app.ref\$(MicrosoftNETCoreAppRefVersion)</TargetingPackPath>
81-
<TargetingPackVersion Condition="'$(UseOOBNETCoreAppTargetingPack)' == 'true' and '$(EnableTargetingPackDownload)' == 'false'">$(MicrosoftNETCoreAppRefVersion)</TargetingPackVersion>
82-
<RuntimePackPath Condition="'$(UseOOBNETCoreAppRuntimePack)' == 'true' and '$(EnableRuntimePackDownload)' == 'false'">$(_ResolvedRuntimePackPath)</RuntimePackPath>
83-
<RuntimePackVersion Condition="'$(UseOOBNETCoreAppRuntimePack)' == 'true' and '$(EnableRuntimePackDownload)' == 'false'">$(MicrosoftNETCoreAppRuntimewinx64Version)</RuntimePackVersion>
84-
</ResolvedFrameworkReference>
85-
86-
<ResolvedAppHostPack Path="$(NuGetPackageRoot)microsoft.netcore.app.host.%(RuntimeIdentifier)\$(MicrosoftNETCoreAppRuntimewinx64Version)\%(ResolvedAppHostPack.PathInPackage)"
87-
PackageDirectory="$(NuGetPackageRoot)microsoft.netcore.app.host.%(RuntimeIdentifier)\$(MicrosoftNETCoreAppRuntimewinx64Version)"
88-
Condition="'$(UseOOBNETCoreAppAppHostPack)' == 'true' and '$(EnableAppHostPackDownload)' == 'false'" />
89-
90-
<ResolvedIjwHostPack Path="$(NuGetPackageRoot)microsoft.netcore.app.host.%(RuntimeIdentifier)\$(MicrosoftNETCoreAppRuntimewinx64Version)\%(ResolvedIjwHostPack.PathInPackage)"
91-
PackageDirectory="$(NuGetPackageRoot)microsoft.netcore.app.host.%(RuntimeIdentifier)\$(MicrosoftNETCoreAppRuntimewinx64Version)"
92-
Condition="'$(UseOOBNETCoreAppAppHostPack)' == 'true' and '$(EnableAppHostPackDownload)' == 'false'" />
93-
</ItemGroup>
94-
95-
<PropertyGroup Condition="'@(ResolvedAppHostPack)' != '' And '$(AppHostSourcePath)' == ''">
96-
<AppHostSourcePath>@(ResolvedAppHostPack->'%(Path)')</AppHostSourcePath>
97-
</PropertyGroup>
98-
99-
<PropertyGroup Condition="'@(ResolvedIjwHostPack)' != '' And '$(IjwHostSourcePath)' == ''">
100-
<IjwHostSourcePath>@(ResolvedIjwHostPack->'%(Path)')</IjwHostSourcePath>
101-
</PropertyGroup>
102-
</Target>
103-
10441
</Project>

Diff for: ‎eng/WpfArcadeSdk/tools/Wpf.Cpp.targets

-154
Original file line numberDiff line numberDiff line change
@@ -276,160 +276,6 @@ using namespace System::Runtime::Versioning;
276276
</ItemGroup>
277277
</Target>
278278

279-
280-
<PropertyGroup Condition="'$(ManagedCxx)'=='true'">
281-
<ResolveReferencesDependsOn>
282-
CppCliHelper;
283-
$(ResolveReferencesDependsOn)
284-
</ResolveReferencesDependsOn>
285-
<EnsureWpfProjectReferenceDependsOn>
286-
$(EnsureWpfProjectReferenceDependsOn);
287-
CppCliHelper
288-
</EnsureWpfProjectReferenceDependsOn>
289-
</PropertyGroup>
290-
291-
<!--
292-
Helper for building C++/CLI projects
293-
294-
C++/CLI doe not have Sdk support for build on .NET Core
295-
We use existing support for C# to discover Nuget packages, and pass it along to
296-
the C++ compiler.
297-
298-
A simple C# project is generated dynamically. It contains PackageReferences for common packages
299-
that are used in WPF's C++/CLI projects. There are only two such projects - DirectWriteForwarder
300-
and System.Printing - which makes it unnecessary to create a flexible and parametrized target. This
301-
can remain a simple and one-size-fits-all target for now.
302-
303-
If additional Nuget references need to be discovered and passed along for builds (for existing, or new) of
304-
C++/CLI projects, they just need to be added to the vcxproj project file like this:
305-
306-
<AdditionalPackageReference Include="Microsoft.Win32.Registry" Version="<version>" />
307-
-->
308-
<Target Name="CppCliHelper"
309-
Returns="@(Reference)"
310-
Condition="'$(ManagedCxx)' == 'true'">
311-
312-
<PropertyGroup>
313-
<CppCliHelperProject>$(IntermediateOutputPath)CppCliSupport\CppClrSupport_$(MSBuildProjectName).csproj</CppCliHelperProject>
314-
</PropertyGroup>
315-
316-
<ItemGroup>
317-
<CppClrSupportProject Include="ProjectHeader">
318-
<!--
319-
In the CDATA section that follows,
320-
%40 ~= @
321-
%25 ~= %
322-
%3B ~= ;
323-
%24 ~= $
324-
-->
325-
<Text>
326-
<![CDATA[
327-
<Project Sdk="Microsoft.NET.Sdk" InitialTargets="EnumerateAdditionalNugetReference">
328-
<PropertyGroup>
329-
<TargetFramework>net6.0</TargetFramework>
330-
<Platforms>AnyCPU%3Bx64%3Barm64</Platforms>
331-
</PropertyGroup>
332-
]]>
333-
</Text>
334-
</CppClrSupportProject>
335-
336-
337-
<CppClrSupportProject Include="ProjectBody">
338-
<Text>
339-
<![CDATA[
340-
341-
342-
<Target Name="EnumerateAdditionalNugetReference"
343-
BeforeTargets="_GenerateRestoreGraph"
344-
Condition="'%24(AdditionalPackages)'!=''"
345-
Returns="%40(PackageReference)">
346-
<ItemGroup>
347-
<_AdditionalPackages Remove="%40(_AdditionalPackages)" />
348-
<_AdditionalPackages Include="%24(AdditionalPackages)" />
349-
350-
<PackageReference Include="%24([System.String]::Copy('%25(_AdditionalPackages.Identity)').Split('+')[0])"
351-
Version="%24([System.String]::Copy('%25(_AdditionalPackages.Identity)').Split('+')[1])" />
352-
353-
<AdditionalNugetIds Remove="%40(AdditionalNugetIds)" />
354-
<AdditionalNugetIds Include="%24([System.String]::Copy('%25(_AdditionalPackages.Identity)').Split('+')[0])" />
355-
</ItemGroup>
356-
357-
<!--
358-
Removing the Microsoft.NETCore.Platforms directly and then
359-
adding it again to remove the duplicate reference.
360-
-->
361-
<ItemGroup>
362-
<PackageReference Remove="Microsoft.NETCore.Platforms" />
363-
<PackageReference Include="Microsoft.NETCore.Platforms"
364-
Version="$(MicrosoftNETCorePlatformsVersion)" />
365-
</ItemGroup>
366-
</Target>
367-
368-
<Target
369-
Name="IdentifyNugetReferences"
370-
AfterTargets="ResolveAssemblyReferences"
371-
Returns="%40(NugetReferencesForCppCli)">
372-
373-
<!-- Save Microsoft.NETCore.App assemblies and return them -->
374-
<ItemGroup>
375-
<NugetReferencesForCppCli Remove="%40(NugetReferencesForCppCli)" />
376-
</ItemGroup>
377-
<FilterItem1ByItem2 Item1="%40(ReferencePath->'%25(NuGetPackageId)')"
378-
PreserveItem1Metadata="true"
379-
Item2="%40(AdditionalNugetIds)"
380-
Metadata2="Identity">
381-
<Output ItemName="_NugetReferencesForCppCli" TaskParameter="Result" />
382-
</FilterItem1ByItem2>
383-
</Target>
384-
<ItemGroup>
385-
<NugetReferencesForCppCli Include="%40(_NugetReferencesForCppCli->'%25(OriginalItemSpec)')" />
386-
</ItemGroup>
387-
</Project>
388-
]]>
389-
</Text>
390-
</CppClrSupportProject>
391-
</ItemGroup>
392-
393-
<MakeDir Condition="!Exists('$(IntermediateOutputPath)CppCliSupport\')"
394-
Directories="$(IntermediateOutputPath)CppCliSupport\" />
395-
396-
<Delete Files="$(CppCliHelperProject)" Condition="Exists('$(CppCliHelperProject)')" />
397-
398-
<WriteLinesToFile Lines="%(CppClrSupportProject.Text)"
399-
File="$(CppCliHelperProject)"
400-
Overwrite="false" WriteOnlyWhenDifferent="false" />
401-
402-
<!--
403-
Do not build - just ask ResolveReferences + IdentifyNetCoreReferences for the information
404-
we are looking for, namely the list of .NET Core Sdk references.
405-
-->
406-
<ItemGroup>
407-
<ProjectToBuild Remove="@(ProjectToBuild)" />
408-
<ProjectToBuild Include="$(CppCliHelperProject)">
409-
<AdditionalProperties>AdditionalPackages=@(AdditionalPackageReference->'%(Identity)+%(Version)')</AdditionalProperties>
410-
</ProjectToBuild>
411-
</ItemGroup>
412-
<MSBuild Projects="@(ProjectToBuild)"
413-
Targets="Restore;ResolveReferences;IdentifyNugetReferences"
414-
Properties="TargetFramework=$(TargetFramework);Platform=$(Architecture);RuntimeIdentifier=win-$(Architecture)">
415-
<Output TaskParameter="TargetOutputs" ItemName="NugetReferencesForCppCli" />
416-
</MSBuild>
417-
418-
<!--
419-
Add the newly discovered list of .NET core references to $(AdditionalExplicitAssemblyReferences)
420-
-->
421-
<ItemGroup Condition="'$(CopyTransitiveReferences)'=='false'">
422-
<Reference Include="@(NugetReferencesForCppCli)">
423-
<Private>False</Private>
424-
</Reference>
425-
</ItemGroup>
426-
427-
<ItemGroup Condition="'$(CopyTransitiveReferences)'!='false'">
428-
<Reference Include="@(NugetReferencesForCppCli)" />
429-
</ItemGroup>
430-
</Target>
431-
432-
433279
<PropertyGroup Condition="'$(ManagedCxx)'!='true'">
434280
<ResolveReferencesDependsOn>
435281
CppHelper;

Diff for: ‎src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/DirectWriteForwarder.vcxproj

+1-6
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@
2828
</ItemGroup>
2929
<PropertyGroup>
3030
<UseDestinationLibFolder>true</UseDestinationLibFolder>
31-
<TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>
32-
<RestoreProjectStyle>Unknown</RestoreProjectStyle>
3331
<!--
3432
Opting out of this to ensure _WindowsBaseReference is used as
3533
OutputItemsType in the project reference later.
@@ -86,11 +84,8 @@
8684
<CLCompile Include="main.cpp" />
8785
<CLCompile Include="OtherAssemblyAttrs.cpp" />
8886
</ItemGroup>
89-
<!--
90-
PackageReferences to pass to CppCliHelper target
91-
-->
9287
<ItemGroup>
93-
<AdditionalPackageReference Include="$(SystemIOPackagingPackage)" Version="$(SystemIOPackagingVersion)" />
88+
<PackageReference Include="$(SystemIOPackagingPackage)" Version="$(SystemIOPackagingVersion)" />
9489
</ItemGroup>
9590
<!--
9691
Ignore ijwhost.dll during packaging

Diff for: ‎src/Microsoft.DotNet.Wpf/src/System.Printing/System.Printing.vcxproj

+1-7
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@
2828
</ItemGroup>
2929
<PropertyGroup>
3030
<UseDestinationLibFolder>true</UseDestinationLibFolder>
31-
<TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>
32-
<TargetFrameworkVersion>v6.0</TargetFrameworkVersion>
33-
<RestoreProjectStyle>Unknown</RestoreProjectStyle>
3431
<!--
3532
Opting out of this to ensure _defineReference is used as
3633
OutputItemsType in the project references later.
@@ -155,11 +152,8 @@
155152
<Define>REACHFRAMEWORK_DLL</Define>
156153
</ProjectReference>
157154
</ItemGroup>
158-
<!--
159-
PackageReferences to pass to CppCliHelper target
160-
-->
161155
<ItemGroup>
162-
<AdditionalPackageReference Include="$(SystemIOPackagingPackage)" Version="$(SystemIOPackagingVersion)" />
156+
<PackageReference Include="$(SystemIOPackagingPackage)" Version="$(SystemIOPackagingVersion)" />
163157
</ItemGroup>
164158
<!--
165159
Ignore ijwhost.dll during packaging

0 commit comments

Comments
 (0)