From d15c04e29d7ac167e382efe37365b8fa451728de Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Mon, 1 Mar 2021 14:57:38 -0800
Subject: Update to latest build infrastructure
---
.gitignore | 43 ++++++--
VisualStudio.wixext.sln | 4 +-
appveyor.cmd | 17 ++--
appveyor.yml | 2 +
global.json | 2 +-
src/Directory.Build.props | 4 +-
src/Directory.Build.targets | 5 +-
src/Directory.csproj.props | 13 +++
src/Directory.csproj.targets | 26 +++++
src/Directory.vcxproj.props | 111 +++++++++++++++++++++
src/ca/packages.config | 6 --
src/ca/vsca.vcxproj | 34 +++----
.../WixToolsetTest.VisualStudio.csproj | 5 +-
src/wixext/WixToolset.VisualStudio.wixext.csproj | 11 +-
src/wixext/WixToolset.VisualStudio.wixext.nuspec | 23 +++++
src/wixlib/vs.wixproj | 6 +-
16 files changed, 254 insertions(+), 58 deletions(-)
create mode 100644 src/Directory.csproj.props
create mode 100644 src/Directory.csproj.targets
create mode 100644 src/Directory.vcxproj.props
delete mode 100644 src/ca/packages.config
create mode 100644 src/wixext/WixToolset.VisualStudio.wixext.nuspec
diff --git a/.gitignore b/.gitignore
index 3e8a1553..1ee53850 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,9 @@
# User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs
+# Mono auto generated files
+mono_crash.*
+
# Build results
[Dd]ebug/
[Dd]ebugPublic/
@@ -20,12 +23,14 @@
[Rr]eleases/
x64/
x86/
+[Ww][Ii][Nn]32/
[Aa][Rr][Mm]/
[Aa][Rr][Mm]64/
bld/
[Bb]in/
[Oo]bj/
[Ll]og/
+[Ll]ogs/
# Visual Studio 2015/2017 cache/options directory
.vs/
@@ -39,9 +44,10 @@ Generated\ Files/
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*
-# NUNIT
+# NUnit
*.VisualState.xml
TestResult.xml
+nunit-*.xml
# Build Results of an ATL Project
[Dd]ebugPS/
@@ -56,6 +62,9 @@ project.lock.json
project.fragment.lock.json
artifacts/
+# ASP.NET Scaffolding
+ScaffoldingReadMe.txt
+
# StyleCop
StyleCopReport.xml
@@ -122,9 +131,6 @@ _ReSharper*/
*.[Rr]e[Ss]harper
*.DotSettings.user
-# JustCode is a .NET coding add-in
-.JustCode
-
# TeamCity is a build add-in
_TeamCity*
@@ -135,6 +141,11 @@ _TeamCity*
.axoCover/*
!.axoCover/settings.json
+# Coverlet is a free, cross platform Code Coverage Tool
+coverage*.json
+coverage*.xml
+coverage*.info
+
# Visual Studio code coverage results
*.coverage
*.coveragexml
@@ -182,6 +193,8 @@ PublishScripts/
# NuGet Packages
*.nupkg
+# NuGet Symbol Packages
+*.snupkg
# The packages folder can be ignored because of Package Restore
**/[Pp]ackages/*
# except build/, which is used as an MSBuild target.
@@ -206,6 +219,8 @@ BundleArtifacts/
Package.StoreAssociation.xml
_pkginfo.txt
*.appx
+*.appxbundle
+*.appxupload
# Visual Studio cache files
# files ending in .cache can be ignored
@@ -231,8 +246,6 @@ orleans.codegen.cs
# Since there are multiple workflows, uncomment next line to ignore bower_components
# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
#bower_components/
-# ASP.NET Core default setup: bower directory is configured as wwwroot/lib/ and bower restore is true
-**/wwwroot/lib/
# RIA/Silverlight projects
Generated_Code/
@@ -257,6 +270,9 @@ ServiceFabricBackup/
*.bim.layout
*.bim_*.settings
*.rptproj.rsuser
+*- [Bb]ackup.rdl
+*- [Bb]ackup ([0-9]).rdl
+*- [Bb]ackup ([0-9][0-9]).rdl
# Microsoft Fakes
FakesAssemblies/
@@ -292,10 +308,6 @@ paket-files/
# FAKE - F# Make
.fake/
-# JetBrains Rider
-.idea/
-*.sln.iml
-
# CodeRush personal settings
.cr/personal
@@ -337,5 +349,14 @@ ASALocalRun/
# Local History for Visual Studio
.localhistory/
-# BeatPulse healthcheck temp database
+# BeatPulse healthcheck temp database
healthchecksdb
+
+# Backup folder for Package Reference Convert tool in Visual Studio 2017
+MigrationBackup/
+
+# Ionide (cross platform F# VS Code tools) working folder
+.ionide/
+
+# Fody - auto-generated XML schema
+FodyWeavers.xsd
diff --git a/VisualStudio.wixext.sln b/VisualStudio.wixext.sln
index b00eea9e..9d6a8356 100644
--- a/VisualStudio.wixext.sln
+++ b/VisualStudio.wixext.sln
@@ -5,10 +5,10 @@ VisualStudioVersion = 16.0.30611.23
MinimumVisualStudioVersion = 15.0.26124.0
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vsca", "src\ca\vsca.vcxproj", "{45308B85-0628-4978-8FC8-6AD9E1AD5949}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.VisualStudio.wixext", "src\wixext\WixToolset.VisualStudio.wixext.csproj", "{61BFD377-9DE1-48B4-8687-560DF68D6F3B}"
-EndProject
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "vs", "src\wixlib\vs.wixproj", "{14345C9D-8AF8-435A-BB1B-E067CE7EB321}"
EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.VisualStudio.wixext", "src\wixext\WixToolset.VisualStudio.wixext.csproj", "{61BFD377-9DE1-48B4-8687-560DF68D6F3B}"
+EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.VisualStudio", "src\test\WixToolsetTest.VisualStudio\WixToolsetTest.VisualStudio.csproj", "{DD2BD0F7-1E4A-4D11-954C-3505323C4E1B}"
EndProject
Global
diff --git a/appveyor.cmd b/appveyor.cmd
index 84e1d13b..847809c3 100644
--- a/appveyor.cmd
+++ b/appveyor.cmd
@@ -1,14 +1,19 @@
@setlocal
@pushd %~dp0
+@set _C=Release
+@if /i "%1"=="debug" set _C=Debug
-nuget restore || exit /b
+:: Restore
+msbuild -p:Configuration=%_C% -t:Restore || exit /b
-msbuild -p:Configuration=Release -t:Restore || exit /b
+:: Build
+msbuild -p:Configuration=%_C% src\test\WixToolsetTest.VisualStudio\WixToolsetTest.VisualStudio.csproj || exit /b
-msbuild -p:Configuration=Release src\test\WixToolsetTest.VisualStudio\WixToolsetTest.VisualStudio.csproj || exit /b
-dotnet test -c Release --no-build src\test\WixToolsetTest.VisualStudio || exit /b
+:: Test
+dotnet test -c %_C% --no-build src\test\WixToolsetTest.VisualStudio || exit /b
-msbuild -p:Configuration=Release -t:Pack src\wixext\WixToolset.VisualStudio.wixext.csproj || exit /b
+:: Pack
+msbuild -p:Configuration=%_C% -p:NoBuild=true -t:Pack src\wixext\WixToolset.VisualStudio.wixext.csproj || exit /b
@popd
-@endlocal
\ No newline at end of file
+@endlocal
diff --git a/appveyor.yml b/appveyor.yml
index 7c686b04..c53cc9cc 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -33,6 +33,8 @@ skip_tags: true
artifacts:
- path: build\Release\**\*.nupkg
name: nuget
+- path: build\Release\**\*.snupkg
+ name: snupkg
notifications:
- provider: Slack
diff --git a/global.json b/global.json
index 10345833..e101f0d5 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
{
"msbuild-sdks": {
- "WixToolset.Sdk": "4.0.0-build-0163"
+ "WixToolset.Sdk": "4.0.0-build-0192"
}
}
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index f83cc154..b3c6287c 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -22,8 +22,6 @@
<Product>WiX Toolset</Product>
</PropertyGroup>
- <Import Project="CSharp.Build.props" Condition=" '$(MSBuildProjectExtension)'=='.csproj' and Exists('CSharp.Build.props') " />
- <Import Project="Cpp.Build.props" Condition=" Exists('Cpp.Build.props') And '$(MSBuildProjectExtension)'=='.vcxproj' " />
- <Import Project="Wix.Build.props" Condition=" Exists('Wix.Build.props') And '$(MSBuildProjectExtension)'=='.wixproj' " />
+ <Import Project="Directory$(MSBuildProjectExtension).props" Condition=" Exists('Directory$(MSBuildProjectExtension).props') " />
<Import Project="Custom.Build.props" Condition=" Exists('Custom.Build.props') " />
</Project>
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index dac7452a..2fcc765a 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -40,9 +40,12 @@
<ProjectReference Include="@(PackageInSolution->'$(SmartSolutionDir)\%(SmartPath)' )"/>
<!-- Remove the package references that are now referenced as projects -->
- <PackageReference Remove="@(PackageInSolution->'%(PackageName)' )"/>
+ <PackageReference Remove="@(PackageInSolution->'%(PackageName)')"/>
</ItemGroup>
</When>
</Choose>
+
+ <Import Project="Directory$(MSBuildProjectExtension).targets" Condition=" Exists('Directory$(MSBuildProjectExtension).targets') " />
+ <Import Project="Custom.Build.targets" Condition=" Exists('Custom.Build.targets') " />
</Project>
diff --git a/src/Directory.csproj.props b/src/Directory.csproj.props
new file mode 100644
index 00000000..81d24ad1
--- /dev/null
+++ b/src/Directory.csproj.props
@@ -0,0 +1,13 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<!--
+ Do NOT modify this file. Update the canonical version in Home\repo-template\src\CSharp.Build.props
+ then update all of the repos.
+-->
+<Project>
+ <PropertyGroup>
+ <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
+ <SignAssembly>true</SignAssembly>
+ <AssemblyOriginatorKeyFile>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk))</AssemblyOriginatorKeyFile>
+ <NBGV_EmitThisAssemblyClass>false</NBGV_EmitThisAssemblyClass>
+ </PropertyGroup>
+</Project>
diff --git a/src/Directory.csproj.targets b/src/Directory.csproj.targets
new file mode 100644
index 00000000..c3270426
--- /dev/null
+++ b/src/Directory.csproj.targets
@@ -0,0 +1,26 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<!--
+ Do NOT modify this file. Update the canonical version in Home\repo-template\src\Directory.csproj.targets
+ then update all of the repos.
+-->
+<Project>
+ <PropertyGroup>
+ <CreateDocumentation Condition=" '$(CreateDocumentationFile)'!='true' ">false</CreateDocumentation>
+ <DocumentationFile Condition=" '$(CreateDocumentationFile)'=='true' ">$(OutputPath)\$(AssemblyName).xml</DocumentationFile>
+ </PropertyGroup>
+
+ <Target Name="SetNuspecProperties" DependsOnTargets="InitializeSourceControlInformation" AfterTargets="GetBuildVersion"
+ Condition=" Exists('$(MSBuildProjectName).nuspec') ">
+ <PropertyGroup>
+ <ProjectUrl Condition=" '$(ProjectUrl)'=='' and '$(PrivateRepositoryUrl)'!='' ">$(PrivateRepositoryUrl.Replace('.git',''))</ProjectUrl>
+
+ <NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile>
+ <NuspecBasePath Condition=" '$(NuspecBasePath)'=='' ">$(OutputPath)..\</NuspecBasePath>
+ <NuspecProperties>$(NuspecProperties);Id=$(PackageId);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description);Title=$(Title)</NuspecProperties>
+ <NuspecProperties>$(NuspecProperties);Version=$(PackageVersion);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl);ProjectFolder=$(MSBuildProjectDirectory)\;ProjectUrl=$(ProjectUrl)</NuspecProperties>
+ <PublishRepositoryUrl>true</PublishRepositoryUrl>
+ <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+ </PropertyGroup>
+ </Target>
+
+</Project>
diff --git a/src/Directory.vcxproj.props b/src/Directory.vcxproj.props
new file mode 100644
index 00000000..bcf26c57
--- /dev/null
+++ b/src/Directory.vcxproj.props
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+<Project>
+ <PropertyGroup>
+ <Platform Condition=" '$(Platform)' == '' OR '$(Platform)' == 'AnyCPU' ">Win32</Platform>
+ <IntDir>$(BaseIntermediateOutputPath)$(Configuration)\$(Platform)\</IntDir>
+ <OutDir>$(OutputPath)$(Platform)\</OutDir>
+
+ <!-- NBGV properties -->
+ <AssemblyCompany>$(Company)</AssemblyCompany>
+ <AssemblyCopyright>$(Copyright)</AssemblyCopyright>
+
+ <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
+ <NuGetTargetMoniker>native,Version=v0.0</NuGetTargetMoniker>
+ </PropertyGroup>
+
+ <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' AND '$(VisualStudioVersion)'>='15.0'">
+ <WindowsTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion>
+ </PropertyGroup>
+
+ <ItemDefinitionGroup>
+ <ClCompile>
+ <DisableSpecificWarnings>$(DisableSpecificCompilerWarnings)</DisableSpecificWarnings>
+ <WarningLevel>Level4</WarningLevel>
+ <AdditionalIncludeDirectories>$(ProjectDir)inc;$(MSBuildProjectDirectory);$(IntDir);$(SqlCESdkIncludePath);$(ProjectAdditionalIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PrecompiledHeader>Use</PrecompiledHeader>
+ <PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile>
+ <CallingConvention Condition="'$(Platform)'=='Win32'">StdCall</CallingConvention>
+ <TreatWarningAsError>true</TreatWarningAsError>
+ <ExceptionHandling>false</ExceptionHandling>
+ <AdditionalOptions>-YlprecompDefine</AdditionalOptions>
+ <AdditionalOptions Condition=" $(PlatformToolset.StartsWith('v14')) ">/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>
+ <MultiProcessorCompilation Condition=" $(NUMBER_OF_PROCESSORS) > 4 ">true</MultiProcessorCompilation>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>$(ArmPreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(ProjectAdditionalResourceIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ResourceCompile>
+ <Lib>
+ <AdditionalLibraryDirectories>$(OutDir);$(AdditionalMultiTargetLibraryPath);$(ProjectAdditionalLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ </Lib>
+ <Link>
+ <SubSystem>$(ProjectSubSystem)</SubSystem>
+ <ModuleDefinitionFile>$(ProjectModuleDefinitionFile)</ModuleDefinitionFile>
+ <NoEntryPoint>$(ResourceOnlyDll)</NoEntryPoint>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <AdditionalDependencies>$(ProjectAdditionalLinkLibraries);advapi32.lib;comdlg32.lib;user32.lib;oleaut32.lib;gdi32.lib;shell32.lib;ole32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(OutDir);$(AdditionalMultiTargetLibraryPath);$(ArmLibraryDirectories);$(ProjectAdditionalLinkLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalOptions Condition=" $(PlatformToolset.StartsWith('v14')) ">/IGNORE:4099 %(AdditionalOptions)</AdditionalOptions>
+ </Link>
+ </ItemDefinitionGroup>
+
+ <ItemDefinitionGroup Condition=" '$(Platform)'=='Win32' and '$(PlatformToolset)'!='v100'">
+ <ClCompile>
+ <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
+ </ClCompile>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition=" '$(Platform)'=='arm' ">
+ <ClCompile>
+ <CallingConvention>CDecl</CallingConvention>
+ </ClCompile>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition=" '$(ConfigurationType)'=='StaticLibrary' ">
+ <ClCompile>
+ <DebugInformationFormat>OldStyle</DebugInformationFormat>
+ <OmitDefaultLibName>true</OmitDefaultLibName>
+ <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
+ </ClCompile>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition=" '$(Configuration)'=='Debug' ">
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <PreprocessorDefinitions>_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ </ClCompile>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition=" '$(Configuration)'=='Debug' and '$(CLRSupport)'=='true' ">
+ <ClCompile>
+ <BasicRuntimeChecks></BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDll</RuntimeLibrary>
+ </ClCompile>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' ">
+ <ClCompile>
+ <Optimization>MinSpace</Optimization>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ </ClCompile>
+ <Link>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' and '$(CLRSupport)'=='true' ">
+ <ClCompile>
+ <BasicRuntimeChecks></BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDll</RuntimeLibrary>
+ </ClCompile>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition=" '$(CLRSupport)'=='true' ">
+ <Link>
+ <KeyFile>$(LinkKeyFile)</KeyFile>
+ <DelaySign>$(LinkDelaySign)</DelaySign>
+ </Link>
+ </ItemDefinitionGroup>
+</Project>
diff --git a/src/ca/packages.config b/src/ca/packages.config
deleted file mode 100644
index d70a26fe..00000000
--- a/src/ca/packages.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
- <package id="Microsoft.VisualStudio.Setup.Configuration.Native" version="1.14.114" targetFramework="native" developmentDependency="true" />
- <package id="WixToolset.DUtil" version="4.0.30" targetFramework="native" />
- <package id="WixToolset.WcaUtil" version="4.0.16" targetFramework="native" />
-</packages>
\ No newline at end of file
diff --git a/src/ca/vsca.vcxproj b/src/ca/vsca.vcxproj
index e37e94fc..80ff9ff1 100644
--- a/src/ca/vsca.vcxproj
+++ b/src/ca/vsca.vcxproj
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <Import Project="..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" />
- <Import Project="..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props" Condition="Exists('..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props')" />
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -13,6 +12,7 @@
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
+
<PropertyGroup Label="Globals">
<ProjectGuid>{45308B85-0628-4978-8FC8-6AD9E1AD5949}</ProjectGuid>
<ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -23,36 +23,36 @@
<Description>WiX Toolset VS CustomAction</Description>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Label="Shared">
- <Import Project="..\..\packages\Microsoft.VisualStudio.Setup.Configuration.Native.1.14.114\build\native\Microsoft.VisualStudio.Setup.Configuration.Native.targets" Condition="Exists('..\..\packages\Microsoft.VisualStudio.Setup.Configuration.Native.1.14.114\build\native\Microsoft.VisualStudio.Setup.Configuration.Native.targets')" />
- </ImportGroup>
+
<PropertyGroup>
<ProjectAdditionalLinkLibraries>msi.lib</ProjectAdditionalLinkLibraries>
</PropertyGroup>
+
<ItemGroup>
<ClCompile Include="dllmain.cpp">
<PrecompiledHeader>Create</PrecompiledHeader>
</ClCompile>
<ClCompile Include="vsca.cpp" />
</ItemGroup>
+
<ItemGroup>
<ClInclude Include="precomp.h" />
</ItemGroup>
+
<ItemGroup>
- <None Include="packages.config" />
<None Include="vsca.def" />
</ItemGroup>
+
+ <ItemGroup>
+ <PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Native" Version="1.14.114" />
+ <PackageReference Include="WixToolset.Dutil" Version="4.0.62" />
+ <PackageReference Include="WixToolset.WcaUtil" Version="4.0.18" />
+ <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" />
+ <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" />
+ </ItemGroup>
+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
- <PropertyGroup>
- <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>
- </PropertyGroup>
- <Error Condition="!Exists('..\..\packages\Microsoft.VisualStudio.Setup.Configuration.Native.1.14.114\build\native\Microsoft.VisualStudio.Setup.Configuration.Native.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.VisualStudio.Setup.Configuration.Native.1.14.114\build\native\Microsoft.VisualStudio.Setup.Configuration.Native.targets'))" />
- <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props'))" />
- <Error Condition="!Exists('..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props'))" />
- </Target>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/WixToolsetTest.VisualStudio/WixToolsetTest.VisualStudio.csproj b/src/test/WixToolsetTest.VisualStudio/WixToolsetTest.VisualStudio.csproj
index 6bb325c6..9172569f 100644
--- a/src/test/WixToolsetTest.VisualStudio/WixToolsetTest.VisualStudio.csproj
+++ b/src/test/WixToolsetTest.VisualStudio/WixToolsetTest.VisualStudio.csproj
@@ -12,10 +12,7 @@
</PropertyGroup>
<ItemGroup>
- <Content Include="TestData\UsingVsixPackage\example.txt" CopyToOutputDirectory="PreserveNewest" />
- <Content Include="TestData\UsingVsixPackage\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" />
- <Content Include="TestData\UsingVsixPackage\Package.wxs" CopyToOutputDirectory="PreserveNewest" />
- <Content Include="TestData\UsingVsixPackage\PackageComponents.wxs" CopyToOutputDirectory="PreserveNewest" />
+ <Content Include="TestData\**" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>
<ItemGroup>
diff --git a/src/wixext/WixToolset.VisualStudio.wixext.csproj b/src/wixext/WixToolset.VisualStudio.wixext.csproj
index bb7bba6b..82aa0d1d 100644
--- a/src/wixext/WixToolset.VisualStudio.wixext.csproj
+++ b/src/wixext/WixToolset.VisualStudio.wixext.csproj
@@ -8,23 +8,24 @@
<Description>WiX Toolset Visual Studio Extension</Description>
<Title>WiX Toolset VS Extension</Title>
<IsTool>true</IsTool>
- <ContentTargetFolders>build</ContentTargetFolders>
+ <IncludeSymbols>true</IncludeSymbols>
</PropertyGroup>
<ItemGroup>
- <Content Include="$(MSBuildThisFileName).targets" />
<EmbeddedResource Include="$(OutputPath)..\vs.wixlib" />
</ItemGroup>
<ItemGroup>
- <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" PrivateAssets="all" />
+ <ProjectReference Include="..\wixlib\vs.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\wixlib\vs.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " />
+ <PackageReference Include="WixToolset.Data" Version="4.0.*" PrivateAssets="all" />
+ <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" PrivateAssets="all" />
</ItemGroup>
<ItemGroup>
- <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" />
+ <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="all" />
+ <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" />
</ItemGroup>
</Project>
diff --git a/src/wixext/WixToolset.VisualStudio.wixext.nuspec b/src/wixext/WixToolset.VisualStudio.wixext.nuspec
new file mode 100644
index 00000000..51c9708e
--- /dev/null
+++ b/src/wixext/WixToolset.VisualStudio.wixext.nuspec
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+ <metadata minClientVersion="4.0">
+ <id>$id$</id>
+ <version>$version$</version>
+ <title>$title$</title>
+ <description>$description$</description>
+ <authors>$authors$</authors>
+ <license type="expression">MS-RL</license>
+ <requireLicenseAcceptance>false</requireLicenseAcceptance>
+ <copyright>$copyright$</copyright>
+ <projectUrl>$projectUrl$</projectUrl>
+ <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
+ </metadata>
+
+ <files>
+ <file src="$projectFolder$$id$.targets" target="build" />
+
+ <file src="netstandard2.0\$id$.dll" target="tools" />
+
+ <file src="x86\*.pdb" target="pdbs\x86" />
+ </files>
+</package>
diff --git a/src/wixlib/vs.wixproj b/src/wixlib/vs.wixproj
index 8da8378d..40333913 100644
--- a/src/wixlib/vs.wixproj
+++ b/src/wixlib/vs.wixproj
@@ -1,4 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
<Project Sdk="WixToolset.Sdk">
<PropertyGroup>
@@ -8,11 +10,11 @@
</PropertyGroup>
<ItemGroup>
- <ProjectReference Include="..\ca\vsca.vcxproj" />
+ <ProjectReference Include="..\ca\vsca.vcxproj" Properties="Platform=x86" ReferenceOutputAssembly="false" />
</ItemGroup>
<ItemGroup>
- <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" />
+ <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" />
</ItemGroup>
</Project>
--
cgit v1.2.3-55-g6feb