Update to latest repo template and remove warnings.
Sean Hall committed
Dec 18, 2020 at 23:11 UTC
93f39c964d95f587693c915f6d7d97b6d7873b80
5 files changed
+9
-11
src/CSharp.Build.props
+1
@@ -8,5 +8,6 @@
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/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
-4
@@ -13,10 +13,6 @@
13
<PlatformTarget>AnyCPU</PlatformTarget>
14
</PropertyGroup>
15
16
- <PropertyGroup>
17
- <NoWarn>NU1701</NoWarn>
18
- </PropertyGroup>
19
-
16
<ItemGroup>
17
<PackageReference Include="WixToolset.Dtf.WindowsInstaller" Version="4.0.*" />
18
</ItemGroup>
src/dotnet-wix/dotnet-wix.nuspec
-3
@@ -11,9 +11,6 @@
11
<packageTypes>
12
<packageType name="DotnetTool" />
13
</packageTypes>
14
- <dependencies>
15
- <group targetFramework=".NETCoreApp2.1" />
16
- </dependencies>
14
</metadata>
15
16
<files>
src/heat/heat.csproj
-4
@@ -16,10 +16,6 @@
16
<RollForward>LatestMajor</RollForward>
17
</PropertyGroup>
18
19
- <PropertyGroup>
20
- <NoWarn>NU1701</NoWarn>
21
- </PropertyGroup>
22
-
19
<ItemGroup>
20
<Compile Include="..\wix\ConsoleMessageListener.cs" Link="ConsoleMessageListener.cs" />
21
</ItemGroup>