Merge pull request #110 from adalon/15.1

kzu · web-flow · commit b29165ea4d41 · 2017-04-17T15:42:22.000-03:00
Fixes for 15.1
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,3 @@
 [submodule "external/ApiIntersect"]
 	path = external/ApiIntersect
 	url = https://github.com/xamarin/ApiInteresect.git
-[submodule "external/NuGetizerWorkaroundForVS2017RTW"]
-	path = external/NuGetizerWorkaroundForVS2017RTW
-	url = https://github.com/xamarin/NuGetizerWorkaroundForVS2017RTW.git
diff --git a/external/NuGetizerWorkaroundForVS2017RTW b/external/NuGetizerWorkaroundForVS2017RTW
diff --git a/src/NuGet.Build.Packaging.Shared.props b/src/NuGet.Build.Packaging.Shared.props
@@ -18,6 +18,7 @@
 		<NoWarn>1692;$(NoWarn)</NoWarn>
 		<ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
 		<ThisAssemblyNamespace>$(RootNamespace)</ThisAssemblyNamespace>
+		<GenerateExports>false</GenerateExports>
 	</PropertyGroup>
 
 	<!-- Default to unsigned assemblies unless explicitly told to sign -->
diff --git a/src/VisualStudio/NuGet.Client.Fix/LegacyCSProjProviderForNuProj.cs b/src/VisualStudio/NuGet.Client.Fix/LegacyCSProjProviderForNuProj.cs
diff --git a/src/VisualStudio/NuGet.Client.Fix/NuGet.Client.Fix.csproj b/src/VisualStudio/NuGet.Client.Fix/NuGet.Client.Fix.csproj
diff --git a/src/VisualStudio/NuGet.Client.Fix/Properties/AssemblyInfo.cs b/src/VisualStudio/NuGet.Client.Fix/Properties/AssemblyInfo.cs
diff --git a/src/VisualStudio/NuGet.Packaging.VisualStudio.15/NuGet.Packaging.VisualStudio.15.csproj b/src/VisualStudio/NuGet.Packaging.VisualStudio.15/NuGet.Packaging.VisualStudio.15.csproj
@@ -79,10 +79,6 @@
     </VSCTCompile>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\NuGet.Client.Fix\NuGet.Client.Fix.csproj">
-      <Project>{7454a1ec-4033-4803-97c8-f0c8c04dbe4d}</Project>
-      <Name>NuGet.Client.Fix</Name>
-    </ProjectReference>
     <ProjectReference Include="..\NuGet.Packaging.VisualStudio\NuGet.Packaging.VisualStudio.csproj">
       <Project>{9617edcd-23bb-41ea-827d-f5729d45b0af}</Project>
       <Name>NuGet.Packaging.VisualStudio</Name>
diff --git a/src/VisualStudio/NuGet.Packaging.VisualStudio.15/NuGetVSProject.cs b/src/VisualStudio/NuGet.Packaging.VisualStudio.15/NuGetVSProject.cs
@@ -10,7 +10,6 @@
 using VSLangProj140;
 using VSLangProj80;
 using Merq;
