Add the missing x64 wxs files and update dependencies.
Sean Hall committed
Dec 19, 2020 at 19:56 UTC
045024c3b35e3bee44f33fbe0fb43a1704a18c5c
22 files changed
+48
-34
global.json
+1
-1
@@ -1,6 +1,6 @@
1
{
2
"msbuild-sdks": {
3
- "WixToolset.Sdk": "4.0.0-build-0172"
3
+ "WixToolset.Sdk": "4.0.0-build-0175"
4
},
5
"sdk": {
6
"allowPrerelease": false
src/CSharp.Build.props
+2
@@ -5,7 +5,9 @@
5
-->
6
<Project>
7
<PropertyGroup>
8
+ <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
9
<SignAssembly>true</SignAssembly>
10
<AssemblyOriginatorKeyFile>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk))</AssemblyOriginatorKeyFile>
11
+ <NBGV_EmitThisAssemblyClass>false</NBGV_EmitThisAssemblyClass>
12
</PropertyGroup>
13
</Project>
src/Directory.Build.targets
+8
@@ -9,6 +9,11 @@
9
See the original here: https://github.com/dotnet/sdk/issues/1151#issuecomment-385133284
10
-->
11
<Project>
12
+ <PropertyGroup>
13
+ <CreateDocumentation Condition=" '$(CreateDocumentationFile)'!='true' ">false</CreateDocumentation>
14
+ <DocumentationFile Condition=" '$(CreateDocumentationFile)'=='true' ">$(OutputPath)\$(AssemblyName).xml</DocumentationFile>
15
+ </PropertyGroup>
16
+
17
<PropertyGroup>
18
<ReplacePackageReferences>true</ReplacePackageReferences>
19
<TheSolutionPath Condition=" '$(NCrunch)'=='' ">$(SolutionPath)</TheSolutionPath>
@@ -45,4 +50,7 @@
50
51
</When>
52
</Choose>
53
+
54
+ <Import Project="Wix.Build.targets" Condition=" Exists('Wix.Build.targets') And '$(MSBuildProjectExtension)'=='.wixproj' " />
55
+ <Import Project="Custom.Build.targets" Condition=" Exists('Custom.Build.targets') " />
56
</Project>
src/Samples/bafunctions/bafunctions.vcxproj
+2
-2
@@ -2,7 +2,7 @@
2
<!-- 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. -->
3
4
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
5
- <Import Project="..\..\..\packages\WixToolset.BalUtil.4.0.44\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\packages\WixToolset.BalUtil.4.0.44\build\WixToolset.BalUtil.props')" />
5
+ <Import Project="..\..\..\packages\WixToolset.BalUtil.4.0.45\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\packages\WixToolset.BalUtil.4.0.45\build\WixToolset.BalUtil.props')" />
6
<Import Project="..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.54\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.54\build\WixToolset.BootstrapperCore.Native.props')" />
7
<Import Project="..\..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props')" />
8
@@ -73,7 +73,7 @@
73
<PropertyGroup>
74
<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>
75
</PropertyGroup>
76
- <Error Condition="!Exists('..\..\..\packages\WixToolset.BalUtil.4.0.44\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BalUtil.4.0.44\build\WixToolset.BalUtil.props'))" />
76
+ <Error Condition="!Exists('..\..\..\packages\WixToolset.BalUtil.4.0.45\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BalUtil.4.0.45\build\WixToolset.BalUtil.props'))" />
77
<Error Condition="!Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.54\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.54\build\WixToolset.BootstrapperCore.Native.props'))" />
78
<Error Condition="!Exists('..\..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props'))" />
79
<Error Condition="!Exists('..\..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" />
src/Samples/bafunctions/packages.config
+1
-1
@@ -2,6 +2,6 @@
2
<packages>
3
<package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" />
4
<package id="WixToolset.BootstrapperCore.Native" version="4.0.54" targetFramework="native" />
5
- <package id="WixToolset.BalUtil" version="4.0.44" targetFramework="native" />
5
+ <package id="WixToolset.BalUtil" version="4.0.45" targetFramework="native" />
6
<package id="WixToolset.DUtil" version="4.0.56" targetFramework="native" />
7
</packages>
\ No newline at end of file
src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj
+1
-1
@@ -3,7 +3,7 @@
3
4
<Project Sdk="Microsoft.NET.Sdk">
5
<PropertyGroup>
6
- <TargetFramework>netcoreapp3.0</TargetFramework>
6
+ <TargetFramework>netcoreapp3.1</TargetFramework>
7
<RootNamespace>WixToolset.Dnc.Host</RootNamespace>
8
<Description>WiX Toolset .NET Core BA Host</Description>
9
<Title>WiX Toolset .NET Core BA Host</Title>
src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj
+1
-7
@@ -11,11 +11,9 @@
11
<AssemblyName>WixToolset.Mba.Host</AssemblyName>
12
<OutputType>Library</OutputType>
13
<RootNamespace>WixToolset.Mba.Host</RootNamespace>
14
- <NoWarn>0693;1591</NoWarn>
14
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
15
<Description>Managed Bootstrapper Application entry point</Description>
16
<DebugType>embedded</DebugType>
18
- <NBGV_EmitThisAssemblyClass>false</NBGV_EmitThisAssemblyClass>
17
</PropertyGroup>
18
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
19
<DebugSymbols>true</DebugSymbols>
@@ -49,7 +47,7 @@
47
<Reference Include="System.Data" />
48
<Reference Include="System.Xml" />
49
<Reference Include="WixToolset.Mba.Core">
52
- <HintPath>..\..\packages\WixToolset.Mba.Core.4.0.44\lib\net20\WixToolset.Mba.Core.dll</HintPath>
50
+ <HintPath>..\..\packages\WixToolset.Mba.Core.4.0.45\lib\net20\WixToolset.Mba.Core.dll</HintPath>
51
</Reference>
52
</ItemGroup>
53
<ItemGroup>
@@ -96,8 +94,4 @@
94
<Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets'))" />
95
<Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" />
96
</Target>
99
-
100
- <PropertyGroup Condition=" '$(CreateDocumentation)'!='false' ">
101
- <DocumentationFile>$(OutputPath)\$(AssemblyName).xml</DocumentationFile>
102
- </PropertyGroup>
97
</Project>
\ No newline at end of file
src/WixToolset.Mba.Host/WixToolset.Mba.Host.nuspec
+4
@@ -10,6 +10,10 @@
10
<requireLicenseAcceptance>false</requireLicenseAcceptance>
11
<description>$description$</description>
12
<copyright>$copyright$</copyright>
13
+ <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
14
+ <dependencies>
15
+ <group targetFramework=".NETFramework2.0" />
16
+ </dependencies>
17
</metadata>
18
19
<files>
src/WixToolset.Mba.Host/packages.config
+1
-1
@@ -4,5 +4,5 @@
4
<package id="Microsoft.SourceLink.Common" version="1.0.0" targetFramework="net20" developmentDependency="true" />
5
<package id="Microsoft.SourceLink.GitHub" version="1.0.0" targetFramework="net20" developmentDependency="true" />
6
<package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="net20" developmentDependency="true" />
7
- <package id="WixToolset.Mba.Core" version="4.0.44" targetFramework="net20" />
7
+ <package id="WixToolset.Mba.Core" version="4.0.45" targetFramework="net20" />
8
</packages>
\ No newline at end of file
src/dnchost/dnchost.vcxproj
+2
-2
@@ -4,7 +4,7 @@
4
<Import Project="..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" />
5
<Import Project="..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" />
6
<Import Project="..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" />
7
- <Import Project="..\..\packages\WixToolset.BalUtil.4.0.44\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.44\build\WixToolset.BalUtil.props')" />
7
+ <Import Project="..\..\packages\WixToolset.BalUtil.4.0.45\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.45\build\WixToolset.BalUtil.props')" />
8
<Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.54\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.54\build\WixToolset.BootstrapperCore.Native.props')" />
9
<Import Project="..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props')" />
10
<ItemGroup Label="ProjectConfigurations">
@@ -96,7 +96,7 @@
96
<Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props'))" />
97
<Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets'))" />
98
<Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" />
99
- <Error Condition="!Exists('..\..\packages\WixToolset.BalUtil.4.0.44\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.44\build\WixToolset.BalUtil.props'))" />
99
+ <Error Condition="!Exists('..\..\packages\WixToolset.BalUtil.4.0.45\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.45\build\WixToolset.BalUtil.props'))" />
100
<Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.54\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.54\build\WixToolset.BootstrapperCore.Native.props'))" />
101
<Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props'))" />
102
</Target>
src/dnchost/packages.config
+1
-1
@@ -7,7 +7,7 @@
7
<package id="runtime.win-arm64.Microsoft.NETCore.DotNetAppHost" version="5.0.0" targetFramework="native" />
8
<package id="runtime.win-x64.Microsoft.NETCore.DotNetAppHost" version="5.0.0" targetFramework="native" />
9
<package id="runtime.win-x86.Microsoft.NETCore.DotNetAppHost" version="5.0.0" targetFramework="native" />
10
- <package id="WixToolset.BalUtil" version="4.0.44" targetFramework="native" />
10
+ <package id="WixToolset.BalUtil" version="4.0.45" targetFramework="native" />
11
<package id="WixToolset.BootstrapperCore.Native" version="4.0.54" targetFramework="native" />
12
<package id="WixToolset.DUtil" version="4.0.56" targetFramework="native" />
13
</packages>
\ No newline at end of file
src/mbahost/mbahost.vcxproj
+2
-2
@@ -5,7 +5,7 @@
5
<Import Project="..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" />
6
<Import Project="..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" />
7
<Import Project="..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" />
8
- <Import Project="..\..\packages\WixToolset.BalUtil.4.0.44\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.44\build\WixToolset.BalUtil.props')" />
8
+ <Import Project="..\..\packages\WixToolset.BalUtil.4.0.45\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.45\build\WixToolset.BalUtil.props')" />
9
<Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.54\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.54\build\WixToolset.BootstrapperCore.Native.props')" />
10
<Import Project="..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props')" />
11
@@ -99,7 +99,7 @@
99
<Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props'))" />
100
<Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets'))" />
101
<Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" />
102
- <Error Condition="!Exists('..\..\packages\WixToolset.BalUtil.4.0.44\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.44\build\WixToolset.BalUtil.props'))" />
102
+ <Error Condition="!Exists('..\..\packages\WixToolset.BalUtil.4.0.45\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.45\build\WixToolset.BalUtil.props'))" />
103
<Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.54\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.54\build\WixToolset.BootstrapperCore.Native.props'))" />
104
<Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props'))" />
105
</Target>
src/mbahost/packages.config
+1
-1
@@ -4,7 +4,7 @@
4
<package id="Microsoft.SourceLink.Common" version="1.0.0" targetFramework="native" developmentDependency="true" />
5
<package id="Microsoft.SourceLink.GitHub" version="1.0.0" targetFramework="native" developmentDependency="true" />
6
<package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" />
7
- <package id="WixToolset.BalUtil" version="4.0.44" targetFramework="native" />
7
+ <package id="WixToolset.BalUtil" version="4.0.45" targetFramework="native" />
8
<package id="WixToolset.BootstrapperCore.Native" version="4.0.54" targetFramework="native" />
9
<package id="WixToolset.DUtil" version="4.0.56" targetFramework="native" />
10
</packages>
\ No newline at end of file
src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj
-4
@@ -7,10 +7,6 @@
7
<IsPackable>false</IsPackable>
8
</PropertyGroup>
9
10
- <PropertyGroup>
11
- <NoWarn>NU1701</NoWarn>
12
- </PropertyGroup>
13
-
10
<ItemGroup>
11
<Content Include="TestData\MBA\Bundle.wxs" CopyToOutputDirectory="PreserveNewest" />
12
<Content Include="TestData\Overridable\Bundle.wxs" CopyToOutputDirectory="PreserveNewest" />
src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj
-4
@@ -6,10 +6,6 @@
6
<TargetFramework>netcoreapp3.1</TargetFramework>
7
</PropertyGroup>
8
9
- <PropertyGroup>
10
- <NoWarn>NU1701</NoWarn>
11
- </PropertyGroup>
12
-
9
<ItemGroup>
10
<ProjectReference Include="..\examples\TestEngine\Example.TestEngine.vcxproj" />
11
</ItemGroup>
src/test/examples/TestEngine/Example.TestEngine.vcxproj
+2
-2
@@ -1,7 +1,7 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<!-- 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. -->
3
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
4
- <Import Project="..\..\..\..\packages\WixToolset.BalUtil.4.0.44\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.44\build\WixToolset.BalUtil.props')" />
4
+ <Import Project="..\..\..\..\packages\WixToolset.BalUtil.4.0.45\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.45\build\WixToolset.BalUtil.props')" />
5
<Import Project="..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.54\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.54\build\WixToolset.BootstrapperCore.Native.props')" />
6
<Import Project="..\..\..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props')" />
7
<ItemGroup Label="ProjectConfigurations">
@@ -76,7 +76,7 @@
76
<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>
77
</PropertyGroup>
78
<Error Condition="!Exists('..\..\..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" />
79
- <Error Condition="!Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.44\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.BalUtil.4.0.44\build\WixToolset.BalUtil.props'))" />
79
+ <Error Condition="!Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.45\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.BalUtil.4.0.45\build\WixToolset.BalUtil.props'))" />
80
<Error Condition="!Exists('..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.54\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.54\build\WixToolset.BootstrapperCore.Native.props'))" />
81
<Error Condition="!Exists('..\..\..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props'))" />
82
</Target>
src/test/examples/TestEngine/packages.config
+1
-1
@@ -2,6 +2,6 @@
2
<packages>
3
<package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" />
4
<package id="WixToolset.BootstrapperCore.Native" version="4.0.54" targetFramework="native" />
5
- <package id="WixToolset.BalUtil" version="4.0.44" targetFramework="native" />
5
+ <package id="WixToolset.BalUtil" version="4.0.45" targetFramework="native" />
6
<package id="WixToolset.DUtil" version="4.0.56" targetFramework="native" />
7
</packages>
\ No newline at end of file
src/wixlib/BalExtension_arm64.wxs
new
+7
@@ -0,0 +1,7 @@
1
+<!-- 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. -->
2
+
3
+
4
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
5
+ <?define platform=arm64 ?>
6
+ <?include BalExtension_platform.wxi ?>
7
+</Wix>
src/wixlib/BalExtension_x64.wxs
new
+7
@@ -0,0 +1,7 @@
1
+<!-- 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. -->
2
+
3
+
4
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
5
+ <?define platform=x64 ?>
6
+ <?include BalExtension_platform.wxi ?>
7
+</Wix>
src/wixlib/bal.wixproj
+1
-1
@@ -7,7 +7,7 @@
7
</PropertyGroup>
8
<ItemGroup>
9
<BindInputPaths Include="..\wixstdba\Resources\" />
10
- <BindInputPaths Include="$(OutputPath)netcoreapp3.0" />
10
+ <BindInputPaths Include="$(OutputPath)netcoreapp3.1" />
11
<BindInputPaths Include="$(OutputPath)" />
12
<BindInputPaths Include="$(OutputPath)x86" BindName="x86" />
13
<BindInputPaths Include="$(OutputPath)x64" BindName="x64" />
src/wixstdba/packages.config
+1
-1
@@ -4,7 +4,7 @@
4
<package id="Microsoft.SourceLink.Common" version="1.0.0" targetFramework="native" developmentDependency="true" />
5
<package id="Microsoft.SourceLink.GitHub" version="1.0.0" targetFramework="native" developmentDependency="true" />
6
<package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" />
7
- <package id="WixToolset.BalUtil" version="4.0.44" targetFramework="native" />
7
+ <package id="WixToolset.BalUtil" version="4.0.45" targetFramework="native" />
8
<package id="WixToolset.BootstrapperCore.Native" version="4.0.54" targetFramework="native" />
9
<package id="WixToolset.DUtil" version="4.0.56" targetFramework="native" />
10
</packages>
\ No newline at end of file
src/wixstdba/wixstdba.vcxproj
+2
-2
@@ -5,7 +5,7 @@
5
<Import Project="..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" />
6
<Import Project="..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" />
7
<Import Project="..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" />
8
- <Import Project="..\..\packages\WixToolset.BalUtil.4.0.44\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.44\build\WixToolset.BalUtil.props')" />
8
+ <Import Project="..\..\packages\WixToolset.BalUtil.4.0.45\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.45\build\WixToolset.BalUtil.props')" />
9
<Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.54\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.54\build\WixToolset.BootstrapperCore.Native.props')" />
10
<Import Project="..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props')" />
11
@@ -94,7 +94,7 @@ rc.exe -fo "$(OutDir)wixstdba.res" "$(IntDir)wixstdba.messages.rc"</Command>
94
<Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props'))" />
95
<Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets'))" />
96
<Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" />
97
- <Error Condition="!Exists('..\..\packages\WixToolset.BalUtil.4.0.44\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.44\build\WixToolset.BalUtil.props'))" />
97
+ <Error Condition="!Exists('..\..\packages\WixToolset.BalUtil.4.0.45\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.45\build\WixToolset.BalUtil.props'))" />
98
<Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.54\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.54\build\WixToolset.BootstrapperCore.Native.props'))" />
99
<Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props'))" />
100
</Target>