From 79409c525f6893afa47d3e3333f41303b5ceb047 Mon Sep 17 00:00:00 2001
From: Simon Egli <simon@johnshope.com>
Date: Mon, 30 Nov 2015 12:32:39 +0100
Subject: [PATCH 1/2] Smart AssemblyInfo, that writes output only if it has
 changed, so the solution needs to be rebuild only if AssemblyInfo really has
 changed.

---
 .../MSBuild.Community.Tasks/AssemblyInfo.cs   | 19 ++++++++++++----
 Source/MSBuild.Community.Tasks/FxCop.cs       | 22 +++++++++----------
 2 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/Source/MSBuild.Community.Tasks/AssemblyInfo.cs b/Source/MSBuild.Community.Tasks/AssemblyInfo.cs
index 18731864..0ef9e284 100644
--- a/Source/MSBuild.Community.Tasks/AssemblyInfo.cs
+++ b/Source/MSBuild.Community.Tasks/AssemblyInfo.cs
@@ -1,6 +1,6 @@
-#region Copyright © 2005 Paul Welter. All rights reserved.
+#region Copyright � 2005 Paul Welter. All rights reserved.
 /*
-Copyright © 2005 Paul Welter. All rights reserved.
+Copyright � 2005 Paul Welter. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
@@ -491,14 +491,25 @@ public override bool Execute()
 
             Encoding utf8WithSignature = new UTF8Encoding(true);
 
-            using (StreamWriter writer = new StreamWriter(_outputFile, false, utf8WithSignature))
+				StringBuilder textbuilder = new StringBuilder();
+				
+
+            using (StringWriter writer = new StringWriter(textbuilder))
             {
                 GenerateFile(writer);
                 writer.Flush();
                 writer.Close();
-                Log.LogMessage("Created AssemblyInfo file \"{0}\".", _outputFile);
             }
 
+				// check if assembly info has changed and we need to write the output file.
+				var text = textbuilder.ToString();
+				string file = null;
+				if (File.Exists(_outputFile)) file = File.ReadAllText(_outputFile);
+				if (file != text) {
+					File.WriteAllText(_outputFile, text, utf8WithSignature);
+					Log.LogMessage("Created AssemblyInfo file \"{0}\".", _outputFile);
+				}
+
             return true;
         }
 
diff --git a/Source/MSBuild.Community.Tasks/FxCop.cs b/Source/MSBuild.Community.Tasks/FxCop.cs
index 5aa56f77..6acfee40 100644
--- a/Source/MSBuild.Community.Tasks/FxCop.cs
+++ b/Source/MSBuild.Community.Tasks/FxCop.cs
@@ -187,14 +187,14 @@ public ITaskItem[] Rules
         {
             get { return _rules; }
             set { _rules = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the rule set.
-        /// </summary>
-        /// <value>
-        /// The rule set.
-        /// </value>
+        }
+
+        /// <summary>
+        /// Gets or sets the rule set.
+        /// </summary>
+        /// <value>
+        /// The rule set.
+        /// </value>
         public string RuleSet { get; set; }
 
         private string _analysisReportFileName;
@@ -492,9 +492,9 @@ protected override string GenerateCommandLineCommands()
                 }
             }
 
-            if (!string.IsNullOrEmpty(RuleSet))
-            {
-                _programArguments.AppendFormat("/ruleset:{0} ", RuleSet);
+            if (!string.IsNullOrEmpty(RuleSet))
+            {
+                _programArguments.AppendFormat("/ruleset:{0} ", RuleSet);
             }
 
             if (IncludeSummaryReport)

From baeb609b1654058dd91180fa46f57bb87cc1a8bf Mon Sep 17 00:00:00 2001
From: Simon Jakob Egli <simon.jakob.egli@gmail.com>
Date: Sun, 14 Jul 2024 20:18:47 +0200
Subject: [PATCH 2/2] Modified projects to SDK style, updated DotNetZip

---
 .../ILMerge/A/A.csproj                        |  77 +----
 .../ILMerge/B/B.csproj                        |  78 +----
 .../MSBuild.Community.Tasks.Tests.csproj      | 190 +++--------
 .../packages.config                           |   7 -
 .../MSBuild.Community.Tasks.csproj            | 300 ++++--------------
 .../Properties/Resources.Designer.cs          |   2 +-
 .../MSBuild.Community.Tasks/packages.config   |   5 -
 Source/Settings.SourceAnalysis                |  36 ---
 8 files changed, 113 insertions(+), 582 deletions(-)
 delete mode 100644 Source/MSBuild.Community.Tasks.Tests/packages.config
 delete mode 100644 Source/MSBuild.Community.Tasks/packages.config
 delete mode 100644 Source/Settings.SourceAnalysis

diff --git a/Source/MSBuild.Community.Tasks.Tests/ILMerge/A/A.csproj b/Source/MSBuild.Community.Tasks.Tests/ILMerge/A/A.csproj
index 795b8263..b9188106 100644
--- a/Source/MSBuild.Community.Tasks.Tests/ILMerge/A/A.csproj
+++ b/Source/MSBuild.Community.Tasks.Tests/ILMerge/A/A.csproj
@@ -1,21 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{1291B270-5E1F-425B-ACA1-5253A0067D26}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>A</RootNamespace>
-    <AssemblyName>A</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileUpgradeFlags />
+    <UpgradeBackupLocation />
+    <TargetFramework>net48</TargetFramework>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -31,64 +19,15 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Debug\A.XML</DocumentationFile>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
+    <DocumentationFile>bin\$(Configuration)\A.XML</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ClassA1.cs" />
-    <Compile Include="ClassA2.cs" />
-    <Compile Include="ClassAB.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
\ No newline at end of file
diff --git a/Source/MSBuild.Community.Tasks.Tests/ILMerge/B/B.csproj b/Source/MSBuild.Community.Tasks.Tests/ILMerge/B/B.csproj
index d8e41999..f5ede9d0 100644
--- a/Source/MSBuild.Community.Tasks.Tests/ILMerge/B/B.csproj
+++ b/Source/MSBuild.Community.Tasks.Tests/ILMerge/B/B.csproj
@@ -1,21 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{885FC778-671A-4934-B76B-BE28334AD9CB}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>B</RootNamespace>
-    <AssemblyName>B</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileUpgradeFlags />
+    <UpgradeBackupLocation />
+    <TargetFramework>net48</TargetFramework>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -31,65 +19,15 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Debug\B.XML</DocumentationFile>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
+    <DocumentationFile>bin\$(Configuration)\B.XML</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ClassAB.cs" />
-    <Compile Include="ClassB1.cs" />
-    <Compile Include="ClassB2.cs" />
-    <Compile Include="ClassB3.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
\ No newline at end of file
diff --git a/Source/MSBuild.Community.Tasks.Tests/MSBuild.Community.Tasks.Tests.csproj b/Source/MSBuild.Community.Tasks.Tests/MSBuild.Community.Tasks.Tests.csproj
index ee50bcba..d0281277 100644
--- a/Source/MSBuild.Community.Tasks.Tests/MSBuild.Community.Tasks.Tests.csproj
+++ b/Source/MSBuild.Community.Tasks.Tests/MSBuild.Community.Tasks.Tests.csproj
@@ -1,165 +1,35 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{5AC1D006-CA56-4BE1-8250-DBEABBEA0725}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <RootNamespace>MSBuild.Community.Tasks.Tests</RootNamespace>
-    <AssemblyName>MSBuild.Community.Tasks.Tests</AssemblyName>
-    <WarningLevel>4</WarningLevel>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\MSBuild.Community.Tasks\MSBuild.Community.Tasks.snk</AssemblyOriginatorKeyFile>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
+    <TargetFramework>net48</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <OutputPath>.\bin\$(Configuration)\</OutputPath>
+    <UseVSHostingProcess>true</UseVSHostingProcess>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>.\bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <UseVSHostingProcess>true</UseVSHostingProcess>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugSymbols>false</DebugSymbols>
-    <Optimize>true</Optimize>
-    <OutputPath>.\bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <UseVSHostingProcess>true</UseVSHostingProcess>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="DotNetZip, Version=1.10.1.0, Culture=neutral, PublicKeyToken=6583c7c814667745, processorArchitecture=MSIL">
-      <HintPath>..\packages\DotNetZip.1.10.1\lib\net20\DotNetZip.dll</HintPath>
-    </Reference>
-    <Reference Include="FSharp.Compiler.CodeDom, Version=1.0.0.1, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
-      <HintPath>..\packages\FSharp.Compiler.CodeDom.1.0.0.1\lib\net40\FSharp.Compiler.CodeDom.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
+    <PackageReference Include="DotNetZip" Version="1.16.0" />
+    <PackageReference Include="FSharp.Compiler.CodeDom" Version="1.0.0.1" />
+    <PackageReference Include="NUnit" Version="3.2.1" />
+    <PackageReference Include="RhinoMocks" Version="3.6.1" />
+  </ItemGroup>
+  <ItemGroup>
     <Reference Include="Microsoft.Build.Framework" />
     <Reference Include="Microsoft.Build.Tasks.v4.0" />
     <Reference Include="Microsoft.Build.Utilities.v4.0" />
-    <Reference Include="nunit.framework, Version=3.2.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.2.1\lib\net40\nunit.framework.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Rhino.Mocks, Version=3.6.0.0, Culture=neutral, PublicKeyToken=0b3305902db7183f, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\RhinoMocks.3.6.1\lib\net\Rhino.Mocks.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Drawing" />
     <Reference Include="System.ServiceProcess" />
     <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AspNet\InstallAspNetTest.cs" />
-    <Compile Include="AssemblyInfoTest.cs" />
-    <Compile Include="AttribTest.cs" />
-    <Compile Include="Beep\BeepTest.cs" />
-    <Compile Include="Checksum\ChecksumTest.cs" />
-    <Compile Include="Computer\ComputerTest.cs" />
-    <Compile Include="DeleteTreeTest.cs" />
-    <Compile Include="DependencyGraph\DependencyGraphTaskTest.cs" />
-    <Compile Include="DependencyGraph\ProjectFileParserTest.cs" />
-    <Compile Include="Fusion\FusionWrapperTest.cs" />
-    <Compile Include="FxCopTest.cs" />
-    <Compile Include="GacUtilTest.cs" />
-    <Compile Include="Git\GitClientTest.cs" />
-    <Compile Include="Git\GitCommitDate.cs" />
-    <Compile Include="Git\GitDescribeTest.cs" />
-    <Compile Include="Git\GitBranchTest.cs" />
-    <Compile Include="Git\GitCommitsTest.cs" />
-    <Compile Include="Git\GitPendingChangesTest.cs" />
-    <Compile Include="Git\GitVersionTest.cs" />
-    <Compile Include="IIS\WebDirectoryScriptMapTest.cs" />
-    <Compile Include="IIS\WebDirectorySettingTest.cs" />
-    <Compile Include="ILMerge\ILMergeTest.cs" />
-    <Compile Include="Install\InstallAssemblyTest.cs" />
-    <Compile Include="Install\UninstallAssemblyTest.cs" />
-    <Compile Include="JavaScript\JSCompressTest.cs" />
-    <Compile Include="Math\ModuloTest.cs" />
-    <Compile Include="MergeTest.cs" />
-    <Compile Include="Oracle\AddTnsNameTest.cs" />
-    <Compile Include="Oracle\TnsParserTest.cs" />
-    <Compile Include="FileUpdateTest.cs" />
-    <Compile Include="IIS\AppPoolControllerTest.cs" />
-    <Compile Include="IIS\AppPoolCreateTest.cs" />
-    <Compile Include="IIS\AppPoolDeleteTest.cs" />
-    <Compile Include="IIS\WebDirectoryCreateTest.cs" />
-    <Compile Include="IIS\WebDirectoryDeleteTest.cs" />
-    <Compile Include="MVTest.cs" />
-    <Compile Include="Regex\RegexCompilerTest.cs" />
-    <Compile Include="Regex\RegexTest.cs" />
-    <Compile Include="RoboCopyTest.cs" />
-    <Compile Include="Sandcastle\MRefBuilderTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Sandcastle\XslTransformTest.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ScriptTest.cs" />
-    <Compile Include="ServiceQueryTest.cs" />
-    <Compile Include="ServiceControllerTest.cs" />
-    <Compile Include="Solution\GetSolutionProjectsTest.cs" />
-    <Compile Include="Sound\SoundTest.cs" />
-    <Compile Include="SourceServer\SrcToolTest.cs" />
-    <Compile Include="SourceServer\SvnSourceIndexTest.cs" />
-    <Compile Include="SourceServer\TfsSourceIndexTest.cs" />
-    <Compile Include="SqlServer\ExecuteDDLTest.cs" />
-    <Compile Include="SqlServer\SqlPubWizTest.cs" />
-    <Compile Include="Subversion\SvnCopyTest.cs" />
-    <Compile Include="Subversion\SvnInfoTest.cs" />
-    <Compile Include="Subversion\SvnStatusTest.cs" />
-    <Compile Include="SymbolServer\SymStoreTest.cs" />
-    <Compile Include="TemplateFile\TemplateFileTest.cs" />
-    <Compile Include="Tfs\InfoCommandResponseTest.cs" />
-    <Compile Include="Time\TimeTest.cs" />
-    <Compile Include="User\UserTest.cs" />
-    <Compile Include="WebDownloadTest.cs" />
-    <Compile Include="XmlUpdateTest.cs" />
-    <Compile Include="FtpUpload\FtpUploadTest.cs" />
-    <Compile Include="MailTest.cs" />
-    <Compile Include="Math\AddTest.cs" />
-    <Compile Include="Math\DivideTest.cs" />
-    <Compile Include="Math\MultipleTest.cs" />
-    <Compile Include="Math\SubtractTest.cs" />
-    <Compile Include="MockBuild.cs" />
-    <Compile Include="NDocTest.cs" />
-    <Compile Include="NUnitTest.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="RegistryReadTest.cs" />
-    <Compile Include="RegistryWriteTest.cs" />
-    <Compile Include="Subversion\SvnCheckoutTest.cs" />
-    <Compile Include="Subversion\SvnClientTest.cs" />
-    <Compile Include="Subversion\SvnCommitTest.cs" />
-    <Compile Include="Subversion\SvnExportTest.cs" />
-    <Compile Include="Subversion\SvnUpdateTest.cs" />
-    <Compile Include="Subversion\SvnVersionTest.cs" />
-    <Compile Include="TaskUtility.cs" />
-    <Compile Include="UnzipTest.cs" />
-    <Compile Include="VersionTest.cs" />
-    <Compile Include="XmlReadTest.cs" />
-    <Compile Include="Xml\XmlQueryTests.cs" />
-    <Compile Include="Xslt\XsltTest.cs" />
-    <Compile Include="ZipTest.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\MSBuild.Community.Tasks\MSBuild.Community.Tasks.csproj">
-      <Project>{F88A60A8-564C-4E70-92DC-E92DBB897641}</Project>
-      <Name>MSBuild.Community.Tasks</Name>
-      <Private>True</Private>
-    </ProjectReference>
+    <ProjectReference Include="..\MSBuild.Community.Tasks\MSBuild.Community.Tasks.csproj" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="DependencyGraph\DBInfo.CodeGen.csproj" />
@@ -180,9 +50,6 @@
     <None Include="ILMerge\ILMergeTest.proj" />
     <None Include="Install\InstallTest.proj" />
     <None Include="JavaScript\JavaScriptTest.proj" />
-    <None Include="packages.config">
-      <SubType>Designer</SubType>
-    </None>
     <None Include="Regex\RegexTest.proj">
       <SubType>Designer</SubType>
     </None>
@@ -211,10 +78,31 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Vault\" />
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+    <Compile Remove="JavaScript\CssCompressTest.cs" />
+    <Compile Remove="Mks\MksAddTest.cs" />
+    <Compile Remove="Mks\MksCheckinTest.cs" />
+    <Compile Remove="Mks\MksCheckpointTest.cs" />
+    <Compile Remove="Mks\MksCreateSandboxTest.cs" />
+    <Compile Remove="Mks\MksDropSandboxTest.cs" />
+    <Compile Remove="Mks\MksDropTest.cs" />
+    <Compile Remove="Mks\MksLockTest.cs" />
+    <Compile Remove="Mks\MksResyncTest.cs" />
+    <Compile Remove="Mks\MksUnlockTest.cs" />
+    <Compile Remove="Vault\VaultTest.cs" />
+    <Compile Remove="Xml\XmlMassUpdateTests.cs" />
+    <Compile Remove="Xml\XPathAsserter.cs" />
+    <Compile Remove="ILMerge\A\ClassA1.cs" />
+    <Compile Remove="ILMerge\A\ClassA2.cs" />
+    <Compile Remove="ILMerge\A\ClassAB.cs" />
+    <Compile Remove="ILMerge\B\ClassAB.cs" />
+    <Compile Remove="ILMerge\B\ClassB1.cs" />
+    <Compile Remove="ILMerge\B\ClassB2.cs" />
+    <Compile Remove="ILMerge\B\ClassB3.cs" />
+    <Compile Remove="ILMerge\A\Properties\AssemblyInfo.cs" />
+    <Compile Remove="ILMerge\B\Properties\AssemblyInfo.cs" />
+    <Compile Remove="ILMerge\A\obj\Debug\.NETFramework,Version=v4.0.AssemblyAttributes.cs" />
+    <Compile Remove="ILMerge\A\obj\Debug\.NETFramework,Version=v4.8.AssemblyAttributes.cs" />
+    <Compile Remove="ILMerge\B\obj\Debug\.NETFramework,Version=v4.0.AssemblyAttributes.cs" />
+    <Compile Remove="ILMerge\B\obj\Debug\.NETFramework,Version=v4.8.AssemblyAttributes.cs" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/Source/MSBuild.Community.Tasks.Tests/packages.config b/Source/MSBuild.Community.Tasks.Tests/packages.config
deleted file mode 100644
index e51f29f0..00000000
--- a/Source/MSBuild.Community.Tasks.Tests/packages.config
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="DotNetZip" version="1.11.0" targetFramework="net40" />
-  <package id="FSharp.Compiler.CodeDom" version="1.0.0.1" targetFramework="net40" />
-  <package id="NUnit" version="3.2.1" targetFramework="net40" />
-  <package id="RhinoMocks" version="3.6.1" />
-</packages>
\ No newline at end of file
diff --git a/Source/MSBuild.Community.Tasks/MSBuild.Community.Tasks.csproj b/Source/MSBuild.Community.Tasks/MSBuild.Community.Tasks.csproj
index 915813c6..a27fb769 100644
--- a/Source/MSBuild.Community.Tasks/MSBuild.Community.Tasks.csproj
+++ b/Source/MSBuild.Community.Tasks/MSBuild.Community.Tasks.csproj
@@ -1,266 +1,43 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{F88A60A8-564C-4E70-92DC-E92DBB897641}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>MSBuild.Community.Tasks</RootNamespace>
-    <AssemblyName>MSBuild.Community.Tasks</AssemblyName>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>MSBuild.Community.Tasks.snk</AssemblyOriginatorKeyFile>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
+    <TargetFramework>net48</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Debug\MSBuild.Community.Tasks.xml</DocumentationFile>
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <DocumentationFile>bin\$(Configuration)\MSBuild.Community.Tasks.xml</DocumentationFile>
     <RunCodeAnalysis>false</RunCodeAnalysis>
     <UseVSHostingProcess>true</UseVSHostingProcess>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
     <OutputPath>..\..\Build\</OutputPath>
-    <DefineConstants>
-    </DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <DefineConstants />
     <DocumentationFile>..\..\Build\MSBuild.Community.Tasks.xml</DocumentationFile>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="DotNetZip, Version=1.10.1.0, Culture=neutral, PublicKeyToken=6583c7c814667745, processorArchitecture=MSIL">
-      <HintPath>..\packages\DotNetZip.1.10.1\lib\net20\DotNetZip.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="FSharp.Compiler.CodeDom, Version=1.0.0.1, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
-      <HintPath>..\packages\FSharp.Compiler.CodeDom.1.0.0.1\lib\net40\FSharp.Compiler.CodeDom.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
+    <PackageReference Include="DotNetZip" Version="1.16.0" />
+    <PackageReference Include="FSharp.Compiler.CodeDom" Version="1.0.0.1" />
+    <PackageReference Include="Microsoft.Web.Administration" Version="7.0.0" />
+  </ItemGroup>
+  <ItemGroup>
     <Reference Include="Microsoft.Build.Framework" />
     <Reference Include="Microsoft.Build.Utilities.v4.0" />
-    <Reference Include="Microsoft.Web.Administration, Version=7.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
     <Reference Include="System.DirectoryServices" />
     <Reference Include="System.Management" />
     <Reference Include="System.ServiceProcess" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\GlobalAssemblyInfo.cs">
-      <Link>GlobalAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="AspNet\InstallAspNet.cs" />
-    <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="Attrib.cs" />
-    <Compile Include="ByteDescriptions.cs" />
-    <Compile Include="Checksum\Checksum.cs" />
-    <Compile Include="Computer\Computer.cs" />
-    <Compile Include="Beep\Beep.cs" />
-    <Compile Include="DeleteTree.cs" />
-    <Compile Include="DependencyGraph\DependencyGraph.cs" />
-    <Compile Include="DependencyGraph\ProjectFileParser.cs" />
-    <Compile Include="DependencyGraph\Reference.cs" />
-    <Compile Include="EmbedNativeResource.cs" />
-    <Compile Include="FtpUpload\FtpUpload.cs" />
-    <Compile Include="FtpUpload\IFtpWebRequest.cs" />
-    <Compile Include="FtpUpload\RealFtpWebRequest.cs" />
-    <Compile Include="Ftp\FtpClientTaskBase.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Ftp\FtpCreateRemoteDirectory.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Ftp\FtpDirectoryExists.cs" />
-    <Compile Include="Ftp\FtpException.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Ftp\FtpFile.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Ftp\FtpReply.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Ftp\FtpUploadDirectoryContent.cs" />
-    <Compile Include="Fusion\CacheFlags.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Fusion\CommitFlags.cs" />
-    <Compile Include="Fusion\QueryFlags.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Fusion\SystemInfo.cs" />
-    <Compile Include="Fusion\UninstallStatus.cs" />
-    <Compile Include="Fusion\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Fusion\FusionWrapper.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Fusion\IAssemblyCache.cs" />
-    <Compile Include="Fusion\IAssemblyCacheItem.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Fusion\InstallReference.cs" />
-    <Compile Include="Fusion\NativeMethods.cs" />
-    <Compile Include="Git\GitCommitDate.cs" />
-    <Compile Include="Git\GitDescribe.cs" />
-    <Compile Include="Git\GitBranch.cs" />
-    <Compile Include="Git\GitClient.cs" />
-    <Compile Include="Git\GitCommits.cs" />
-    <Compile Include="Git\GitPendingChanges.cs" />
-    <Compile Include="Git\GitVersion.cs" />
-    <Compile Include="HtmlHelp\ChmCompiler.cs" />
-    <Compile Include="HtmlHelp\HxCompiler.cs" />
-    <Compile Include="InnoSetup.cs" />
-    <Compile Include="JavaScript\CssCompress.cs" />
-    <Compile Include="JavaScript\CssCompressor.cs" />
-    <Compile Include="Merge.cs" />
-    <Compile Include="Net\HttpRequest.cs" />
-    <Compile Include="NuGet\NuGetBase.cs" />
-    <Compile Include="NuGet\NuGetDelete.cs" />
-    <Compile Include="NuGet\NuGetInstall.cs" />
-    <Compile Include="NuGet\NuGetPack.cs" />
-    <Compile Include="NuGet\NuGetPush.cs" />
-    <Compile Include="NuGet\NuGetRestore.cs" />
-    <Compile Include="NuGet\NuGetUpdate.cs" />
-    <Compile Include="NUnit3.cs" />
-    <Compile Include="PathUtil.cs" />
-    <Compile Include="Regex\RegexCompiler.cs" />
-    <Compile Include="Sandcastle\BuildAssembler.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Sandcastle\ChmBuilder.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Sandcastle\DBCSFix.cs" />
-    <Compile Include="Sandcastle\MRefBuilder.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Sandcastle\Sandcastle.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Sandcastle\SandcastleEnviroment.cs" />
-    <Compile Include="Sandcastle\SandcastleToolBase.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Sandcastle\XslTransform.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Services\FileSystem.cs" />
-    <Compile Include="GacUtil.cs" />
-    <Compile Include="JavaScript\JavaScriptCompressor.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="JavaScript\JSCompress.cs" />
-    <Compile Include="Oracle\AddTnsName.cs" />
-    <Compile Include="Oracle\TnsEntry.cs" />
-    <Compile Include="Oracle\TnsParser.cs" />
-    <Compile Include="RoboCopy.cs" />
-    <Compile Include="Sound\Sound.cs" />
-    <Compile Include="SourceServer\FileBase.cs" />
-    <Compile Include="SourceServer\PdbStr.cs" />
-    <Compile Include="SourceServer\SourceFile.cs" />
-    <Compile Include="SourceServer\SourceIndexBase.cs" />
-    <Compile Include="SourceServer\SrcTool.cs" />
-    <Compile Include="SourceServer\SvnSourceIndex.cs" />
-    <Compile Include="SourceServer\SymbolFile.cs" />
-    <Compile Include="SourceServer\TfsSourceIndex.cs" />
-    <Compile Include="SqlServer\SqlPubWiz.cs" />
-    <Compile Include="Subversion\SvnCopy.cs" />
-    <Compile Include="Subversion\Info.cs" />
-    <Compile Include="Subversion\SvnStatus.cs" />
-    <Compile Include="SymbolServer\SymStore.cs" />
-    <Compile Include="Tfs\InfoCommandResponse.cs" />
-    <Compile Include="Tfs\TfsClient.cs" />
-    <Compile Include="Services\Win32Registry.cs" />
-    <Compile Include="User\User.cs" />
-    <Compile Include="WebUpload.cs" />
-    <Compile Include="Xml\XmlMassUpdate.cs" />
-    <Compile Include="IIS\WebDirectoryScriptMap.cs" />
-    <Compile Include="IIS\WebDirectorySetting.cs" />
-    <Compile Include="ILMerge\ILMerge.cs" />
-    <Compile Include="Install\InstallAssembly.cs" />
-    <Compile Include="Install\UninstallAssembly.cs" />
-    <Compile Include="Math\Modulo.cs" />
-    <Compile Include="Prompt.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Regex\RegexBase.cs" />
-    <Compile Include="Regex\RegexMatch.cs" />
-    <Compile Include="Regex\RegexReplace.cs" />
-    <Compile Include="Schema\DocumentationLoader.cs" />
-    <Compile Include="Schema\ReflectionHelper.cs" />
-    <Compile Include="Schema\TaskSchema.cs" />
-    <Compile Include="Schema\TaskSchemaAnalyser.cs" />
-    <Compile Include="Schema\TaskVisitorBase.cs" />
-    <Compile Include="Solution\GetSolutionProjects.cs" />
-    <Compile Include="SqlServer\ExecuteDDL.cs" />
-    <Compile Include="SqlServer\ServerConnectionWrapper.cs" />
-    <Compile Include="Subversion\SvnInfo.cs" />
-    <Compile Include="TemplateFile\TemplateFile.cs" />
-    <Compile Include="Time\Time.cs" />
-    <Compile Include="Xml\XmlNodeTaskItem.cs" />
-    <Compile Include="Xml\XmlQuery.cs" />
-    <Compile Include="Xml\XmlTaskHelper.cs" />
-    <Compile Include="Xslt\Xslt.cs" />
-    <Compile Include="FileUpdate.cs" />
-    <Compile Include="FxCop.cs" />
-    <Compile Include="IIS\WebBase.cs" />
-    <Compile Include="ServiceController.cs" />
-    <Compile Include="FtpUpload\FtpRequestCreator.cs" />
-    <Compile Include="IIS\AppPoolCreate.cs" />
-    <Compile Include="IIS\WebDirectoryCreate.cs" />
-    <Compile Include="IIS\AppPoolDelete.cs" />
-    <Compile Include="IIS\WebDirectoryDelete.cs" />
-    <Compile Include="IIS\AppPoolController.cs" />
-    <Compile Include="Mail.cs" />
-    <Compile Include="Math\Add.cs" />
-    <Compile Include="Math\Divide.cs" />
-    <Compile Include="Math\MathBase.cs" />
-    <Compile Include="Math\Multiple.cs" />
-    <Compile Include="Math\Subtract.cs" />
-    <Compile Include="MV.cs" />
-    <Compile Include="NDoc.cs" />
-    <Compile Include="NUnit.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
+    <Compile Include="..\GlobalAssemblyInfo.cs" Link="GlobalAssemblyInfo.cs" />
+    <Compile Update="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
-    <Compile Include="ServiceQuery.cs" />
-    <Compile Include="RegistryRead.cs" />
-    <Compile Include="RegistryWrite.cs" />
-    <Compile Include="Script.cs" />
-    <Compile Include="Sleep.cs" />
-    <Compile Include="SqlExecute.cs" />
-    <Compile Include="Subversion\SvnCheckout.cs" />
-    <Compile Include="Subversion\SvnCommit.cs" />
-    <Compile Include="Subversion\SvnExport.cs" />
-    <Compile Include="Subversion\SvnClient.cs" />
-    <Compile Include="Subversion\SvnVersion.cs" />
-    <Compile Include="Subversion\SvnUpdate.cs" />
-    <Compile Include="ToolPathUtil.cs" />
-    <Compile Include="Unzip.cs" />
-    <Compile Include="Version.cs" />
-    <Compile Include="WebDownload.cs" />
-    <Compile Include="XmlRead.cs" />
-    <Compile Include="XmlUpdate.cs" />
-    <Compile Include="Zip.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="MSBuild.Community.Tasks.snk" />
@@ -275,18 +52,55 @@
     <Content Include="NUnitReport.xsl">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Properties\Resources.resx">
+    <EmbeddedResource Update="Properties\Resources.resx">
       <SubType>Designer</SubType>
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="GitHub\" />
-    <Folder Include="Vault\" />
+    <Compile Remove="Mks\MksAdd.cs" />
+    <Compile Remove="Mks\MksCheckin.cs" />
+    <Compile Remove="Mks\MksCheckpoint.cs" />
+    <Compile Remove="Mks\MksCreateSandbox.cs" />
+    <Compile Remove="Mks\MksDopSandbox.cs" />
+    <Compile Remove="Mks\MksDrop.cs" />
+    <Compile Remove="Mks\MksLock.cs" />
+    <Compile Remove="Mks\MksMakeWritable.cs" />
+    <Compile Remove="Mks\MksResync.cs" />
+    <Compile Remove="Mks\MksUnlock.cs" />
+    <Compile Remove="SourceSafe\VssAdd.cs" />
+    <Compile Remove="SourceSafe\VssBase.cs" />
+    <Compile Remove="SourceSafe\VssCheckin.cs" />
+    <Compile Remove="SourceSafe\VssCheckout.cs" />
+    <Compile Remove="SourceSafe\VssClean.cs" />
+    <Compile Remove="SourceSafe\VssDiff.cs" />
+    <Compile Remove="SourceSafe\VssGet.cs" />
+    <Compile Remove="SourceSafe\VssHistory.cs" />
+    <Compile Remove="SourceSafe\VssLabel.cs" />
+    <Compile Remove="SourceSafe\VssRecursiveBase.cs" />
+    <Compile Remove="SourceSafe\VssUndoCheckout.cs" />
+    <Compile Remove="Subversion\SvnLock.cs" />
+    <Compile Remove="Subversion\SvnUnlock.cs" />
+    <Compile Remove="Tfs\IServer.cs" />
+    <Compile Remove="Tfs\TeamFoundationServer.cs" />
+    <Compile Remove="Tfs\TeamFoundationServerException.cs" />
+    <Compile Remove="Tfs\TfsVersion.cs" />
+    <Compile Remove="Vault\VaultAddFile.cs" />
+    <Compile Remove="Vault\VaultBase.cs" />
+    <Compile Remove="Vault\VaultCheckin.cs" />
+    <Compile Remove="Vault\VaultCheckout.cs" />
+    <Compile Remove="Vault\VaultGetFile.cs" />
+    <Compile Remove="Vault\VaultUndoCheckout.cs" />
+    <Compile Remove="Tfs\Proxies\Changeset.cs" />
+    <Compile Remove="Tfs\Proxies\RecursionType.cs" />
+    <Compile Remove="Tfs\Proxies\VersionControlServer.cs" />
+    <Compile Remove="Tfs\Proxies\VersionSpec.cs" />
+    <Compile Remove="Tfs\Proxies\Workspace.cs" />
+    <Compile Remove="Tfs\Proxies\WorkspaceInfo.cs" />
+    <Compile Remove="Tfs\Proxies\WorkspaceVersionSpec.cs" />
+    <Compile Remove="Tfs\Proxies\Workstation.cs" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Source/MSBuild.Community.Tasks/Properties/Resources.Designer.cs b/Source/MSBuild.Community.Tasks/Properties/Resources.Designer.cs
index 65e120c3..28d9f69b 100644
--- a/Source/MSBuild.Community.Tasks/Properties/Resources.Designer.cs
+++ b/Source/MSBuild.Community.Tasks/Properties/Resources.Designer.cs
@@ -19,7 +19,7 @@ namespace MSBuild.Community.Tasks.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
diff --git a/Source/MSBuild.Community.Tasks/packages.config b/Source/MSBuild.Community.Tasks/packages.config
deleted file mode 100644
index 9fc3100b..00000000
--- a/Source/MSBuild.Community.Tasks/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="DotNetZip" version="1.11.0" targetFramework="net40" />
-  <package id="FSharp.Compiler.CodeDom" version="1.0.0.1" targetFramework="net40" />
-</packages>
\ No newline at end of file
diff --git a/Source/Settings.SourceAnalysis b/Source/Settings.SourceAnalysis
deleted file mode 100644
index 3568433a..00000000
--- a/Source/Settings.SourceAnalysis
+++ /dev/null
@@ -1,36 +0,0 @@
-<StyleCopSettings Version="4.3">
-  <Analyzers>
-    <Analyzer AnalyzerId="Microsoft.StyleCop.CSharp.DocumentationRules">
-      <AnalyzerSettings>
-        <BooleanProperty Name="IgnorePrivates">True</BooleanProperty>
-        <BooleanProperty Name="IgnoreInternals">True</BooleanProperty>
-        <BooleanProperty Name="IncludeFields">False</BooleanProperty>
-      </AnalyzerSettings>
-    </Analyzer>
-    <Analyzer AnalyzerId="Microsoft.StyleCop.CSharp.SpacingRules">
-      <Rules>
-        <Rule Name="TabsMustNotBeUsed">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-      </Rules>
-      <AnalyzerSettings />
-    </Analyzer>
-    <Analyzer AnalyzerId="Microsoft.StyleCop.CSharp.ReadabilityRules">
-      <Rules>
-        <Rule Name="DoNotPlaceRegionsWithinElements">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-      </Rules>
-      <AnalyzerSettings />
-    </Analyzer>
-    <Analyzer AnalyzerId="Microsoft.StyleCop.CSharp.OrderingRules">
-      <AnalyzerSettings>
-        <BooleanProperty Name="GeneratedCodeElementOrder">False</BooleanProperty>
-      </AnalyzerSettings>
-    </Analyzer>
-  </Analyzers>
-</StyleCopSettings>
\ No newline at end of file