-using NuGet.Protocol.Core.Types;
 
 namespace NuGet.Packaging.VisualStudio
 {
diff --git a/src/VisualStudio/NuGet.Packaging.VisualStudio.15/project.json b/src/VisualStudio/NuGet.Packaging.VisualStudio.15/project.json
@@ -1,8 +1,8 @@
 ﻿{
   "dependencies": {
     "Clarius.VisualStudio": "2.0.13",
-    "Clide": "3.0.106-pre",
-    "Clide.Installer": "3.0.106-pre",
+    "Clide": "3.0.107-pre",
+    "Clide.Installer": "3.0.107-pre",
     "GitInfo": "1.1.32",
     "Merq": "1.1.17-rc",
     "Merq.Async": "1.1.17-rc",
diff --git a/src/VisualStudio/NuGet.Packaging.VisualStudio.15/source.extension.vsixmanifest b/src/VisualStudio/NuGet.Packaging.VisualStudio.15/source.extension.vsixmanifest
@@ -15,7 +15,6 @@
 	<Assets>
 		<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="NuGet.Packaging.VisualStudio" Path="|NuGet.Packaging.VisualStudio|"/>
 		<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="NuGet.Packaging.VisualStudio.15" Path="|NuGet.Packaging.VisualStudio.15|"/>
-		<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="NuGet.Client.Fix" Path="|NuGet.Client.Fix|"/>
 		<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="NuGet.Packaging.VisualStudio.15" Path="|NuGet.Packaging.VisualStudio.15;PkgdefProjectOutputGroup|" />
 		<Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" d:ProjectName="NuGet.Packaging.VisualStudio.15" Path="Templates\Projects" d:VsixSubPath="Templates\Projects" />
 		<Asset Type="Microsoft.VisualStudio.Assembly" d:Source="Project" Path="|NuGet.Packaging.VisualStudio|" />
diff --git a/src/VisualStudio/NuGet.Packaging.VisualStudio.sln b/src/VisualStudio/NuGet.Packaging.VisualStudio.sln
@@ -1,7 +1,7 @@
 ﻿
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26410.1
+VisualStudioVersion = 15.0.26403.3
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGet.Packaging.VisualStudio", "NuGet.Packaging.VisualStudio\NuGet.Packaging.VisualStudio.csproj", "{9617EDCD-23BB-41EA-827D-F5729D45B0AF}"
 EndProject
@@ -20,8 +20,6 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "NuGet.Packaging.VisualStudi
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGet.Packaging.VisualStudio.15", "NuGet.Packaging.VisualStudio.15\NuGet.Packaging.VisualStudio.15.csproj", "{CD844274-2306-4273-8D2C-E1B040457D79}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGet.Client.Fix", "NuGet.Client.Fix\NuGet.Client.Fix.csproj", "{7454A1EC-4033-4803-97C8-F0C8C04DBE4D}"
-EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		NuGet.Packaging.VisualStudio.Shared\NuGet.Packaging.VisualStudio.Shared.projitems*{70d9bbbc-b982-4210-9f66-5a02aea268fe}*SharedItemsImports = 13
@@ -44,10 +42,6 @@ Global
 		{CD844274-2306-4273-8D2C-E1B040457D79}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CD844274-2306-4273-8D2C-E1B040457D79}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CD844274-2306-4273-8D2C-E1B040457D79}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7454A1EC-4033-4803-97C8-F0C8C04DBE4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7454A1EC-4033-4803-97C8-F0C8C04DBE4D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7454A1EC-4033-4803-97C8-F0C8C04DBE4D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7454A1EC-4033-4803-97C8-F0C8C04DBE4D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/src/VisualStudio/NuGet.Packaging.VisualStudio/Targets/NuGet.Packaging.Authoring.targets b/src/VisualStudio/NuGet.Packaging.VisualStudio/Targets/NuGet.Packaging.Authoring.targets
@@ -16,7 +16,7 @@ Copyright (c) .NET Foundation. All rights reserved.
   <PropertyGroup>
     <ProjectSystemRulesDir Condition="'$(ProjectSystemRulesDir)' == ''">$(MSBuildThisFileDirectory)..\Rules\</ProjectSystemRulesDir>
     <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
-    <NuGetTargetFramework>dotnet</NuGetTargetFramework>
+    <TargetFrameworkMoniker>NETFramework,Version=v1.0</TargetFrameworkMoniker>
     <PackageTargetFallback>net11;net20;net35;net40;net403;net45;net451;net452;net46;net461;net462;netcore;netcore45;netcore451;netcore50;win8;win81;win10;sl4;sl5;wp;wp7;wp75;wp8;wp81;wpa81;uap;uap10;netstandard1.0;netstandard1.1;netstandard1.2;netstandard1.3;netstandard1.4;netstandard1.5;netstandard1.6;netcoreapp1.0;monoandroid;monotouch;monomac;xamarinios;xamarinmac;xamarinpsthree;xamarinpsfour;xamarinpsvita;xamarinwatchos;xamarintvos;xamarinxboxthreesixty;xamarinxboxone</PackageTargetFallback>
   </PropertyGroup>
 
diff --git a/src/VisualStudio/NuGet.Packaging.VisualStudio/project.json b/src/VisualStudio/NuGet.Packaging.VisualStudio/project.json
@@ -1,6 +1,6 @@
 ﻿{
   "dependencies": {
-    "Clide": "3.0.106-pre",
+    "Clide": "3.0.107-pre",
     "GitInfo": "1.1.32",
     "Merq": "1.1.17-rc",
     "Microsoft.VisualStudio.Shell.14.0": "14.3.25407",

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@`
`10`	`10`	`using VSLangProj140;`
`11`	`11`	`using VSLangProj80;`
`12`	`12`	`using Merq;`
`13`		`-using NuGet.Protocol.Core.Types;`
`14`	`13`
`15`	`14`	`namespace NuGet.Packaging.VisualStudio`
`16`	`15`	`{`