diff --git a/build_vsix.cmd b/build_vsix.cmd index bfb47e237..ef9c9d870 100644 --- a/build_vsix.cmd +++ b/build_vsix.cmd @@ -33,4 +33,4 @@ rem Build nuget .nuget\nuget.exe pack nuget\Microsoft.Windows.CppWinRT.nuspec -NonInteractive -OutputDirectory %this_dir%_build -Properties Configuration=%target_configuration%;cppwinrt_exe=%this_dir%_build\x86\%target_configuration%\cppwinrt.exe;cppwinrt_fast_fwd_x86=%this_dir%_build\x86\%target_configuration%\cppwinrt_fast_forwarder.lib;cppwinrt_fast_fwd_x64=%this_dir%_build\x64\%target_configuration%\cppwinrt_fast_forwarder.lib;cppwinrt_fast_fwd_arm=%this_dir%_build\arm\%target_configuration%\cppwinrt_fast_forwarder.lib;cppwinrt_fast_fwd_arm64=%this_dir%_build\arm64\%target_configuration%\cppwinrt_fast_forwarder.lib -version %target_version% -Verbosity Detailed rem Build vsix -call msbuild /p:Configuration=%target_configuration%,Platform=x86,Deployment=%target_deployment%,CppWinRTVersion=%target_version%,NatvisDirx86=%this_dir%natvis\x86\%target_configuration%\%target_deployment%,NatvisDirx64=%this_dir%natvis\x64\%target_configuration%\%target_deployment%,NupkgDir=%this_dir%_build vsix\vsix.sln +call msbuild /restore /p:Configuration=%target_configuration%,Platform=x86,Deployment=%target_deployment%,CppWinRTVersion=%target_version%,NatvisDirx86=%this_dir%natvis\x86\%target_configuration%\%target_deployment%,NatvisDirx64=%this_dir%natvis\x64\%target_configuration%\%target_deployment%,NupkgDir=%this_dir%_build vsix\vsix.sln diff --git a/vsix/Dev16/Component/source.extension.vsixmanifest b/vsix/Dev16/Component/source.extension.vsixmanifest index 955702ab4..31e70dda2 100644 --- a/vsix/Dev16/Component/source.extension.vsixmanifest +++ b/vsix/Dev16/Component/source.extension.vsixmanifest @@ -6,11 +6,11 @@ C++/WinRT templates and visualizer for VS2019 Project and Item templates and the debug visualizer for C++/WinRT in Visual Studio 2019. https://go.microsoft.com/fwlink/?linkid=869449 - ..\LICENSE + LICENSE https://docs.microsoft.com/windows/uwp/cpp-and-winrt-apis/intro-to-using-cpp-with-winrt https://docs.microsoft.com/windows/uwp/cpp-and-winrt-apis/faq - ..\cppwinrt.ico - ..\cppwinrt.png + cppwinrt.ico + cppwinrt.png WinRT, C++, cppwinrt, native diff --git a/vsix/Dev16/LICENSE b/vsix/Dev16/LICENSE deleted file mode 100644 index 9e841e7a2..000000000 --- a/vsix/Dev16/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ - MIT License - - Copyright (c) Microsoft Corporation. - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in all - copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - SOFTWARE diff --git a/vsix/Dev16/Standalone/source.extension.vsixmanifest b/vsix/Dev16/Standalone/source.extension.vsixmanifest index 543fa4ada..83eebd662 100644 --- a/vsix/Dev16/Standalone/source.extension.vsixmanifest +++ b/vsix/Dev16/Standalone/source.extension.vsixmanifest @@ -6,23 +6,17 @@ C++/WinRT templates and visualizer for VS2019 Project and Item templates and the debug visualizer for C++/WinRT in Visual Studio 2019. https://go.microsoft.com/fwlink/?linkid=869449 - ..\LICENSE + LICENSE https://docs.microsoft.com/windows/uwp/cpp-and-winrt-apis/intro-to-using-cpp-with-winrt https://docs.microsoft.com/windows/uwp/cpp-and-winrt-apis/faq - ..\cppwinrt.ico - ..\cppwinrt.png + cppwinrt.ico + cppwinrt.png WinRT, C++, cppwinrt, native - - x86 - - - x86 - - - x86 - + + + diff --git a/vsix/Dev16/vsix.Dev16.csproj b/vsix/Dev16/vsix.Dev16.csproj index fce85e2d4..84500cc26 100644 --- a/vsix/Dev16/vsix.Dev16.csproj +++ b/vsix/Dev16/vsix.Dev16.csproj @@ -4,6 +4,7 @@ 15.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) true @@ -47,50 +48,51 @@ true - + + %(Filename)%(Extension) true - + Microsoft\VC\v160 MSBuild true - + Microsoft\VC\v160\Platforms\ARM\ImportBefore MSBuild true - + Microsoft\VC\v160\Platforms\ARM64\ImportBefore MSBuild true - + Microsoft\VC\v160\Platforms\Win32\ImportBefore MSBuild true - + Microsoft\VC\v160\Platforms\x64\ImportBefore MSBuild true - + Application Type\Windows Store\10.0\Platforms\ARM\ImportAfter MSBuild true - + Application Type\Windows Store\10.0\Platforms\ARM64\ImportAfter MSBuild true - + Application Type\Windows Store\10.0\Platforms\Win32\ImportAfter MSBuild true - + Application Type\Windows Store\10.0\Platforms\x64\ImportAfter MSBuild true @@ -99,7 +101,7 @@ Packages\Microsoft.Windows.CppWinRT.$(CppWinRTVersion).nupkg true - + %(Filename)%(Extension) true @@ -120,10 +122,12 @@ - + + %(Filename)%(Extension) true - + + %(Filename)%(Extension) true @@ -145,10 +149,9 @@ - - - + + $(MSBuildProjectDirectory)\$(OutDir)%(RecursiveDir) diff --git a/vsix/Dev17/Component/source.extension.vsixmanifest b/vsix/Dev17/Component/source.extension.vsixmanifest index 727e47c86..fcb101d54 100644 --- a/vsix/Dev17/Component/source.extension.vsixmanifest +++ b/vsix/Dev17/Component/source.extension.vsixmanifest @@ -6,11 +6,11 @@ C++/WinRT templates and visualizer for VS2022 Project and Item templates and the debug visualizer for C++/WinRT in Visual Studio 2022. https://go.microsoft.com/fwlink/?linkid=869449 - ..\LICENSE + LICENSE https://docs.microsoft.com/windows/uwp/cpp-and-winrt-apis/intro-to-using-cpp-with-winrt https://docs.microsoft.com/windows/uwp/cpp-and-winrt-apis/faq - ..\cppwinrt.ico - ..\cppwinrt.png + cppwinrt.ico + cppwinrt.png WinRT, C++, cppwinrt, native diff --git a/vsix/Dev17/LICENSE b/vsix/Dev17/LICENSE deleted file mode 100644 index 9e841e7a2..000000000 --- a/vsix/Dev17/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ - MIT License - - Copyright (c) Microsoft Corporation. - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in all - copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - SOFTWARE diff --git a/vsix/Dev17/Standalone/source.extension.vsixmanifest b/vsix/Dev17/Standalone/source.extension.vsixmanifest index 683c78e49..687d34172 100644 --- a/vsix/Dev17/Standalone/source.extension.vsixmanifest +++ b/vsix/Dev17/Standalone/source.extension.vsixmanifest @@ -6,11 +6,11 @@ C++/WinRT templates and visualizer for VS2022 Project and Item templates and the debug visualizer for C++/WinRT in Visual Studio 2022. https://go.microsoft.com/fwlink/?linkid=869449 - ..\LICENSE + LICENSE https://docs.microsoft.com/windows/uwp/cpp-and-winrt-apis/intro-to-using-cpp-with-winrt https://docs.microsoft.com/windows/uwp/cpp-and-winrt-apis/faq - ..\cppwinrt.ico - ..\cppwinrt.png + cppwinrt.ico + cppwinrt.png WinRT, C++, cppwinrt, native diff --git a/vsix/Dev17/vsix.Dev17.csproj b/vsix/Dev17/vsix.Dev17.csproj index 778482593..ecc1d615c 100644 --- a/vsix/Dev17/vsix.Dev17.csproj +++ b/vsix/Dev17/vsix.Dev17.csproj @@ -45,50 +45,51 @@ 4 - + + %(Filename)%(Extension) true - + Microsoft\VC\v160 MSBuild true - + Microsoft\VC\v160\Platforms\ARM\ImportBefore MSBuild true - + Microsoft\VC\v160\Platforms\ARM64\ImportBefore MSBuild true - + Microsoft\VC\v160\Platforms\Win32\ImportBefore MSBuild true - + Microsoft\VC\v160\Platforms\x64\ImportBefore MSBuild true - + Application Type\Windows Store\10.0\Platforms\ARM\ImportAfter MSBuild true - + Application Type\Windows Store\10.0\Platforms\ARM64\ImportAfter MSBuild true - + Application Type\Windows Store\10.0\Platforms\Win32\ImportAfter MSBuild true - + Application Type\Windows Store\10.0\Platforms\x64\ImportAfter MSBuild true @@ -97,7 +98,7 @@ Packages\Microsoft.Windows.CppWinRT.$(CppWinRTVersion).nupkg true - + %(Filename)%(Extension) true @@ -118,10 +119,12 @@ - + + %(Filename)%(Extension) true - + + %(Filename)%(Extension) true @@ -132,7 +135,7 @@ compile; build; native; contentfiles; analyzers; buildtransitive - + runtime; build; native; contentfiles; analyzers; buildtransitive all @@ -148,10 +151,9 @@ - - - + + $(MSBuildProjectDirectory)\$(OutDir)%(RecursiveDir) diff --git a/vsix/Directory.Build.Props b/vsix/Directory.Build.Props new file mode 100644 index 000000000..43dc9c92d --- /dev/null +++ b/vsix/Directory.Build.Props @@ -0,0 +1,10 @@ + + + + + + $(MSBuildThisFileDirectory)..\ + $(MSBuildThisFileDirectory) + + + \ No newline at end of file