Convert WixToolset.Mba.Host.csproj to SDK-style.
Sean Hall committed
Dec 19, 2020 at 20:25 UTC
32b3088eeaaf94eae561886a4235b13aa564a620
6 files changed
+17
-83
src/WixToolset.Mba.Host/Properties/AssemblyInfo.cs
deleted
-17
@@ -1,17 +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
-
7
-[assembly: AssemblyTitle("Managed Bootstrapper Application Host (WiX)")]
8
-[assembly: AssemblyDescription("Managed Bootstrapper Application Host")]
9
-[assembly: AssemblyProduct("WiX Toolset")]
10
-[assembly: AssemblyCompany("WiX Toolset Team")]
11
-[assembly: AssemblyCopyright("Copyright (c) .NET Foundation and contributors. All rights reserved.")]
12
-
13
-// Types should not be visible to COM by default.
14
-[assembly: ComVisible(false)]
15
-[assembly: Guid("6f4e0cc9-8ad4-4b5a-a669-3aafff67a76f")]
16
-
17
-[assembly: CLSCompliantAttribute(true)]
src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj
+11
-55
@@ -1,54 +1,26 @@
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\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')" />
7
- <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')" />
8
- <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')" />
4
+<Project Sdk="Microsoft.NET.Sdk">
5
<PropertyGroup>
10
- <ProjectGuid>{F2BA1935-70FA-4156-B161-FD03850B4FAA}</ProjectGuid>
6
<AssemblyName>WixToolset.Mba.Host</AssemblyName>
12
- <OutputType>Library</OutputType>
7
<RootNamespace>WixToolset.Mba.Host</RootNamespace>
14
- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
8
+ <TargetFrameworks>net20</TargetFrameworks>
9
<Description>Managed Bootstrapper Application entry point</Description>
10
<DebugType>embedded</DebugType>
11
+ <NuspecFile>$(MSBuildThisFileName).nuspec</NuspecFile>
12
</PropertyGroup>
18
- <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
19
- <DebugSymbols>true</DebugSymbols>
20
- <Optimize>false</Optimize>
21
- <DefineConstants>$(DefineConstants);DEBUG;TRACE</DefineConstants>
22
- </PropertyGroup>
23
- <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
24
- <DebugSymbols>true</DebugSymbols>
25
- <Optimize>true</Optimize>
26
- <DefineConstants>$(DefineConstants);TRACE</DefineConstants>
27
- </PropertyGroup>
28
- <ItemGroup>
29
- <Compile Include="BootstrapperApplicationFactory.cs" />
30
- <Compile Include="BootstrapperSectionGroup.cs" />
31
- <Compile Include="Exceptions.cs" />
32
- <Compile Include="HostSection.cs" />
33
- <Compile Include="NativeMethods.cs" />
34
- <Compile Include="Properties\AssemblyInfo.cs" />
35
- <Compile Include="SupportedFrameworkElementCollection.cs" />
36
- <Compile Include="SupportedFrameworkElement.cs" />
37
- </ItemGroup>
13
+
14
<ItemGroup>
39
- <None Include="WixToolset.Mba.Host.config" />
15
+ <None Include="WixToolset.Mba.Host.config" CopyToOutputDirectory="PreserveNewest" />
16
</ItemGroup>
17
<ItemGroup>
42
- <None Include="packages.config" />
18
+ <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
19
+ <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" />
20
+ <PackageReference Include="WixToolset.Mba.Core" Version="4.0.*" />
21
</ItemGroup>
22
<ItemGroup>
45
- <Reference Include="System" />
23
<Reference Include="System.Configuration" />
47
- <Reference Include="System.Data" />
48
- <Reference Include="System.Xml" />
49
- <Reference Include="WixToolset.Mba.Core">
50
- <HintPath>..\..\packages\WixToolset.Mba.Core.4.0.45\lib\net20\WixToolset.Mba.Core.dll</HintPath>
51
- </Reference>
24
</ItemGroup>
25
<ItemGroup>
26
<HeaderPath Include="$(BaseOutputPath)obj\$(AssemblyName).h">
@@ -56,8 +28,6 @@
28
</HeaderPath>
29
</ItemGroup>
30
59
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
60
-
31
<Target Name="GenerateIdentityHeader" AfterTargets="Build" Inputs="$(TargetPath)" Outputs="@(HeaderPath)">
32
<GetAssemblyIdentity AssemblyFiles="$(TargetPath)">
33
<Output TaskParameter="Assemblies" ItemName="AssemblyIdentity" />
@@ -74,24 +44,10 @@
44
</ItemGroup>
45
</Target>
46
77
- <Target Name="Pack" DependsOnTargets="GetBuildVersion">
78
- <Exec Command='nuget pack $(AssemblyName).nuspec -OutputDirectory "$(BaseOutputPath)$(Configuration)" -Properties Configuration=$(Configuration);Id=$(AssemblyName);Version="$(BuildVersionSimple)";Authors="$(Authors)";Copyright="$(Copyright)";Description="$(Description)";Title="$(Title)"' />
79
- </Target>
80
-
81
- <Import Project="..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets')" />
82
- <Import Project="..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets" Condition="Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets')" />
83
- <Import Project="..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets" Condition="Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets')" />
84
- <Import Project="..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" />
85
- <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
47
+ <Target Name="SetNuspecProperties" AfterTargets="GetBuildVersion">
48
<PropertyGroup>
87
- <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>
49
+ <NuspecBasePath>$(OutputPath)</NuspecBasePath>
50
+ <NuspecProperties>Id=$(AssemblyName);Version=$(BuildVersionSimple);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl)</NuspecProperties>
51
</PropertyGroup>
89
- <Error Condition="!Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props'))" />
90
- <Error Condition="!Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets'))" />
91
- <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props'))" />
92
- <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets'))" />
93
- <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'))" />
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'))" />
52
</Target>
53
</Project>
\ No newline at end of file
src/WixToolset.Mba.Host/WixToolset.Mba.Host.nuspec
+2
-2
@@ -17,7 +17,7 @@
17
</metadata>
18
19
<files>
20
- <file src="$id$.config" target="samples" />
21
- <file src="..\..\build\$configuration$\$id$.dll" target="lib\net20" />
20
+ <file src="net20\$id$.config" target="samples" />
21
+ <file src="net20\$id$.dll" target="lib\net20" />
22
</files>
23
</package>
src/WixToolset.Mba.Host/packages.config
deleted
-8
@@ -1,8 +0,0 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-<packages>
3
- <package id="Microsoft.Build.Tasks.Git" version="1.0.0" targetFramework="net20" developmentDependency="true" />
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.45" targetFramework="net20" />
8
-</packages>
\ No newline at end of file
src/dnchost/dnchost.vcxproj
+3
@@ -72,6 +72,9 @@
72
<ClCompile>
73
<AdditionalIncludeDirectories>$(BaseOutputPath)obj;$(NetHostPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
74
</ClCompile>
75
+ <Link>
76
+ <AdditionalOptions>/LTCG %(AdditionalOptions)</AdditionalOptions>
77
+ </Link>
78
</ItemDefinitionGroup>
79
<ItemGroup>
80
<ProjectReference Include="..\WixToolset.Dnc.Host\WixToolset.Dnc.Host.csproj">
src/wixlib/bal.wixproj
+1
-1
@@ -8,7 +8,7 @@
8
<ItemGroup>
9
<BindInputPaths Include="..\wixstdba\Resources\" />
10
<BindInputPaths Include="$(OutputPath)netcoreapp3.1" />
11
- <BindInputPaths Include="$(OutputPath)" />
11
+ <BindInputPaths Include="$(OutputPath)net20" />
12
<BindInputPaths Include="$(OutputPath)x86" BindName="x86" />
13
<BindInputPaths Include="$(OutputPath)x64" BindName="x64" />
14
<BindInputPaths Include="$(OutputPath)arm64" BindName="arm64" />