From 40d7a4c8962f98d2a2954d0811774e4c21ebb6bf Mon Sep 17 00:00:00 2001
From: evoskuil <eric@voskuil.org>
Date: Fri, 13 May 2016 00:46:06 -0700
Subject: [PATCH] Problem: redundant copies of msvc .props and .xml files.

---
 builds/msvc/vs2010/libsodium.import.props | 52 -------------------
 builds/msvc/vs2010/libsodium.import.xml   | 17 -------
 builds/msvc/vs2010/libzmq.import.props    | 61 -----------------------
 builds/msvc/vs2010/libzmq.import.xml      | 33 ------------
 builds/msvc/vs2010/libzmq/libzmq.xml      | 20 --------
 builds/msvc/vs2012/libsodium.import.props | 52 -------------------
 builds/msvc/vs2012/libsodium.import.xml   | 17 -------
 builds/msvc/vs2012/libzmq.import.props    | 61 -----------------------
 builds/msvc/vs2012/libzmq.import.xml      | 33 ------------
 builds/msvc/vs2012/libzmq/libzmq.xml      | 20 --------
 builds/msvc/vs2013/libsodium.import.props | 52 -------------------
 builds/msvc/vs2013/libsodium.import.xml   | 17 -------
 builds/msvc/vs2013/libzmq.import.props    | 61 -----------------------
 builds/msvc/vs2013/libzmq.import.xml      | 33 ------------
 builds/msvc/vs2013/libzmq/libzmq.xml      | 20 --------
 builds/msvc/vs2015/libsodium.import.props | 52 -------------------
 builds/msvc/vs2015/libsodium.import.xml   | 17 -------
 17 files changed, 618 deletions(-)
 delete mode 100644 builds/msvc/vs2010/libsodium.import.props
 delete mode 100644 builds/msvc/vs2010/libsodium.import.xml
 delete mode 100644 builds/msvc/vs2010/libzmq.import.props
 delete mode 100644 builds/msvc/vs2010/libzmq.import.xml
 delete mode 100644 builds/msvc/vs2010/libzmq/libzmq.xml
 delete mode 100644 builds/msvc/vs2012/libsodium.import.props
 delete mode 100644 builds/msvc/vs2012/libsodium.import.xml
 delete mode 100644 builds/msvc/vs2012/libzmq.import.props
 delete mode 100644 builds/msvc/vs2012/libzmq.import.xml
 delete mode 100644 builds/msvc/vs2012/libzmq/libzmq.xml
 delete mode 100644 builds/msvc/vs2013/libsodium.import.props
 delete mode 100644 builds/msvc/vs2013/libsodium.import.xml
 delete mode 100644 builds/msvc/vs2013/libzmq.import.props
 delete mode 100644 builds/msvc/vs2013/libzmq.import.xml
 delete mode 100644 builds/msvc/vs2013/libzmq/libzmq.xml
 delete mode 100644 builds/msvc/vs2015/libsodium.import.props
 delete mode 100644 builds/msvc/vs2015/libsodium.import.xml

