Update WixBA to Mba.Core 4.0.26.
Sean Hall committed
May 5, 2021 at 18:52 UTC
42170f18cf21e6ac018b264f88eab104eacfe6ab
4 files changed
+19
-76
src/WixToolset.WixBA/Properties/AssemblyInfo.cs
deleted
-22
@@ -1,22 +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
-using WixToolset.WixBA;
8
-
9
-
10
-[assembly: AssemblyTitle("WixToolset.WixBA")]
11
-[assembly: AssemblyDescription("WiX Bootstrapper Application")]
12
-
13
-// Setting ComVisible to false makes the types in this assembly not visible
14
-// to COM components. If you need to access a type in this assembly from
15
-// COM, set the ComVisible attribute to true on that type.
16
-[assembly: ComVisible(false)]
17
-[assembly: Guid("0ffc4944-9295-40b7-adac-3a6864b5219b")]
18
-[assembly: CLSCompliantAttribute(true)]
19
-
20
-// Identifies the class that derives from IBootstrapperApplicationFactory and is the BAFactory class that gets
21
-// instantiated by the interop layer
22
-[assembly: BootstrapperApplicationFactory(typeof(WixBAFactory))]
src/WixToolset.WixBA/WixBAFactory.cs
+3
@@ -1,5 +1,8 @@
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
+// Identifies the class that derives from IBootstrapperApplicationFactory and is the BAFactory class that gets
4
+// instantiated by the interop layer
5
+[assembly: WixToolset.Mba.Core.BootstrapperApplicationFactory(typeof(WixToolset.WixBA.WixBAFactory))]
6
namespace WixToolset.WixBA
7
{
8
using WixToolset.Mba.Core;
src/WixToolset.WixBA/WixToolset.WixBA.csproj
+16
-49
@@ -1,24 +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
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
4
- <Import Project="..\..\packages\WixToolset.Mba.Core.4.0.13\build\net20\WixToolset.Mba.Core.props" Condition="Exists('..\..\packages\WixToolset.Mba.Core.4.0.13\build\net20\WixToolset.Mba.Core.props')" />
3
+<Project Sdk="Microsoft.NET.Sdk">
4
<PropertyGroup>
6
- <ProjectGuid>{7C27518B-84AD-4679-8EF4-29DF552CF1AC}</ProjectGuid>
5
+ <TargetFramework>net45</TargetFramework>
6
<AssemblyName>WixToolset.WixBA</AssemblyName>
8
- <OutputType>Library</OutputType>
7
<RootNamespace>WixToolset.WixBA</RootNamespace>
10
- <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
8
+ <DebugType>embedded</DebugType>
9
+ <RuntimeIdentifier>win-x86</RuntimeIdentifier>
10
+ <AssemblyTitle>WixToolset.WixBA</AssemblyTitle>
11
+ <Description>WiX Bootstrapper Application</Description>
12
+ <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
13
+ <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
14
+ <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
15
+ <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
16
</PropertyGroup>
17
<ItemGroup>
13
- <Compile Include="Hresult.cs" />
14
- <Compile Include="Model.cs" />
15
- <Compile Include="BrowserProperties.cs" />
16
- <Compile Include="NewsItem.cs" />
17
- <Compile Include="ProgressViewModel.cs" />
18
- <Compile Include="RelayCommand.cs" />
19
- <Compile Include="InstallationViewModel.cs" />
20
- <Compile Include="WixBAFactory.cs" />
21
- <Compile Include="WixDistribution.cs" />
18
<Page Include="Styles.xaml">
19
<Generator>MSBuild:Compile</Generator>
20
<SubType>Designer</SubType>
@@ -27,53 +23,24 @@
23
<Generator>MSBuild:Compile</Generator>
24
<SubType>Designer</SubType>
25
</Page>
30
- <Compile Include="PropertyNotifyBase.cs" />
31
- <Compile Include="RootView.xaml.cs">
32
- <DependentUpon>RootView.xaml</DependentUpon>
33
- </Compile>
34
- <Compile Include="RootViewModel.cs" />
35
- <Compile Include="UpdateViewModel.cs" />
36
- <Compile Include="WindowProperties.cs" />
37
- <Compile Include="WixBA.cs" />
38
- <Compile Include="Properties\AssemblyInfo.cs" />
26
<None Include="WixBA.BootstrapperCore.config">
27
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
28
<SubType>Designer</SubType>
29
</None>
43
- <None Include="packages.config" />
30
+ </ItemGroup>
31
+ <ItemGroup>
32
+ <Resource Include="Resources\logo-white-hollow.png" />
33
+ <Resource Include="Resources\logo-black-hollow.png" />
34
</ItemGroup>
35
<ItemGroup>
36
<Reference Include="PresentationCore" />
37
<Reference Include="PresentationFramework" />
48
- <Reference Include="System" />
49
- <Reference Include="System.ComponentModel.DataAnnotations" />
50
- <Reference Include="System.Core" />
51
- <Reference Include="System.Drawing">
52
- <Private>False</Private>
53
- </Reference>
54
- <Reference Include="System.ServiceModel" />
38
<Reference Include="System.Windows.Forms" />
56
- <Reference Include="System.Xml.Linq" />
57
- <Reference Include="System.Xml" />
39
<Reference Include="System.Xaml" />
40
<Reference Include="WindowsBase" />
60
- <Reference Include="WixToolset.Mba.Core">
61
- <HintPath>..\..\packages\WixToolset.Mba.Core.4.0.13\lib\net20\WixToolset.Mba.Core.dll</HintPath>
62
- </Reference>
41
</ItemGroup>
42
<ItemGroup>
65
- <Resource Include="Resources\logo-white-hollow.png" />
66
- </ItemGroup>
67
- <ItemGroup>
68
- <Resource Include="Resources\logo-black-hollow.png" />
43
+ <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" />
44
+ <PackageReference Include="WixToolset.Mba.Core" Version="4.0.26" />
45
</ItemGroup>
70
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
71
- <Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />
72
- <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
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\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />
77
- <Error Condition="!Exists('..\..\packages\WixToolset.Mba.Core.4.0.13\build\net20\WixToolset.Mba.Core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.Mba.Core.4.0.13\build\net20\WixToolset.Mba.Core.props'))" />
78
- </Target>
46
</Project>
\ No newline at end of file
src/WixToolset.WixBA/packages.config
deleted
-5
@@ -1,5 +0,0 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-<packages>
3
- <package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="net45" developmentDependency="true" />
4
- <package id="WixToolset.Mba.Core" version="4.0.13" targetFramework="net45" />
5
-</packages>
\ No newline at end of file