diff options
author | Rob Mensching <rob@firegiant.com> | 2021-04-07 23:05:49 -0700 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2021-04-07 23:08:59 -0700 |
commit | 79cc786be11fb288374222287c549b910e4ce65d (patch) | |
tree | 97065ad0956bd414cbd2dd34022d29b0c7b79e0e | |
parent | 8203897431e76a2a9162bd2e5e019cc8628fc200 (diff) | |
download | wix-79cc786be11fb288374222287c549b910e4ce65d.tar.gz wix-79cc786be11fb288374222287c549b910e4ce65d.tar.bz2 wix-79cc786be11fb288374222287c549b910e4ce65d.zip |
Update dependencies
-rw-r--r-- | global.json | 2 | ||||
-rw-r--r-- | src/test/WixToolsetTest.PowerShell/TestData/TypesFile/Package.wxs | 8 | ||||
-rw-r--r-- | src/wixext/PSCompiler.cs | 2 | ||||
-rw-r--r-- | src/wixext/WixToolset.PowerShell.wixext.csproj | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/global.json b/global.json index 77a81322..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-0170" | 3 | "WixToolset.Sdk": "4.0.0-build-0206" |
4 | } | 4 | } |
5 | } | 5 | } |
diff --git a/src/test/WixToolsetTest.PowerShell/TestData/TypesFile/Package.wxs b/src/test/WixToolsetTest.PowerShell/TestData/TypesFile/Package.wxs index 082ac4cc..411893bc 100644 --- a/src/test/WixToolsetTest.PowerShell/TestData/TypesFile/Package.wxs +++ b/src/test/WixToolsetTest.PowerShell/TestData/TypesFile/Package.wxs | |||
@@ -8,10 +8,8 @@ | |||
8 | </Package> | 8 | </Package> |
9 | 9 | ||
10 | <Fragment> | 10 | <Fragment> |
11 | <Directory Id="TARGETDIR" Name="SourceDir"> | 11 | <StandardDirectory Id="ProgramFilesFolder"> |
12 | <Directory Id="ProgramFilesFolder"> | 12 | <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> |
13 | <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> | 13 | </StandardDirectory> |
14 | </Directory> | ||
15 | </Directory> | ||
16 | </Fragment> | 14 | </Fragment> |
17 | </Wix> | 15 | </Wix> |
diff --git a/src/wixext/PSCompiler.cs b/src/wixext/PSCompiler.cs index 3b09897a..37591282 100644 --- a/src/wixext/PSCompiler.cs +++ b/src/wixext/PSCompiler.cs | |||
@@ -175,7 +175,7 @@ namespace WixToolset.PowerShell | |||
175 | // for use in Formats and Types files. PowerShell v2 still uses 1. | 175 | // for use in Formats and Types files. PowerShell v2 still uses 1. |
176 | var major = (2 == requiredPowerShellVersion.Major) ? 1 : requiredPowerShellVersion.Major; | 176 | var major = (2 == requiredPowerShellVersion.Major) ? 1 : requiredPowerShellVersion.Major; |
177 | 177 | ||
178 | var variableId = new Identifier(AccessModifier.Public, String.Format(CultureInfo.InvariantCulture, "{0}_{1}", VarPrefix, id)); | 178 | var variableId = new Identifier(AccessModifier.Global, String.Format(CultureInfo.InvariantCulture, "{0}_{1}", VarPrefix, id)); |
179 | section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, variableId) | 179 | section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, variableId) |
180 | { | 180 | { |
181 | Value = major.ToString(CultureInfo.InvariantCulture), | 181 | Value = major.ToString(CultureInfo.InvariantCulture), |
diff --git a/src/wixext/WixToolset.PowerShell.wixext.csproj b/src/wixext/WixToolset.PowerShell.wixext.csproj index 32bd9bac..a89a574c 100644 --- a/src/wixext/WixToolset.PowerShell.wixext.csproj +++ b/src/wixext/WixToolset.PowerShell.wixext.csproj | |||
@@ -10,10 +10,12 @@ | |||
10 | <IsTool>true</IsTool> | 10 | <IsTool>true</IsTool> |
11 | <ContentTargetFolders>build</ContentTargetFolders> | 11 | <ContentTargetFolders>build</ContentTargetFolders> |
12 | </PropertyGroup> | 12 | </PropertyGroup> |
13 | |||
13 | <ItemGroup> | 14 | <ItemGroup> |
14 | <Content Include="$(MSBuildThisFileName).targets" /> | 15 | <Content Include="$(MSBuildThisFileName).targets" /> |
15 | <EmbeddedResource Include="$(OutputPath)..\powershell.wixlib" /> | 16 | <EmbeddedResource Include="$(OutputPath)..\powershell.wixlib" /> |
16 | </ItemGroup> | 17 | </ItemGroup> |
18 | |||
17 | <ItemGroup> | 19 | <ItemGroup> |
18 | <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" PrivateAssets="all" /> | 20 | <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" PrivateAssets="all" /> |
19 | </ItemGroup> | 21 | </ItemGroup> |