diff options
| author | Rob Mensching <rob@firegiant.com> | 2021-04-08 07:54:35 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2021-04-08 07:56:33 -0700 |
| commit | f283708b2a9b38459345ce433204d854d478c94a (patch) | |
| tree | 2cd61fe4efca1e373318ac9b7ea281c49690f7e2 | |
| parent | d15c04e29d7ac167e382efe37365b8fa451728de (diff) | |
| download | wix-f283708b2a9b38459345ce433204d854d478c94a.tar.gz wix-f283708b2a9b38459345ce433204d854d478c94a.tar.bz2 wix-f283708b2a9b38459345ce433204d854d478c94a.zip | |
Update dependencies
| -rw-r--r-- | global.json | 2 | ||||
| -rw-r--r-- | src/ca/vsca.vcxproj | 2 | ||||
| -rw-r--r-- | src/test/WixToolsetTest.VisualStudio/TestData/UsingVsixPackage/Package.wxs | 8 | ||||
| -rw-r--r-- | src/wixext/WixToolset.VisualStudio.wixext.csproj | 1 | ||||
| -rw-r--r-- | src/wixlib/vs.wixproj | 1 |
5 files changed, 5 insertions, 9 deletions
diff --git a/global.json b/global.json index e101f0d5..fc26eb6e 100644 --- a/global.json +++ b/global.json | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | { | 1 | { |
| 2 | "msbuild-sdks": { | 2 | "msbuild-sdks": { |
| 3 | "WixToolset.Sdk": "4.0.0-build-0192" | 3 | "WixToolset.Sdk": "4.0.0-build-0206" |
| 4 | } | 4 | } |
| 5 | } | 5 | } |
diff --git a/src/ca/vsca.vcxproj b/src/ca/vsca.vcxproj index 80ff9ff1..f4fbcc46 100644 --- a/src/ca/vsca.vcxproj +++ b/src/ca/vsca.vcxproj | |||
| @@ -48,7 +48,7 @@ | |||
| 48 | 48 | ||
| 49 | <ItemGroup> | 49 | <ItemGroup> |
| 50 | <PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Native" Version="1.14.114" /> | 50 | <PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Native" Version="1.14.114" /> |
| 51 | <PackageReference Include="WixToolset.Dutil" Version="4.0.62" /> | 51 | <PackageReference Include="WixToolset.Dutil" Version="4.0.65" /> |
| 52 | <PackageReference Include="WixToolset.WcaUtil" Version="4.0.18" /> | 52 | <PackageReference Include="WixToolset.WcaUtil" Version="4.0.18" /> |
| 53 | <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" /> | 53 | <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" /> |
| 54 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" /> | 54 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" /> |
diff --git a/src/test/WixToolsetTest.VisualStudio/TestData/UsingVsixPackage/Package.wxs b/src/test/WixToolsetTest.VisualStudio/TestData/UsingVsixPackage/Package.wxs index e0e6f11e..c2196807 100644 --- a/src/test/WixToolsetTest.VisualStudio/TestData/UsingVsixPackage/Package.wxs +++ b/src/test/WixToolsetTest.VisualStudio/TestData/UsingVsixPackage/Package.wxs | |||
| @@ -10,10 +10,8 @@ | |||
| 10 | </Package> | 10 | </Package> |
| 11 | 11 | ||
| 12 | <Fragment> | 12 | <Fragment> |
| 13 | <Directory Id="TARGETDIR" Name="SourceDir"> | 13 | <StandardDirectory Id="ProgramFilesFolder"> |
| 14 | <Directory Id="ProgramFilesFolder"> | 14 | <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> |
| 15 | <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> | 15 | </StandardDirectory> |
| 16 | </Directory> | ||
| 17 | </Directory> | ||
| 18 | </Fragment> | 16 | </Fragment> |
| 19 | </Wix> | 17 | </Wix> |
diff --git a/src/wixext/WixToolset.VisualStudio.wixext.csproj b/src/wixext/WixToolset.VisualStudio.wixext.csproj index 82aa0d1d..20282720 100644 --- a/src/wixext/WixToolset.VisualStudio.wixext.csproj +++ b/src/wixext/WixToolset.VisualStudio.wixext.csproj | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | </ItemGroup> | 20 | </ItemGroup> |
| 21 | 21 | ||
| 22 | <ItemGroup> | 22 | <ItemGroup> |
| 23 | <PackageReference Include="WixToolset.Data" Version="4.0.*" PrivateAssets="all" /> | ||
| 24 | <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" PrivateAssets="all" /> | 23 | <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" PrivateAssets="all" /> |
| 25 | </ItemGroup> | 24 | </ItemGroup> |
| 26 | 25 | ||
diff --git a/src/wixlib/vs.wixproj b/src/wixlib/vs.wixproj index 40333913..db3e2cff 100644 --- a/src/wixlib/vs.wixproj +++ b/src/wixlib/vs.wixproj | |||
| @@ -16,5 +16,4 @@ | |||
| 16 | <ItemGroup> | 16 | <ItemGroup> |
| 17 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" /> | 17 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" /> |
| 18 | </ItemGroup> | 18 | </ItemGroup> |
| 19 | |||
| 20 | </Project> | 19 | </Project> |