Skip to content

Commit 1519ad1

Browse files
authored
Package cppwinrt.exe for x86, x64, and arm64 into the NuGet package (#22)
1 parent 9f7f21f commit 1519ad1

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

build_nuget.cmd

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ call msbuild /m /p:Configuration=Release,Platform=x86,CppWinRTBuildVersion=%targ
1313
call msbuild /m /p:Configuration=Release,Platform=x64,CppWinRTBuildVersion=%target_version% cppwinrt.slnx /t:fast_fwd
1414
call msbuild /m /p:Configuration=Release,Platform=arm64,CppWinRTBuildVersion=%target_version% cppwinrt.slnx /t:fast_fwd
1515

16+
rem Build cppwinrt.exe for x86, x64 and arm64
1617
call msbuild /m /p:Configuration=Release,Platform=x86,CppWinRTBuildVersion=%target_version% cppwinrt.slnx /t:cppwinrt
18+
call msbuild /m /p:Configuration=Release,Platform=x64,CppWinRTBuildVersion=%target_version% cppwinrt.slnx /t:cppwinrt
19+
call msbuild /m /p:Configuration=Release,Platform=arm64,CppWinRTBuildVersion=%target_version% cppwinrt.slnx /t:cppwinrt
1720

18-
nuget pack nuget\YexuanXiao.CppWinRTPlus.nuspec -Properties target_version=%target_version%;cppwinrt_exe=%cd%\_build\x86\Release\cppwinrt.exe;cppwinrt_fast_fwd_x86=%cd%\_build\x86\Release\cppwinrt_fast_forwarder.lib;cppwinrt_fast_fwd_x64=%cd%\_build\x64\Release\cppwinrt_fast_forwarder.lib;cppwinrt_fast_fwd_arm64=%cd%\_build\arm64\Release\cppwinrt_fast_forwarder.lib
21+
rem Build nuget
22+
nuget pack nuget\YexuanXiao.CppWinRTPlus.nuspec -Properties target_version=%target_version%;cppwinrt_exe_x86=%cd%\_build\x86\Release\cppwinrt.exe;cppwinrt_exe_amd64=%cd%\_build\x64\Release\cppwinrt.exe;cppwinrt_exe_arm64=%cd%\_build\arm64\Release\cppwinrt.exe;cppwinrt_fast_fwd_x86=%cd%\_build\x86\Release\cppwinrt_fast_forwarder.lib;cppwinrt_fast_fwd_x64=%cd%\_build\x64\Release\cppwinrt_fast_forwarder.lib;cppwinrt_fast_fwd_arm64=%cd%\_build\arm64\Release\cppwinrt_fast_forwarder.lib

nuget/YexuanXiao.CppWinRTPlus.nuspec

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818
</metadata>
1919
<files>
2020
<file src="..\LICENSE"/>
21-
<file src="$cppwinrt_exe$" target="bin"/>
21+
<file src="$cppwinrt_exe_arm64$" target="bin\arm64"/>
22+
<file src="$cppwinrt_exe_amd64$" target="bin\amd64"/>
23+
<file src="$cppwinrt_exe_x86$" target="bin\x86"/>
2224
<file src="$cppwinrt_fast_fwd_x86$" target="build\native\lib\win32"/>
2325
<file src="$cppwinrt_fast_fwd_x64$" target="build\native\lib\x64"/>
2426
<file src="$cppwinrt_fast_fwd_arm64$" target="build\native\lib\arm64"/>

nuget/YexuanXiao.CppWinRTPlus.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
2323
<CppWinRTConfigFile Condition="'$(CppWinRTConfigFile)' == '' and '$(SolutionDir)' != '' and Exists('$(SolutionDir)CppWinRT.config')">$([System.IO.Path]::GetFullPath('$(SolutionDir)CppWinRT.config'))</CppWinRTConfigFile>
2424
<CppWinRTConfigFile Condition="'$(CppWinRTConfigFile)' == '' and Exists('$(MSBuildProjectDirectory)\\CppWinRT.config')">$([System.IO.Path]::GetFullPath('$(MSBuildProjectDirectory)\\CppWinRT.config'))</CppWinRTConfigFile>
2525
<CppWinRTCommandConfigFile Condition="'$(CppWinRTConfigFile)' != ''">-config &quot;$(CppWinRTConfigFile)&quot;</CppWinRTCommandConfigFile>
26-
<CppWinRTPath Condition="'$(CppWinRTPackage)' == 'true' and '$(CppWinRTPath)'==''">"$(CppWinRTPackageDir)bin\"</CppWinRTPath>
26+
<CppWinRTPath Condition="'$(CppWinRTPackage)' == 'true' and '$(CppWinRTPath)'==''">"$(CppWinRTPackageDir)bin\$(ProcessorArchitecture)\"</CppWinRTPath>
2727
<CppWinRTPath Condition="'$(CppWinRTPackage)' != 'true' and '$(CppWinRTPath)'==''">"$(CppWinRTPackageDir)"</CppWinRTPath>
2828
<!-- By default enable C++/WinRT to include target platform winmds if we didn't override sdk references and the C++ Project system isn't already adding them -->
2929
<!-- _PrepareForReferenceResolution adds the references if TargetPlatformIdentifier is UAP -->

0 commit comments

Comments
 (0)