diff --git a/builds/msvc/vs2010/libsodium.import.props b/builds/msvc/vs2010/libsodium.import.props
deleted file mode 100644
index c7b68c90..00000000
--- a/builds/msvc/vs2010/libsodium.import.props
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup Label="Globals">
-    <_PropertySheetDisplayName>Libsodium Import Settings</_PropertySheetDisplayName>
-  </PropertyGroup>
-
-  <!-- User Interface -->
-  
-  <ItemGroup Label="BuildOptionsExtension">
-    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)libsodium.import.xml" />
-  </ItemGroup>
-
-  <!-- Linkage -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include;$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include\sodium\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Linkage-libsodium)' == 'static' Or '$(Linkage-libsodium)' == 'ltcg'">SODIUM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies Condition="'$(Linkage-libsodium)' != ''">advapi32.lib;libsodium.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Release')) != -1">$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Copy -->
-
-  <Target Name="Linkage-libsodium-dynamic" AfterTargets="AfterBuild" Condition="'$(Linkage-libsodium)' == 'dynamic'">
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libsodium.dll"
-          DestinationFiles="$(TargetDir)libsodium.dll"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libsodium.pdb"
-          DestinationFiles="$(TargetDir)libsodium.pdb"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Release')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\$(PlatformToolset)\dynamic\libsodium.dll"
-          DestinationFiles="$(TargetDir)libsodium.dll"
-          SkipUnchangedFiles="true" />
-  </Target>
-
-  <!-- Messages -->
-
-  <Target Name="libsodium-info" BeforeTargets="AfterBuild" Condition="'$(Linkage-libsodium)' == 'dynamic'">
-    <Message Text="Copying libsodium.dll -&gt; $(TargetDir)libsodium.dll" Importance="high"/>
-    <Message Text="Copying libsodium.pdb -&gt; $(TargetDir)libsodium.pdb" Importance="high" Condition="$(Configuration.IndexOf('Debug')) != -1" />
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/builds/msvc/vs2010/libsodium.import.xml b/builds/msvc/vs2010/libsodium.import.xml
deleted file mode 100644
index dbcf4e5a..00000000
--- a/builds/msvc/vs2010/libsodium.import.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
-  <Rule Name="libsodium-linkage-uiextension" PageTemplate="tool" DisplayName="Local Dependencies" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="libsodium" DisplayName="libsodium" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Linkage-libsodium" DisplayName="Linkage" Description="How libsodium will be linked into the output of this project" Category="libsodium">
-      <EnumValue Name="" DisplayName="Not linked" />
-      <EnumValue Name="dynamic" DisplayName="Dynamic (DLL)" />
-      <EnumValue Name="static" DisplayName="Static (LIB)" />
-      <EnumValue Name="ltcg" DisplayName="Static using link time compile generation (LTCG)" />
-    </EnumProperty>
-  </Rule>
-</ProjectSchemaDefinitions>
\ No newline at end of file
diff --git a/builds/msvc/vs2010/libzmq.import.props b/builds/msvc/vs2010/libzmq.import.props
deleted file mode 100644
index 941d6a39..00000000
--- a/builds/msvc/vs2010/libzmq.import.props
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup Label="Globals">
-    <_PropertySheetDisplayName>ZMQ Import Settings</_PropertySheetDisplayName>
-  </PropertyGroup>
-  
-  <!-- User Interface -->
-
-  <ItemGroup Label="BuildOptionsExtension">
-    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)libzmq.import.xml" />
-  </ItemGroup>
-  
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions Condition="'$(Option-openpgm)' == 'true'">ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-gssapi)' == 'true'">HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  
-  <!-- Linkage -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libzmq\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Linkage-libzmq)' == 'static' Or '$(Linkage-libzmq)' == 'ltcg'">ZMQ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies Condition="'$(Linkage-libzmq)' != ''">libzmq.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libzmq)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Release')) != -1">$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libzmq)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  
-  <!-- Copy -->
-
-  <Target Name="Linkage-libzmq-dynamic" AfterTargets="AfterBuild" Condition="'$(Linkage-libzmq)' == 'dynamic'">
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libzmq.dll"
-          DestinationFiles="$(TargetDir)libzmq.dll"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libzmq.pdb"
-          DestinationFiles="$(TargetDir)libzmq.pdb"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Release')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Release\$(PlatformToolset)\dynamic\libzmq.dll"
-          DestinationFiles="$(TargetDir)libzmq.dll"
-          SkipUnchangedFiles="true" />
-  </Target>
-
-  <!-- Messages -->
-
-  <Target Name="libzmq-info" BeforeTargets="AfterBuild" Condition="'$(Linkage-libzmq)' == 'dynamic'">
-    <Message Text="Copying libzmq.dll -&gt; $(TargetDir)libzmq.dll" Importance="high"/>
-    <Message Text="Copying libzmq.pdb -&gt; $(TargetDir)libzmq.pdb" Importance="high" Condition="$(Configuration.IndexOf('Debug')) != -1" />
-  </Target>
-
-</Project>
diff --git a/builds/msvc/vs2010/libzmq.import.xml b/builds/msvc/vs2010/libzmq.import.xml
deleted file mode 100644
index 18e258ce..00000000
--- a/builds/msvc/vs2010/libzmq.import.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
-  <Rule Name="libzmq-options-uiextension" PageTemplate="tool" DisplayName="ZMQ Options" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="openpgm" DisplayName="openpgm" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Option-openpgm" DisplayName="Enable OpenPGM" Description="Enable the OpenPGM build option" Category="openpgm">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-gssapi" DisplayName="Enable GSS API" Description="Enable the GSS API build option" Category="gssapi">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-  </Rule>
-  <Rule Name="libzmq-linkage-uiextension" PageTemplate="tool" DisplayName="Local Dependencies" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="libzmq" DisplayName="libzmq" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Linkage-libzmq" DisplayName="Linkage" Description="How libzmq will be linked into the output of this project" Category="libzmq">
-      <EnumValue Name="" DisplayName="Not linked" />
-      <EnumValue Name="dynamic" DisplayName="Dynamic (DLL)" />
-      <EnumValue Name="static" DisplayName="Static (LIB)" />
-      <EnumValue Name="ltcg" DisplayName="Static using link time compile generation (LTCG)" />
-    </EnumProperty>
-  </Rule>
-</ProjectSchemaDefinitions>
diff --git a/builds/msvc/vs2010/libzmq/libzmq.xml b/builds/msvc/vs2010/libzmq/libzmq.xml
deleted file mode 100644
index 20f0b744..00000000
--- a/builds/msvc/vs2010/libzmq/libzmq.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
-  <Rule Name="libzmq-uiextension" PageTemplate="tool" DisplayName="ZMQ Options" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="openpgm" DisplayName="openpgm" />
-      <Category Name="gssapi" DisplayName="gssapi" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Option-openpgm" DisplayName="Enable OpenPGM" Description="Enable the OpenPGM build option" Category="openpgm">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-gssapi" DisplayName="Enable GSS API" Description="Enable GSS API build option" Category="gssapi">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-  </Rule>
-</ProjectSchemaDefinitions>
diff --git a/builds/msvc/vs2012/libsodium.import.props b/builds/msvc/vs2012/libsodium.import.props
deleted file mode 100644
index c7b68c90..00000000
--- a/builds/msvc/vs2012/libsodium.import.props
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup Label="Globals">
-    <_PropertySheetDisplayName>Libsodium Import Settings</_PropertySheetDisplayName>
-  </PropertyGroup>
-
-  <!-- User Interface -->
-  
-  <ItemGroup Label="BuildOptionsExtension">
-    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)libsodium.import.xml" />
-  </ItemGroup>
-
-  <!-- Linkage -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include;$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include\sodium\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Linkage-libsodium)' == 'static' Or '$(Linkage-libsodium)' == 'ltcg'">SODIUM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies Condition="'$(Linkage-libsodium)' != ''">advapi32.lib;libsodium.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Release')) != -1">$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Copy -->
-
-  <Target Name="Linkage-libsodium-dynamic" AfterTargets="AfterBuild" Condition="'$(Linkage-libsodium)' == 'dynamic'">
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libsodium.dll"
-          DestinationFiles="$(TargetDir)libsodium.dll"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libsodium.pdb"
-          DestinationFiles="$(TargetDir)libsodium.pdb"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Release')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\$(PlatformToolset)\dynamic\libsodium.dll"
-          DestinationFiles="$(TargetDir)libsodium.dll"
-          SkipUnchangedFiles="true" />
-  </Target>
-
-  <!-- Messages -->
-
-  <Target Name="libsodium-info" BeforeTargets="AfterBuild" Condition="'$(Linkage-libsodium)' == 'dynamic'">
-    <Message Text="Copying libsodium.dll -&gt; $(TargetDir)libsodium.dll" Importance="high"/>
-    <Message Text="Copying libsodium.pdb -&gt; $(TargetDir)libsodium.pdb" Importance="high" Condition="$(Configuration.IndexOf('Debug')) != -1" />
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/builds/msvc/vs2012/libsodium.import.xml b/builds/msvc/vs2012/libsodium.import.xml
deleted file mode 100644
index dbcf4e5a..00000000
--- a/builds/msvc/vs2012/libsodium.import.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
-  <Rule Name="libsodium-linkage-uiextension" PageTemplate="tool" DisplayName="Local Dependencies" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="libsodium" DisplayName="libsodium" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Linkage-libsodium" DisplayName="Linkage" Description="How libsodium will be linked into the output of this project" Category="libsodium">
-      <EnumValue Name="" DisplayName="Not linked" />
-      <EnumValue Name="dynamic" DisplayName="Dynamic (DLL)" />
-      <EnumValue Name="static" DisplayName="Static (LIB)" />
-      <EnumValue Name="ltcg" DisplayName="Static using link time compile generation (LTCG)" />
-    </EnumProperty>
-  </Rule>
-</ProjectSchemaDefinitions>
\ No newline at end of file
diff --git a/builds/msvc/vs2012/libzmq.import.props b/builds/msvc/vs2012/libzmq.import.props
deleted file mode 100644
index 941d6a39..00000000
--- a/builds/msvc/vs2012/libzmq.import.props
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup Label="Globals">
-    <_PropertySheetDisplayName>ZMQ Import Settings</_PropertySheetDisplayName>
-  </PropertyGroup>
-  
-  <!-- User Interface -->
-
-  <ItemGroup Label="BuildOptionsExtension">
-    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)libzmq.import.xml" />
-  </ItemGroup>
-  
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions Condition="'$(Option-openpgm)' == 'true'">ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-gssapi)' == 'true'">HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  
-  <!-- Linkage -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libzmq\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Linkage-libzmq)' == 'static' Or '$(Linkage-libzmq)' == 'ltcg'">ZMQ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies Condition="'$(Linkage-libzmq)' != ''">libzmq.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libzmq)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Release')) != -1">$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libzmq)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  
-  <!-- Copy -->
-
-  <Target Name="Linkage-libzmq-dynamic" AfterTargets="AfterBuild" Condition="'$(Linkage-libzmq)' == 'dynamic'">
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libzmq.dll"
-          DestinationFiles="$(TargetDir)libzmq.dll"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libzmq.pdb"
-          DestinationFiles="$(TargetDir)libzmq.pdb"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Release')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Release\$(PlatformToolset)\dynamic\libzmq.dll"
-          DestinationFiles="$(TargetDir)libzmq.dll"
-          SkipUnchangedFiles="true" />
-  </Target>
-
-  <!-- Messages -->
-
-  <Target Name="libzmq-info" BeforeTargets="AfterBuild" Condition="'$(Linkage-libzmq)' == 'dynamic'">
-    <Message Text="Copying libzmq.dll -&gt; $(TargetDir)libzmq.dll" Importance="high"/>
-    <Message Text="Copying libzmq.pdb -&gt; $(TargetDir)libzmq.pdb" Importance="high" Condition="$(Configuration.IndexOf('Debug')) != -1" />
-  </Target>
-
-</Project>
diff --git a/builds/msvc/vs2012/libzmq.import.xml b/builds/msvc/vs2012/libzmq.import.xml
deleted file mode 100644
index 18e258ce..00000000
--- a/builds/msvc/vs2012/libzmq.import.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
-  <Rule Name="libzmq-options-uiextension" PageTemplate="tool" DisplayName="ZMQ Options" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="openpgm" DisplayName="openpgm" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Option-openpgm" DisplayName="Enable OpenPGM" Description="Enable the OpenPGM build option" Category="openpgm">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-gssapi" DisplayName="Enable GSS API" Description="Enable the GSS API build option" Category="gssapi">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-  </Rule>
-  <Rule Name="libzmq-linkage-uiextension" PageTemplate="tool" DisplayName="Local Dependencies" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="libzmq" DisplayName="libzmq" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Linkage-libzmq" DisplayName="Linkage" Description="How libzmq will be linked into the output of this project" Category="libzmq">
-      <EnumValue Name="" DisplayName="Not linked" />
-      <EnumValue Name="dynamic" DisplayName="Dynamic (DLL)" />
-      <EnumValue Name="static" DisplayName="Static (LIB)" />
-      <EnumValue Name="ltcg" DisplayName="Static using link time compile generation (LTCG)" />
-    </EnumProperty>
-  </Rule>
-</ProjectSchemaDefinitions>
diff --git a/builds/msvc/vs2012/libzmq/libzmq.xml b/builds/msvc/vs2012/libzmq/libzmq.xml
deleted file mode 100644
index 20f0b744..00000000
--- a/builds/msvc/vs2012/libzmq/libzmq.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
-  <Rule Name="libzmq-uiextension" PageTemplate="tool" DisplayName="ZMQ Options" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="openpgm" DisplayName="openpgm" />
-      <Category Name="gssapi" DisplayName="gssapi" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Option-openpgm" DisplayName="Enable OpenPGM" Description="Enable the OpenPGM build option" Category="openpgm">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-gssapi" DisplayName="Enable GSS API" Description="Enable GSS API build option" Category="gssapi">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-  </Rule>
-</ProjectSchemaDefinitions>
diff --git a/builds/msvc/vs2013/libsodium.import.props b/builds/msvc/vs2013/libsodium.import.props
deleted file mode 100644
index c7b68c90..00000000
--- a/builds/msvc/vs2013/libsodium.import.props
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup Label="Globals">
-    <_PropertySheetDisplayName>Libsodium Import Settings</_PropertySheetDisplayName>
-  </PropertyGroup>
-
-  <!-- User Interface -->
-  
-  <ItemGroup Label="BuildOptionsExtension">
-    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)libsodium.import.xml" />
-  </ItemGroup>
-
-  <!-- Linkage -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include;$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include\sodium\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Linkage-libsodium)' == 'static' Or '$(Linkage-libsodium)' == 'ltcg'">SODIUM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies Condition="'$(Linkage-libsodium)' != ''">advapi32.lib;libsodium.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Release')) != -1">$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Copy -->
-
-  <Target Name="Linkage-libsodium-dynamic" AfterTargets="AfterBuild" Condition="'$(Linkage-libsodium)' == 'dynamic'">
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libsodium.dll"
-          DestinationFiles="$(TargetDir)libsodium.dll"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libsodium.pdb"
-          DestinationFiles="$(TargetDir)libsodium.pdb"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Release')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\$(PlatformToolset)\dynamic\libsodium.dll"
-          DestinationFiles="$(TargetDir)libsodium.dll"
-          SkipUnchangedFiles="true" />
-  </Target>
-
-  <!-- Messages -->
-
-  <Target Name="libsodium-info" BeforeTargets="AfterBuild" Condition="'$(Linkage-libsodium)' == 'dynamic'">
-    <Message Text="Copying libsodium.dll -&gt; $(TargetDir)libsodium.dll" Importance="high"/>
-    <Message Text="Copying libsodium.pdb -&gt; $(TargetDir)libsodium.pdb" Importance="high" Condition="$(Configuration.IndexOf('Debug')) != -1" />
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/builds/msvc/vs2013/libsodium.import.xml b/builds/msvc/vs2013/libsodium.import.xml
deleted file mode 100644
index dbcf4e5a..00000000
--- a/builds/msvc/vs2013/libsodium.import.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
-  <Rule Name="libsodium-linkage-uiextension" PageTemplate="tool" DisplayName="Local Dependencies" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="libsodium" DisplayName="libsodium" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Linkage-libsodium" DisplayName="Linkage" Description="How libsodium will be linked into the output of this project" Category="libsodium">
-      <EnumValue Name="" DisplayName="Not linked" />
-      <EnumValue Name="dynamic" DisplayName="Dynamic (DLL)" />
-      <EnumValue Name="static" DisplayName="Static (LIB)" />
-      <EnumValue Name="ltcg" DisplayName="Static using link time compile generation (LTCG)" />
-    </EnumProperty>
-  </Rule>
-</ProjectSchemaDefinitions>
\ No newline at end of file
diff --git a/builds/msvc/vs2013/libzmq.import.props b/builds/msvc/vs2013/libzmq.import.props
deleted file mode 100644
index 941d6a39..00000000
--- a/builds/msvc/vs2013/libzmq.import.props
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup Label="Globals">
-    <_PropertySheetDisplayName>ZMQ Import Settings</_PropertySheetDisplayName>
-  </PropertyGroup>
-  
-  <!-- User Interface -->
-
-  <ItemGroup Label="BuildOptionsExtension">
-    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)libzmq.import.xml" />
-  </ItemGroup>
-  
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions Condition="'$(Option-openpgm)' == 'true'">ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-gssapi)' == 'true'">HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  
-  <!-- Linkage -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libzmq\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Linkage-libzmq)' == 'static' Or '$(Linkage-libzmq)' == 'ltcg'">ZMQ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies Condition="'$(Linkage-libzmq)' != ''">libzmq.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libzmq)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Release')) != -1">$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libzmq)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  
-  <!-- Copy -->
-
-  <Target Name="Linkage-libzmq-dynamic" AfterTargets="AfterBuild" Condition="'$(Linkage-libzmq)' == 'dynamic'">
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libzmq.dll"
-          DestinationFiles="$(TargetDir)libzmq.dll"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libzmq.pdb"
-          DestinationFiles="$(TargetDir)libzmq.pdb"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Release')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Release\$(PlatformToolset)\dynamic\libzmq.dll"
-          DestinationFiles="$(TargetDir)libzmq.dll"
-          SkipUnchangedFiles="true" />
-  </Target>
-
-  <!-- Messages -->
-
-  <Target Name="libzmq-info" BeforeTargets="AfterBuild" Condition="'$(Linkage-libzmq)' == 'dynamic'">
-    <Message Text="Copying libzmq.dll -&gt; $(TargetDir)libzmq.dll" Importance="high"/>
-    <Message Text="Copying libzmq.pdb -&gt; $(TargetDir)libzmq.pdb" Importance="high" Condition="$(Configuration.IndexOf('Debug')) != -1" />
-  </Target>
-
-</Project>
diff --git a/builds/msvc/vs2013/libzmq.import.xml b/builds/msvc/vs2013/libzmq.import.xml
deleted file mode 100644
index 18e258ce..00000000
--- a/builds/msvc/vs2013/libzmq.import.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
-  <Rule Name="libzmq-options-uiextension" PageTemplate="tool" DisplayName="ZMQ Options" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="openpgm" DisplayName="openpgm" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Option-openpgm" DisplayName="Enable OpenPGM" Description="Enable the OpenPGM build option" Category="openpgm">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-gssapi" DisplayName="Enable GSS API" Description="Enable the GSS API build option" Category="gssapi">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-  </Rule>
-  <Rule Name="libzmq-linkage-uiextension" PageTemplate="tool" DisplayName="Local Dependencies" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="libzmq" DisplayName="libzmq" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Linkage-libzmq" DisplayName="Linkage" Description="How libzmq will be linked into the output of this project" Category="libzmq">
-      <EnumValue Name="" DisplayName="Not linked" />
-      <EnumValue Name="dynamic" DisplayName="Dynamic (DLL)" />
-      <EnumValue Name="static" DisplayName="Static (LIB)" />
-      <EnumValue Name="ltcg" DisplayName="Static using link time compile generation (LTCG)" />
-    </EnumProperty>
-  </Rule>
-</ProjectSchemaDefinitions>
diff --git a/builds/msvc/vs2013/libzmq/libzmq.xml b/builds/msvc/vs2013/libzmq/libzmq.xml
deleted file mode 100644
index 20f0b744..00000000
--- a/builds/msvc/vs2013/libzmq/libzmq.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
-  <Rule Name="libzmq-uiextension" PageTemplate="tool" DisplayName="ZMQ Options" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="openpgm" DisplayName="openpgm" />
-      <Category Name="gssapi" DisplayName="gssapi" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Option-openpgm" DisplayName="Enable OpenPGM" Description="Enable the OpenPGM build option" Category="openpgm">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-gssapi" DisplayName="Enable GSS API" Description="Enable GSS API build option" Category="gssapi">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-  </Rule>
-</ProjectSchemaDefinitions>
diff --git a/builds/msvc/vs2015/libsodium.import.props b/builds/msvc/vs2015/libsodium.import.props
deleted file mode 100644
index c7b68c90..00000000
--- a/builds/msvc/vs2015/libsodium.import.props
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup Label="Globals">
-    <_PropertySheetDisplayName>Libsodium Import Settings</_PropertySheetDisplayName>
-  </PropertyGroup>
-
-  <!-- User Interface -->
-  
-  <ItemGroup Label="BuildOptionsExtension">
-    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)libsodium.import.xml" />
-  </ItemGroup>
-
-  <!-- Linkage -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include;$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include\sodium\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Linkage-libsodium)' == 'static' Or '$(Linkage-libsodium)' == 'ltcg'">SODIUM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies Condition="'$(Linkage-libsodium)' != ''">advapi32.lib;libsodium.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Release')) != -1">$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Copy -->
-
-  <Target Name="Linkage-libsodium-dynamic" AfterTargets="AfterBuild" Condition="'$(Linkage-libsodium)' == 'dynamic'">
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libsodium.dll"
-          DestinationFiles="$(TargetDir)libsodium.dll"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libsodium.pdb"
-          DestinationFiles="$(TargetDir)libsodium.pdb"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Release')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\$(PlatformToolset)\dynamic\libsodium.dll"
-          DestinationFiles="$(TargetDir)libsodium.dll"
-          SkipUnchangedFiles="true" />
-  </Target>
-
-  <!-- Messages -->
-
-  <Target Name="libsodium-info" BeforeTargets="AfterBuild" Condition="'$(Linkage-libsodium)' == 'dynamic'">
-    <Message Text="Copying libsodium.dll -&gt; $(TargetDir)libsodium.dll" Importance="high"/>
-    <Message Text="Copying libsodium.pdb -&gt; $(TargetDir)libsodium.pdb" Importance="high" Condition="$(Configuration.IndexOf('Debug')) != -1" />
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/builds/msvc/vs2015/libsodium.import.xml b/builds/msvc/vs2015/libsodium.import.xml
deleted file mode 100644
index dbcf4e5a..00000000
--- a/builds/msvc/vs2015/libsodium.import.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
-  <Rule Name="libsodium-linkage-uiextension" PageTemplate="tool" DisplayName="Local Dependencies" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="libsodium" DisplayName="libsodium" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Linkage-libsodium" DisplayName="Linkage" Description="How libsodium will be linked into the output of this project" Category="libsodium">
-      <EnumValue Name="" DisplayName="Not linked" />
-      <EnumValue Name="dynamic" DisplayName="Dynamic (DLL)" />
-      <EnumValue Name="static" DisplayName="Static (LIB)" />
-      <EnumValue Name="ltcg" DisplayName="Static using link time compile generation (LTCG)" />
-    </EnumProperty>
-  </Rule>
-</ProjectSchemaDefinitions>
\ No newline at end of file