Delete WixToolset.Tools.Core project.
Sean Hall committed
Jun 3, 2020 at 12:28 UTC
d5d5e87acf7eadacd757083a4d0272a04962ae9b
14 files changed
+7
-66
Tools.sln
-10
@@ -20,8 +20,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
20
EndProject
21
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixCop", "src\wixcop\WixCop.csproj", "{2E54120B-8958-40B1-A7FC-851446994CD8}"
22
EndProject
23
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Tools.Core", "src\WixToolset.Tools.Core\WixToolset.Tools.Core.csproj", "{9C3B486F-AE0E-43BA-823A-30808B73C6B4}"
24
-EndProject
23
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.WixCop", "src\test\WixToolsetTest.WixCop\WixToolsetTest.WixCop.csproj", "{F1A8112B-95A1-4AF7-81CB-523BE7DB8E5C}"
24
EndProject
25
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "thmviewer", "src\thmviewer\thmviewer.vcxproj", "{95228C13-97F5-484A-B4A2-ECF4618B0881}"
@@ -86,14 +84,6 @@ Global
84
{2E54120B-8958-40B1-A7FC-851446994CD8}.Release|Any CPU.Build.0 = Release|Any CPU
85
{2E54120B-8958-40B1-A7FC-851446994CD8}.Release|x86.ActiveCfg = Release|Any CPU
86
{2E54120B-8958-40B1-A7FC-851446994CD8}.Release|x86.Build.0 = Release|Any CPU
89
- {9C3B486F-AE0E-43BA-823A-30808B73C6B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
90
- {9C3B486F-AE0E-43BA-823A-30808B73C6B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
91
- {9C3B486F-AE0E-43BA-823A-30808B73C6B4}.Debug|x86.ActiveCfg = Debug|Any CPU
92
- {9C3B486F-AE0E-43BA-823A-30808B73C6B4}.Debug|x86.Build.0 = Debug|Any CPU
93
- {9C3B486F-AE0E-43BA-823A-30808B73C6B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
94
- {9C3B486F-AE0E-43BA-823A-30808B73C6B4}.Release|Any CPU.Build.0 = Release|Any CPU
95
- {9C3B486F-AE0E-43BA-823A-30808B73C6B4}.Release|x86.ActiveCfg = Release|Any CPU
96
- {9C3B486F-AE0E-43BA-823A-30808B73C6B4}.Release|x86.Build.0 = Release|Any CPU
87
{F1A8112B-95A1-4AF7-81CB-523BE7DB8E5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
88
{F1A8112B-95A1-4AF7-81CB-523BE7DB8E5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
89
{F1A8112B-95A1-4AF7-81CB-523BE7DB8E5C}.Debug|x86.ActiveCfg = Debug|Any CPU
src/WixToolset.BuildTasks/Common.cs
renamed
+1
-1
@@ -1,6 +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
-namespace WixToolset.Tools.Core
3
+namespace WixToolset.BuildTasks
4
{
5
using System;
6
using System.Text.RegularExpressions;
src/WixToolset.BuildTasks/ConvertReferences.cs
-1
@@ -6,7 +6,6 @@ namespace WixToolset.BuildTasks
6
using System.Collections.Generic;
7
using Microsoft.Build.Framework;
8
using Microsoft.Build.Utilities;
9
- using WixToolset.Tools.Core;
9
10
/// <summary>
11
/// This task assigns Culture metadata to files based on the value of the Culture attribute on the
src/WixToolset.BuildTasks/GenerateCompileWithObjectPath.cs
+1
-2
@@ -3,7 +3,6 @@
3
namespace WixToolset.BuildTasks
4
{
5
using System;
6
- using System.Collections.Generic;
6
using System.Diagnostics.CodeAnalysis;
7
using System.Globalization;
8
using System.IO;
@@ -136,7 +135,7 @@ namespace WixToolset.BuildTasks
135
// Do not overwrite the ObjectPath metadata if it already was set.
136
if (string.IsNullOrEmpty(this.CompileWithObjectPath[i].GetMetadata("ObjectPath")))
137
{
139
- SetObjectPath(this.CompileWithObjectPath[i]);
138
+ this.SetObjectPath(this.CompileWithObjectPath[i]);
139
}
140
}
141
src/WixToolset.BuildTasks/GetCabList.cs
-6
@@ -3,16 +3,10 @@
3
namespace WixToolset.BuildTasks
4
{
5
using System;
6
- using System.Collections;
7
- using System.Collections.Generic;
8
- using System.Diagnostics;
6
using System.IO;
10
- using System.Reflection;
11
- using System.Xml;
7
using Microsoft.Build.Framework;
8
using Microsoft.Build.Utilities;
9
using WixToolset.Dtf.WindowsInstaller;
15
- using Microsoft.Win32;
10
11
/// <summary>
12
/// This task assigns Culture metadata to files based on the value of the Culture attribute on the
src/WixToolset.BuildTasks/GetLooseFileList.cs
+2
-7
@@ -3,16 +3,11 @@
3
namespace WixToolset.BuildTasks
4
{
5
using System;
6
- using System.Collections;
6
using System.Collections.Generic;
8
- using System.Diagnostics;
7
using System.IO;
10
- using System.Reflection;
11
- using System.Xml;
8
using Microsoft.Build.Framework;
9
using Microsoft.Build.Utilities;
10
using WixToolset.Dtf.WindowsInstaller;
15
- using Microsoft.Win32;
11
12
/// <summary>
13
/// This task assigns Culture metadata to files based on the value of the Culture attribute on the
@@ -154,7 +149,7 @@ namespace WixToolset.BuildTasks
149
string directoryParent = (string)(directoryRecords[i + 1]);
150
string defaultDir = (string)(directoryRecords[i + 2]);
151
157
- string sourceDir = SourceDirFromDefaultDir(defaultDir);
152
+ string sourceDir = this.SourceDirFromDefaultDir(defaultDir);
153
154
DirectoryIdDefaultDir[directoryId] = sourceDir;
155
DirectoryIdParent[directoryId] = directoryParent;
@@ -206,7 +201,7 @@ namespace WixToolset.BuildTasks
201
for (i = 0; i < fileRecords.Count; i += 3)
202
{
203
string componentId = (string)(fileRecords[i]);
209
- string fileName = SourceFileFromFileName((string)(fileRecords[i + 1]));
204
+ string fileName = this.SourceFileFromFileName((string)(fileRecords[i + 1]));
205
int attributes = (int)(fileRecords[i + 2]);
206
207
// If the whole database is marked uncompressed, use the directory layout made above
src/WixToolset.BuildTasks/GlobalSuppressions.cs
deleted
-8
@@ -1,8 +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
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1020:AvoidNamespacesWithFewTypes", Scope = "namespace", Target = "WixToolset")]
4
-
5
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Msi", Scope = "namespace", Target = "WixToolset.BuildTasks")]
6
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "wix")]
7
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Wix")]
8
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", MessageId = "wix")]
src/WixToolset.BuildTasks/RefreshBundleGeneratedFile.cs
-1
@@ -9,7 +9,6 @@ namespace WixToolset.BuildTasks
9
using System.Xml;
10
using Microsoft.Build.Framework;
11
using Microsoft.Build.Utilities;
12
- using WixToolset.Tools.Core;
12
13
/// <summary>
14
/// This task refreshes the generated file for bundle projects.
src/WixToolset.BuildTasks/RefreshGeneratedFile.cs
-1
@@ -9,7 +9,6 @@ namespace WixToolset.BuildTasks
9
using System.Xml;
10
using Microsoft.Build.Framework;
11
using Microsoft.Build.Utilities;
12
- using WixToolset.Tools.Core;
12
13
/// <summary>
14
/// This task refreshes the generated file that contains ComponentGroupRefs
src/WixToolset.Tools.Core/WixToolset.Tools.Core.csproj
deleted
-21
@@ -1,21 +0,0 @@
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
-<Project Sdk="Microsoft.NET.Sdk">
5
- <PropertyGroup>
6
- <TargetFrameworks>netstandard2.0;net461;net472</TargetFrameworks>
7
- <Description>Tools Core</Description>
8
- <Title>WiX Toolset Tools Core</Title>
9
- <DebugType>embedded</DebugType>
10
- <PublishRepositoryUrl>true</PublishRepositoryUrl>
11
- </PropertyGroup>
12
-
13
- <ItemGroup>
14
- <PackageReference Include="WixToolset.Core" Version="4.0.*" />
15
- </ItemGroup>
16
-
17
- <ItemGroup>
18
- <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
19
- <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" />
20
- </ItemGroup>
21
-</Project>
src/WixToolset.Tools.Core/WixToolset.Tools.Core.v3.ncrunchproject
deleted
-5
@@ -1,5 +0,0 @@
1
-<ProjectConfiguration>
2
- <Settings>
3
- <HiddenComponentWarnings />
4
- </Settings>
5
-</ProjectConfiguration>
\ No newline at end of file
src/heat/heat.csproj
+1
-1
@@ -20,7 +20,7 @@
20
</PropertyGroup>
21
22
<ItemGroup>
23
- <ProjectReference Include="..\WixToolset.Tools.Core\WixToolset.Tools.Core.csproj" />
23
+ <Compile Include="..\WixToolset.Tools.Core\ConsoleMessageListener.cs" Link="ConsoleMessageListener.cs" />
24
</ItemGroup>
25
26
<ItemGroup>
src/wix/wix.csproj
+1
-1
@@ -20,7 +20,7 @@
20
</PropertyGroup>
21
22
<ItemGroup>
23
- <ProjectReference Include="..\WixToolset.Tools.Core\WixToolset.Tools.Core.csproj" />
23
+ <Compile Include="..\WixToolset.Tools.Core\ConsoleMessageListener.cs" Link="ConsoleMessageListener.cs" />
24
</ItemGroup>
25
26
<ItemGroup>
src/wixcop/WixCop.csproj
+1
-1
@@ -20,7 +20,7 @@
20
</PropertyGroup>
21
22
<ItemGroup>
23
- <ProjectReference Include="..\WixToolset.Tools.Core\WixToolset.Tools.Core.csproj" />
23
+ <Compile Include="..\WixToolset.Tools.Core\ConsoleMessageListener.cs" Link="ConsoleMessageListener.cs" />
24
</ItemGroup>
25
26
<ItemGroup>