Update dependencies.
Sean Hall committed
Jun 22, 2020 at 14:34 UTC
e4f1a4310f09e3777d035f35f4b4ca69d69f5083
27 files changed
+109
-149
appveyor.cmd
+8
-7
@@ -1,17 +1,18 @@
1
@setlocal
2
@pushd %~dp0
3
+@set _C=Release
4
4
-nuget restore
5
+nuget restore || exit /b
6
6
-msbuild -p:Configuration=Release -t:Restore
7
+msbuild -p:Configuration=%_C% -t:Restore || exit /b
8
8
-msbuild -p:Configuration=Release
9
+msbuild -p:Configuration=%_C% || exit /b
10
10
-msbuild -p:Configuration=Release -t:Pack src\wixext\WixToolset.Bal.wixext.csproj
11
-msbuild -p:Configuration=Release -t:Pack src\WixToolset.Mba.Host\WixToolset.Mba.Host.csproj
11
+msbuild -p:Configuration=%_C% -t:Pack src\wixext\WixToolset.Bal.wixext.csproj || exit /b
12
+msbuild -p:Configuration=%_C% -t:Pack src\WixToolset.Mba.Host\WixToolset.Mba.Host.csproj || exit /b
13
13
-msbuild -p:Configuration=Release src\test\WixToolsetTest.Bal\WixToolsetTest.Bal.csproj
14
-dotnet test -c Release --no-build src\test\WixToolsetTest.Bal
14
+msbuild -p:Configuration=%_C% src\test\WixToolsetTest.Bal\WixToolsetTest.Bal.csproj || exit /b
15
+dotnet test -c %_C% --no-build src\test\WixToolsetTest.Bal || exit /b
16
17
@popd
18
@endlocal
\ No newline at end of file
src/Samples/bafunctions/bafunctions.vcxproj
+4
-4
@@ -2,9 +2,9 @@
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.22\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\packages\WixToolset.BalUtil.4.0.22\build\WixToolset.BalUtil.props')" />
5
+ <Import Project="..\..\..\packages\WixToolset.BalUtil.4.0.26\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\packages\WixToolset.BalUtil.4.0.26\build\WixToolset.BalUtil.props')" />
6
<Import Project="..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" />
7
- <Import Project="..\..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props')" />
7
+ <Import Project="..\..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props')" />
8
9
<ItemGroup Label="ProjectConfigurations">
10
<ProjectConfiguration Include="Debug|Win32">
@@ -57,9 +57,9 @@
57
<PropertyGroup>
58
<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>
59
</PropertyGroup>
60
- <Error Condition="!Exists('..\..\..\packages\WixToolset.BalUtil.4.0.22\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BalUtil.4.0.22\build\WixToolset.BalUtil.props'))" />
60
+ <Error Condition="!Exists('..\..\..\packages\WixToolset.BalUtil.4.0.26\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BalUtil.4.0.26\build\WixToolset.BalUtil.props'))" />
61
<Error Condition="!Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props'))" />
62
- <Error Condition="!Exists('..\..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props'))" />
62
+ <Error Condition="!Exists('..\..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props'))" />
63
<Error Condition="!Exists('..\..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />
64
</Target>
65
</Project>
src/Samples/bafunctions/packages.config
+2
-2
@@ -2,6 +2,6 @@
2
<packages>
3
<package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" />
4
<package id="WixToolset.BootstrapperCore.Native" version="4.0.16" targetFramework="native" />
5
- <package id="WixToolset.BalUtil" version="4.0.22" targetFramework="native" />
6
- <package id="WixToolset.DUtil" version="4.0.23" targetFramework="native" />
5
+ <package id="WixToolset.BalUtil" version="4.0.26" targetFramework="native" />
6
+ <package id="WixToolset.DUtil" version="4.0.28" targetFramework="native" />
7
</packages>
\ No newline at end of file
src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj
+1
-1
@@ -44,7 +44,7 @@
44
<Reference Include="System.Data" />
45
<Reference Include="System.Xml" />
46
<Reference Include="WixToolset.Mba.Core">
47
- <HintPath>..\..\packages\WixToolset.Mba.Core.4.0.22\lib\net20\WixToolset.Mba.Core.dll</HintPath>
47
+ <HintPath>..\..\packages\WixToolset.Mba.Core.4.0.26\lib\net20\WixToolset.Mba.Core.dll</HintPath>
48
</Reference>
49
</ItemGroup>
50
<ItemGroup>
src/WixToolset.Mba.Host/packages.config
+1
-1
@@ -1,5 +1,5 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<packages>
3
<package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="net20" developmentDependency="true" />
4
- <package id="WixToolset.Mba.Core" version="4.0.22" targetFramework="net20" />
4
+ <package id="WixToolset.Mba.Core" version="4.0.26" targetFramework="net20" />
5
</packages>
\ No newline at end of file
src/dnchost/dnchost.vcxproj
+4
-4
@@ -1,9 +1,9 @@
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.22\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.22\build\WixToolset.BalUtil.props')" />
4
+ <Import Project="..\..\packages\WixToolset.BalUtil.4.0.26\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.26\build\WixToolset.BalUtil.props')" />
5
<Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" />
6
- <Import Project="..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props')" />
6
+ <Import Project="..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props')" />
7
<ItemGroup Label="ProjectConfigurations">
8
<ProjectConfiguration Include="Debug|Win32">
9
<Configuration>Debug</Configuration>
@@ -69,9 +69,9 @@
69
<PropertyGroup>
70
<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>
71
</PropertyGroup>
72
- <Error Condition="!Exists('..\..\packages\WixToolset.BalUtil.4.0.22\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.22\build\WixToolset.BalUtil.props'))" />
72
+ <Error Condition="!Exists('..\..\packages\WixToolset.BalUtil.4.0.26\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.26\build\WixToolset.BalUtil.props'))" />
73
<Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props'))" />
74
- <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props'))" />
74
+ <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props'))" />
75
<Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />
76
</Target>
77
</Project>
\ No newline at end of file
src/dnchost/packages.config
+2
-2
@@ -3,6 +3,6 @@
3
<package id="runtime.win-x86.Microsoft.NETCore.DotNetAppHost" version="3.1.3" targetFramework="native" />
4
<package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" />
5
<package id="WixToolset.BootstrapperCore.Native" version="4.0.16" targetFramework="native" />
6
- <package id="WixToolset.BalUtil" version="4.0.22" targetFramework="native" />
7
- <package id="WixToolset.DUtil" version="4.0.23" targetFramework="native" />
6
+ <package id="WixToolset.BalUtil" version="4.0.26" targetFramework="native" />
7
+ <package id="WixToolset.DUtil" version="4.0.28" targetFramework="native" />
8
</packages>
\ No newline at end of file
src/mbahost/mbahost.vcxproj
+4
-4
@@ -2,9 +2,9 @@
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.22\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.22\build\WixToolset.BalUtil.props')" />
5
+ <Import Project="..\..\packages\WixToolset.BalUtil.4.0.26\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.26\build\WixToolset.BalUtil.props')" />
6
<Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" />
7
- <Import Project="..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props')" />
7
+ <Import Project="..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props')" />
8
9
<ItemGroup Label="ProjectConfigurations">
10
<ProjectConfiguration Include="Debug|Win32">
@@ -68,9 +68,9 @@
68
<PropertyGroup>
69
<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>
70
</PropertyGroup>
71
- <Error Condition="!Exists('..\..\packages\WixToolset.BalUtil.4.0.22\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.22\build\WixToolset.BalUtil.props'))" />
71
+ <Error Condition="!Exists('..\..\packages\WixToolset.BalUtil.4.0.26\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.26\build\WixToolset.BalUtil.props'))" />
72
<Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props'))" />
73
- <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props'))" />
73
+ <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props'))" />
74
<Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />
75
</Target>
76
</Project>
\ No newline at end of file
src/mbahost/packages.config
+2
-2
@@ -2,6 +2,6 @@
2
<packages>
3
<package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" />
4
<package id="WixToolset.BootstrapperCore.Native" version="4.0.16" targetFramework="native" />
5
- <package id="WixToolset.BalUtil" version="4.0.22" targetFramework="native" />
6
- <package id="WixToolset.DUtil" version="4.0.23" targetFramework="native" />
5
+ <package id="WixToolset.BalUtil" version="4.0.26" targetFramework="native" />
6
+ <package id="WixToolset.DUtil" version="4.0.28" targetFramework="native" />
7
</packages>
\ No newline at end of file
src/test/WixToolsetTest.ManagedHost/TestData/FullFramework2MBA/Bundle.wxs
+4
-4
@@ -3,10 +3,10 @@
3
xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
4
<Bundle Name="FullFramework2MBA" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="5CE5B5C7-4B6B-4B95-B297-731F1F956533">
5
<BootstrapperApplicationRef Id="ManagedBootstrapperApplicationHost">
6
- <Payload SourceFile="Example.FullFramework2MBA\Example.FullFramework2MBA.dll" />
7
- <Payload SourceFile="Example.FullFramework2MBA\mbanative.dll" />
8
- <Payload SourceFile="Example.FullFramework2MBA\WixToolset.Mba.Core.dll" />
9
- <Payload SourceFile="Example.FullFramework2MBA\WixToolset.Mba.Host.config" />
6
+ <Payload SourceFile="Example.FullFramework2MBA\net20\win-x86\Example.FullFramework2MBA.dll" />
7
+ <Payload SourceFile="Example.FullFramework2MBA\net20\win-x86\mbanative.dll" />
8
+ <Payload SourceFile="Example.FullFramework2MBA\net20\win-x86\WixToolset.Mba.Core.dll" />
9
+ <Payload SourceFile="Example.FullFramework2MBA\net20\win-x86\WixToolset.Mba.Host.config" />
10
</BootstrapperApplicationRef>
11
<Chain>
12
<PackageGroupRef Id="NetFx462RedistAsPrereq" />
src/test/WixToolsetTest.ManagedHost/TestData/FullFramework4MBA/Bundle.wxs
+4
-4
@@ -3,10 +3,10 @@
3
xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
4
<Bundle Name="FullFramework4MBA" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="E08068E0-4FBA-439D-A1C8-4CD1FE27093F">
5
<BootstrapperApplicationRef Id="ManagedBootstrapperApplicationHost">
6
- <Payload SourceFile="Example.FullFramework4MBA\net48\Example.FullFramework4MBA.dll" />
7
- <Payload SourceFile="Example.FullFramework4MBA\net48\mbanative.dll" />
8
- <Payload SourceFile="Example.FullFramework4MBA\net48\WixToolset.Mba.Core.dll" />
9
- <Payload SourceFile="Example.FullFramework4MBA\net48\WixToolset.Mba.Host.config" />
6
+ <Payload SourceFile="Example.FullFramework4MBA\net48\win-x86\Example.FullFramework4MBA.dll" />
7
+ <Payload SourceFile="Example.FullFramework4MBA\net48\win-x86\mbanative.dll" />
8
+ <Payload SourceFile="Example.FullFramework4MBA\net48\win-x86\WixToolset.Mba.Core.dll" />
9
+ <Payload SourceFile="Example.FullFramework4MBA\net48\win-x86\WixToolset.Mba.Host.config" />
10
</BootstrapperApplicationRef>
11
<Chain>
12
<PackageGroupRef Id="NetFx462RedistAsPrereq" />
src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj
+1
-1
@@ -13,6 +13,6 @@
13
14
<ItemGroup>
15
<PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" />
16
- <PackageReference Include="WixToolset.Mba.Core" Version="4.0.22" />
16
+ <PackageReference Include="WixToolset.Mba.Core" Version="4.0.26" />
17
</ItemGroup>
18
</Project>
\ No newline at end of file
src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj
+7
-43
@@ -1,56 +1,20 @@
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
4
-
5
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
6
- <Import Project="..\..\..\..\packages\WixToolset.Mba.Core.4.0.22\build\net20\WixToolset.Mba.Core.props" Condition="Exists('..\..\..\..\packages\WixToolset.Mba.Core.4.0.22\build\net20\WixToolset.Mba.Core.props')" />
4
+<Project Sdk="Microsoft.NET.Sdk">
5
<PropertyGroup>
8
- <ProjectGuid>{CC4236FC-226E-4232-AB50-24CBEC4D314D}</ProjectGuid>
6
+ <TargetFramework>net20</TargetFramework>
7
<AssemblyName>Example.FullFramework2MBA</AssemblyName>
10
- <OutputType>Library</OutputType>
8
<RootNamespace>Example.FullFramework2MBA</RootNamespace>
12
- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
13
- <CreateDocumentation>false</CreateDocumentation>
14
- </PropertyGroup>
15
- <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
16
- <DebugSymbols>true</DebugSymbols>
17
- <Optimize>false</Optimize>
18
- <DefineConstants>$(DefineConstants);DEBUG;TRACE</DefineConstants>
19
- </PropertyGroup>
20
- <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
21
- <DebugSymbols>true</DebugSymbols>
22
- <Optimize>true</Optimize>
23
- <DefineConstants>$(DefineConstants);TRACE</DefineConstants>
9
+ <DebugType>embedded</DebugType>
10
+ <RuntimeIdentifier>win-x86</RuntimeIdentifier>
11
</PropertyGroup>
25
- <ItemGroup>
26
- <Compile Include="FullFramework2BA.cs" />
27
- <Compile Include="FullFramework2BAFactory.cs" />
28
- <Compile Include="Properties\AssemblyInfo.cs" />
29
- </ItemGroup>
12
+
13
<ItemGroup>
14
<Content Include="WixToolset.Mba.Host.config" CopyToOutputDirectory="PreserveNewest" />
15
</ItemGroup>
16
+
17
<ItemGroup>
34
- <None Include="packages.config" />
35
- </ItemGroup>
36
- <ItemGroup>
37
- <Reference Include="System" />
38
- <Reference Include="System.Configuration" />
39
- <Reference Include="System.Data" />
40
- <Reference Include="System.Xml" />
41
- <Reference Include="WixToolset.Mba.Core">
42
- <HintPath>..\..\..\..\packages\WixToolset.Mba.Core.4.0.22\lib\net20\WixToolset.Mba.Core.dll</HintPath>
43
- </Reference>
18
+ <PackageReference Include="WixToolset.Mba.Core" Version="4.0.26" />
19
</ItemGroup>
45
-
46
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
47
-
48
- <Import Project="..\..\..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />
49
- <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
50
- <PropertyGroup>
51
- <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>
52
- </PropertyGroup>
53
- <Error Condition="!Exists('..\..\..\..\packages\WixToolset.Mba.Core.4.0.22\build\net20\WixToolset.Mba.Core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.Mba.Core.4.0.22\build\net20\WixToolset.Mba.Core.props'))" />
54
- <Error Condition="!Exists('..\..\..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />
55
- </Target>
20
</Project>
\ No newline at end of file
src/test/examples/FullFramework2MBA/FullFramework2BAFactory.cs
+1
@@ -1,5 +1,6 @@
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
+[assembly: WixToolset.Mba.Core.BootstrapperApplicationFactory(typeof(Example.FullFramework2MBA.FullFramework2BAFactory))]
4
namespace Example.FullFramework2MBA
5
{
6
using WixToolset.Mba.Core;
src/test/examples/FullFramework2MBA/Properties/AssemblyInfo.cs
deleted
-18
@@ -1,18 +0,0 @@
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
-using System;
4
-using System.Reflection;
5
-using System.Runtime.InteropServices;
6
-using WixToolset.Mba.Core;
7
-
8
-[assembly: AssemblyTitle("Example.FullFramework2MBA")]
9
-[assembly: AssemblyDescription("Example.FullFramework2MBA")]
10
-[assembly: AssemblyProduct("WiX Toolset")]
11
-[assembly: AssemblyCompany("WiX Toolset Team")]
12
-[assembly: AssemblyCopyright("Copyright (c) .NET Foundation and contributors. All rights reserved.")]
13
-
14
-// Types should not be visible to COM by default.
15
-[assembly: ComVisible(false)]
16
-[assembly: Guid("7A671EAF-FAE5-41A2-83DD-C35AB3779651")]
17
-
18
-[assembly: BootstrapperApplicationFactory(typeof(Example.FullFramework2MBA.FullFramework2BAFactory))]
src/test/examples/FullFramework2MBA/packages.config
deleted
-4
@@ -1,4 +0,0 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-<packages>
3
- <package id="WixToolset.Mba.Core" version="4.0.22" targetFramework="net461" />
4
-</packages>
\ No newline at end of file
src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj
+2
-1
@@ -5,11 +5,12 @@
5
<PropertyGroup>
6
<TargetFramework>net48</TargetFramework>
7
<Description>Full Framework v4 MBA</Description>
8
+ <RuntimeIdentifier>win-x86</RuntimeIdentifier>
9
</PropertyGroup>
10
11
<ItemGroup>
12
<PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" />
12
- <PackageReference Include="WixToolset.Mba.Core" Version="4.0.22" PrivateAssets="All" />
13
+ <PackageReference Include="WixToolset.Mba.Core" Version="4.0.26" PrivateAssets="All" />
14
</ItemGroup>
15
16
<ItemGroup>
src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj
+1
-1
@@ -18,6 +18,6 @@
18
19
<ItemGroup>
20
<PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" />
21
- <PackageReference Include="WixToolset.Mba.Core" Version="4.0.22" />
21
+ <PackageReference Include="WixToolset.Mba.Core" Version="4.0.26" />
22
</ItemGroup>
23
</Project>
\ No newline at end of file
src/test/examples/TestEngine/Example.TestEngine.vcxproj
+4
-4
@@ -1,9 +1,9 @@
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.22\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.22\build\WixToolset.BalUtil.props')" />
4
+ <Import Project="..\..\..\..\packages\WixToolset.BalUtil.4.0.26\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.26\build\WixToolset.BalUtil.props')" />
5
<Import Project="..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" />
6
- <Import Project="..\..\..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props')" />
6
+ <Import Project="..\..\..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props')" />
7
<ItemGroup Label="ProjectConfigurations">
8
<ProjectConfiguration Include="Debug|Win32">
9
<Configuration>Debug</Configuration>
@@ -68,8 +68,8 @@
68
<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>
69
</PropertyGroup>
70
<Error Condition="!Exists('..\..\..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />
71
- <Error Condition="!Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.22\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.BalUtil.4.0.22\build\WixToolset.BalUtil.props'))" />
71
+ <Error Condition="!Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.26\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.BalUtil.4.0.26\build\WixToolset.BalUtil.props'))" />
72
<Error Condition="!Exists('..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props'))" />
73
- <Error Condition="!Exists('..\..\..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props'))" />
73
+ <Error Condition="!Exists('..\..\..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props'))" />
74
</Target>
75
</Project>
\ No newline at end of file
src/test/examples/TestEngine/packages.config
+2
-2
@@ -2,6 +2,6 @@
2
<packages>
3
<package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" />
4
<package id="WixToolset.BootstrapperCore.Native" version="4.0.16" targetFramework="native" />
5
- <package id="WixToolset.BalUtil" version="4.0.22" targetFramework="native" />
6
- <package id="WixToolset.DUtil" version="4.0.23" targetFramework="native" />
5
+ <package id="WixToolset.BalUtil" version="4.0.26" targetFramework="native" />
6
+ <package id="WixToolset.DUtil" version="4.0.28" targetFramework="native" />
7
</packages>
\ No newline at end of file
src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj
+1
-1
@@ -11,6 +11,6 @@
11
12
<ItemGroup>
13
<PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" />
14
- <PackageReference Include="WixToolset.Mba.Core" Version="4.0.22" />
14
+ <PackageReference Include="WixToolset.Mba.Core" Version="4.0.26" />
15
</ItemGroup>
16
</Project>
\ No newline at end of file
src/wixext/BalBurnBackendExtension.cs
+15
@@ -3,6 +3,7 @@
3
namespace WixToolset.Bal
4
{
5
using System;
6
+ using System.Collections.Generic;
7
using System.Linq;
8
using WixToolset.Bal.Tuples;
9
using WixToolset.Data;
@@ -12,6 +13,20 @@ namespace WixToolset.Bal
13
14
public class BalBurnBackendExtension : BaseBurnBackendExtension
15
{
16
+ private static readonly IntermediateTupleDefinition[] BurnTupleDefinitions =
17
+ {
18
+ BalTupleDefinitions.WixBalBAFactoryAssembly,
19
+ BalTupleDefinitions.WixBalBAFunctions,
20
+ BalTupleDefinitions.WixBalCondition,
21
+ BalTupleDefinitions.WixBalPackageInfo,
22
+ BalTupleDefinitions.WixDncOptions,
23
+ BalTupleDefinitions.WixMbaPrereqInformation,
24
+ BalTupleDefinitions.WixStdbaOptions,
25
+ BalTupleDefinitions.WixStdbaOverridableVariable,
26
+ };
27
+
28
+ protected override IEnumerable<IntermediateTupleDefinition> TupleDefinitions => BurnTupleDefinitions;
29
+
30
public override void BundleFinalize()
31
{
32
base.BundleFinalize();
src/wixlib/bal.wixproj
+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" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
4
- <Import Project="..\..\packages\WixToolset.MSBuild.4.0.0-build-0126\build\WixToolset.MSBuild.props" Condition="Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0126\build\WixToolset.MSBuild.props')" />
4
+ <Import Project="..\..\packages\WixToolset.MSBuild.4.0.0-build-0137\build\WixToolset.MSBuild.props" Condition="Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0137\build\WixToolset.MSBuild.props')" />
5
<Import Project="..\FindLocalWix.props" />
6
<PropertyGroup>
7
<ProjectGuid>{3444D952-F21C-496F-AB6B-56435BFD0787}</ProjectGuid>
@@ -57,7 +57,7 @@
57
<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>
58
</PropertyGroup>
59
<Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />
60
- <Error Condition="!Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0126\build\WixToolset.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.MSBuild.4.0.0-build-0126\build\WixToolset.MSBuild.props'))" />
60
+ <Error Condition="!Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0137\build\WixToolset.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.MSBuild.4.0.0-build-0137\build\WixToolset.MSBuild.props'))" />
61
</Target>
62
<Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />
63
</Project>
src/wixlib/packages.config
+1
-1
@@ -1,5 +1,5 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<packages>
3
<package id="Nerdbank.GitVersioning" version="2.1.65" developmentDependency="true" targetFramework="net40" />
4
- <package id="WixToolset.MSBuild" version="4.0.0-build-0126" developmentDependency="true" targetFramework="net40" />
4
+ <package id="WixToolset.MSBuild" version="4.0.0-build-0137" developmentDependency="true" targetFramework="net40" />
5
</packages>
\ No newline at end of file
src/wixlib/wixstdba.wxs
+29
-29
@@ -13,11 +13,11 @@
13
<Payload Name='!(wix.WixStdbaLicenseRtfName=license.rtf)' Compressed='yes' SourceFile='!(wix.WixStdbaLicenseRtf=LoremIpsumLicense.rtf)' />
14
</PayloadGroup>
15
16
- <CustomTable Id='WixStdbaInformation'>
17
- <Row>
18
- <Data Column='LicenseFile'>!(wix.WixStdbaLicenseRtfName=license.rtf)</Data>
19
- </Row>
20
- </CustomTable>
16
+ <BundleCustomDataRef Id='WixStdbaInformation'>
17
+ <BundleElement>
18
+ <BundleAttribute Id='LicenseFile'>!(wix.WixStdbaLicenseRtfName=license.rtf)</BundleAttribute>
19
+ </BundleElement>
20
+ </BundleCustomDataRef>
21
</Fragment>
22
23
<!-- RTF Large License Payload Group -->
@@ -30,11 +30,11 @@
30
<Payload Name='!(wix.WixStdbaLicenseRtfName=license.rtf)' Compressed='yes' SourceFile='!(wix.WixStdbaLicenseRtf=LoremIpsumLicense.rtf)' />
31
</PayloadGroup>
32
33
- <CustomTable Id='WixStdbaInformation'>
34
- <Row>
35
- <Data Column='LicenseFile'>!(wix.WixStdbaLicenseRtfName=license.rtf)</Data>
36
- </Row>
37
- </CustomTable>
33
+ <BundleCustomDataRef Id='WixStdbaInformation'>
34
+ <BundleElement>
35
+ <BundleAttribute Id='LicenseFile'>!(wix.WixStdbaLicenseRtfName=license.rtf)</BundleAttribute>
36
+ </BundleElement>
37
+ </BundleCustomDataRef>
38
</Fragment>
39
40
<!-- Hyperlink License Payload Group -->
@@ -45,11 +45,11 @@
45
<Payload Name='logo.png' Compressed='yes' SourceFile='!(wix.WixStdbaLogo=logo.png)' />
46
</PayloadGroup>
47
48
- <CustomTable Id='WixStdbaInformation'>
49
- <Row>
50
- <Data Column='LicenseUrl'>!(wix.WixStdbaLicenseUrl)</Data>
51
- </Row>
52
- </CustomTable>
48
+ <BundleCustomDataRef Id='WixStdbaInformation'>
49
+ <BundleElement>
50
+ <BundleAttribute Id='LicenseUrl'>!(wix.WixStdbaLicenseUrl)</BundleAttribute>
51
+ </BundleElement>
52
+ </BundleCustomDataRef>
53
</Fragment>
54
55
<!-- Hyperlink Large License Payload Group -->
@@ -60,11 +60,11 @@
60
<Payload Name='logo.png' Compressed='yes' SourceFile='!(wix.WixStdbaLogo=logo.png)' />
61
</PayloadGroup>
62
63
- <CustomTable Id='WixStdbaInformation'>
64
- <Row>
65
- <Data Column='LicenseUrl'>!(wix.WixStdbaLicenseUrl)</Data>
66
- </Row>
67
- </CustomTable>
63
+ <BundleCustomDataRef Id='WixStdbaInformation'>
64
+ <BundleElement>
65
+ <BundleAttribute Id='LicenseUrl'>!(wix.WixStdbaLicenseUrl)</BundleAttribute>
66
+ </BundleElement>
67
+ </BundleCustomDataRef>
68
</Fragment>
69
70
<!-- HyperlinkSidebar License Payload Group -->
@@ -76,18 +76,18 @@
76
<Payload Name='logoside.png' Compressed='yes' SourceFile='!(wix.WixStdbaLogoSide=logoside.png)' />
77
</PayloadGroup>
78
79
- <CustomTable Id='WixStdbaInformation'>
80
- <Row>
81
- <Data Column='LicenseUrl'>!(wix.WixStdbaLicenseUrl)</Data>
82
- </Row>
83
- </CustomTable>
79
+ <BundleCustomDataRef Id='WixStdbaInformation'>
80
+ <BundleElement>
81
+ <BundleAttribute Id='LicenseUrl'>!(wix.WixStdbaLicenseUrl)</BundleAttribute>
82
+ </BundleElement>
83
+ </BundleCustomDataRef>
84
</Fragment>
85
86
<!-- BootstrapperApplicationData tables definition -->
87
<Fragment>
88
- <CustomTable Id='WixStdbaInformation' Unreal='yes'>
89
- <Column Id='LicenseFile' Category='Text' Type='string' Width='0' Nullable='yes' PrimaryKey='yes' />
90
- <Column Id='LicenseUrl' Category='Text' Type='string' Width='0' Nullable='yes' PrimaryKey='yes' />
91
- </CustomTable>
88
+ <BundleCustomData Id='WixStdbaInformation'>
89
+ <BundleAttributeDefinition Id='LicenseFile' />
90
+ <BundleAttributeDefinition Id='LicenseUrl' />
91
+ </BundleCustomData>
92
</Fragment>
93
</Wix>
src/wixstdba/packages.config
+2
-2
@@ -2,6 +2,6 @@
2
<packages>
3
<package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" />
4
<package id="WixToolset.BootstrapperCore.Native" version="4.0.16" targetFramework="native" />
5
- <package id="WixToolset.BalUtil" version="4.0.22" targetFramework="native" />
6
- <package id="WixToolset.DUtil" version="4.0.23" targetFramework="native" />
5
+ <package id="WixToolset.BalUtil" version="4.0.26" targetFramework="native" />
6
+ <package id="WixToolset.DUtil" version="4.0.28" targetFramework="native" />
7
</packages>
\ No newline at end of file
src/wixstdba/wixstdba.vcxproj
+5
-5
@@ -2,9 +2,9 @@
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.22\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.22\build\WixToolset.BalUtil.props')" />
5
+ <Import Project="..\..\packages\WixToolset.BalUtil.4.0.26\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.26\build\WixToolset.BalUtil.props')" />
6
<Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" />
7
- <Import Project="..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props')" />
7
+ <Import Project="..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props')" />
8
9
<ItemGroup Label="ProjectConfigurations">
10
<ProjectConfiguration Include="Debug|Win32">
@@ -107,9 +107,9 @@ rc.exe -fo "$(OutDir)wixstdba.res" "$(IntDir)wixstdba.messages.rc"</Command>
107
<PropertyGroup>
108
<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>
109
</PropertyGroup>
110
- <Error Condition="!Exists('..\..\packages\WixToolset.BalUtil.4.0.22\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.22\build\WixToolset.BalUtil.props'))" />
110
+ <Error Condition="!Exists('..\..\packages\WixToolset.BalUtil.4.0.26\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.26\build\WixToolset.BalUtil.props'))" />
111
<Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props'))" />
112
- <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props'))" />
112
+ <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props'))" />
113
<Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />
114
</Target>
115
-</Project>
115
+</Project>
\ No newline at end of file