Skip to content

Commit cba5173

Browse files
Alan JowettAlan-Jowett
Alan Jowett
authored and
Alan-Jowett
committed
Switch usersim to use central packages references
Signed-off-by: Alan Jowett <alan.jowett@microsoft.com>
1 parent e5776c2 commit cba5173

5 files changed

Lines changed: 26 additions & 32 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
working-directory: ${{env.GITHUB_WORKSPACE}}
5454
# Add additional options to the MSBuild command line here (like platform or verbosity level).
5555
# See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference
56-
run: msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} /p:Platform=${{env.BUILD_PLATFORM}} /p:RunCodeAnalysis='True' ${{env.SOLUTION_FILE_PATH}}
56+
run: msbuild /m /t:Restore,Build /p:Configuration=${{env.BUILD_CONFIGURATION}} /p:Platform=${{env.BUILD_PLATFORM}} /p:RunCodeAnalysis='True' ${{env.SOLUTION_FILE_PATH}}
5757

5858
- name: Run cxplat tests without fault injection
5959
if: matrix.architecture == 'x64'

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@
66
/**/*.user
77
/**/packages/**
88
CMakeCache.txt
9+
/**/obj/**

‎packages.config‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎usersim_dll_skeleton/usersim_dll_skeleton.vcxproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
<ItemGroup>
55
<ClCompile Include="dll_skeleton.cpp" />
66
</ItemGroup>
7-
<ItemGroup>
8-
<None Include="packages.config" />
9-
</ItemGroup>
107
<PropertyGroup Label="Globals">
118
<VCProjectVersion>16.0</VCProjectVersion>
129
<Keyword>Win32Proj</Keyword>

‎wdk.props‎

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,28 @@
33
Copyright (c) Microsoft Corporation
44
SPDX-License-Identifier: MIT
55
-->
6-
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" TreatAsLocalProperty="Platform">
7-
<Import Project="$(SolutionDir)packages\Microsoft.Windows.SDK.CPP.10.0.26100.4204\build\native\Microsoft.Windows.SDK.cpp.props" Condition="Exists('$(SolutionDir)packages\Microsoft.Windows.SDK.CPP.10.0.26100.4204\build\native\Microsoft.Windows.SDK.cpp.props')" />
8-
<Import Project="$(SolutionDir)packages\Microsoft.Windows.WDK.x64.10.0.26100.4204\build\native\Microsoft.Windows.WDK.x64.props" Condition="Exists('$(SolutionDir)packages\Microsoft.Windows.WDK.x64.10.0.26100.4204\build\native\Microsoft.Windows.WDK.x64.props')" />
9-
<Import Project="$(SolutionDir)packages\Microsoft.Windows.SDK.CPP.x64.10.0.26100.4204\build\native\Microsoft.Windows.SDK.cpp.x64.props" Condition="Exists('$(SolutionDir)packages\Microsoft.Windows.SDK.CPP.x64.10.0.26100.4204\build\native\Microsoft.Windows.SDK.cpp.x64.props')" />
10-
<Import Project="$(SolutionDir)packages\Microsoft.Windows.WDK.ARM64.10.0.26100.4204\build\native\Microsoft.Windows.WDK.arm64.props" Condition="Exists('$(SolutionDir)packages\Microsoft.Windows.WDK.ARM64.10.0.26100.4204\build\native\Microsoft.Windows.WDK.arm64.props')" />
11-
<Import Project="$(SolutionDir)packages\Microsoft.Windows.SDK.CPP.arm64.10.0.26100.4204\build\native\Microsoft.Windows.SDK.cpp.arm64.props" Condition="Exists('$(SolutionDir)packages\Microsoft.Windows.SDK.CPP.arm64.10.0.26100.4204\build\native\Microsoft.Windows.SDK.cpp.arm64.props')" />
12-
<ImportGroup Label="ExtensionTargets">
13-
<Import Project="$(SolutionDir)packages\Microsoft.Windows.SDK.CPP.10.0.26100.4204\build\native\Microsoft.Windows.SDK.cpp.targets" Condition="Exists('$(SolutionDir)packages\Microsoft.Windows.SDK.CPP.10.0.26100.4204\build\native\Microsoft.Windows.SDK.cpp.targets')" />
14-
</ImportGroup>
15-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
16-
<PropertyGroup>
17-
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
18-
</PropertyGroup>
19-
<Error Condition="!Exists('$(SolutionDir)packages\Microsoft.Windows.SDK.CPP.10.0.26100.4204\build\native\Microsoft.Windows.SDK.cpp.props')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\Microsoft.Windows.SDK.CPP.10.0.26100.4204\build\native\Microsoft.Windows.SDK.cpp.props'))" />
20-
<Error Condition="!Exists('$(SolutionDir)packages\Microsoft.Windows.SDK.CPP.10.0.26100.4204\build\native\Microsoft.Windows.SDK.cpp.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\Microsoft.Windows.SDK.CPP.10.0.26100.4204\build\native\Microsoft.Windows.SDK.cpp.targets'))" />
21-
<Error Condition="!Exists('$(SolutionDir)packages\Microsoft.Windows.SDK.CPP.x64.10.0.26100.4204\build\native\Microsoft.Windows.SDK.cpp.x64.props')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\Microsoft.Windows.SDK.CPP.x64.10.0.26100.4204\build\native\Microsoft.Windows.SDK.cpp.x64.props'))" />
22-
<Error Condition="!Exists('$(SolutionDir)packages\Microsoft.Windows.WDK.x64.10.0.26100.4204\build\native\Microsoft.Windows.WDK.x64.props')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\Microsoft.Windows.WDK.x64.10.0.26100.4204\build\native\Microsoft.Windows.WDK.x64.props'))" />
23-
<Error Condition="!Exists('$(SolutionDir)packages\Microsoft.Windows.SDK.CPP.arm64.10.0.26100.4204\build\native\Microsoft.Windows.SDK.cpp.arm64.props')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\Microsoft.Windows.SDK.CPP.arm64.10.0.26100.4204\build\native\Microsoft.Windows.SDK.cpp.arm64.props'))" />
24-
<Error Condition="!Exists('$(SolutionDir)packages\Microsoft.Windows.WDK.ARM64.10.0.26100.4204\build\native\Microsoft.Windows.WDK.arm64.props')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\Microsoft.Windows.WDK.ARM64.10.0.26100.4204\build\native\Microsoft.Windows.WDK.arm64.props'))" />
25-
</Target>
6+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
7+
<!-- Set target framework for C++ projects using PackageReference -->
8+
<PropertyGroup Label="NuGet">
9+
<TargetFramework>native</TargetFramework>
10+
<_NuGetTargetFallbackMoniker>$(_NuGetTargetFallbackMoniker);native,Version=v0.0</_NuGetTargetFallbackMoniker>
11+
<RestorePackages>true</RestorePackages>
12+
</PropertyGroup>
13+
<ItemGroup>
14+
<PackageReference Include="Microsoft.Windows.SDK.CPP">
15+
<Version>10.0.26100.4204</Version>
16+
</PackageReference>
17+
<PackageReference Include="Microsoft.Windows.SDK.CPP.x64">
18+
<Version>10.0.26100.4204</Version>
19+
</PackageReference>
20+
<PackageReference Include="Microsoft.Windows.WDK.x64">
21+
<Version>10.0.26100.4204</Version>
22+
</PackageReference>
23+
<PackageReference Include="Microsoft.Windows.SDK.CPP.arm64">
24+
<Version>10.0.26100.4204</Version>
25+
</PackageReference>
26+
<PackageReference Include="Microsoft.Windows.WDK.ARM64">
27+
<Version>10.0.26100.4204</Version>
28+
</PackageReference>
29+
</ItemGroup>
2630
</Project>

0 commit comments

Comments
 (0)