Merge pull request #163 from conan-io/release/1.2.1

Release 1.2.1
conan-io · Aug 7, 2019 · f38bbc5 · f38bbc5
2 parents 048b215 + 6d94a00
commit f38bbc5
Show file tree

Hide file tree

Showing 40 changed files with 1,347 additions and 248 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,19 @@ download in the
 These are the changes to each version that has been released
 on the official Visual Studio extension gallery.
 
+## 1.2.1
+
+**2019-08-07**
+
+- Fix environment before running Conan ([#162](https://github.com/conan-io/conan-vs-extension/pull/162))
+- Add menu option 'About' to show all information about the extension ([#158](https://github.com/conan-io/conan-vs-extension/pull/158))
+- Show metadata in DLL properties ([#157](https://github.com/conan-io/conan-vs-extension/pull/157))
+- Show Conan version in every log before running the install ([#156](https://github.com/conan-io/conan-vs-extension/pull/156))
+- Support all MSVC v16 version series ([#155](https://github.com/conan-io/conan-vs-extension/pull/155))
+- Add support for Visual Studio 2015 ([#154](https://github.com/conan-io/conan-vs-extension/pull/154))
+- Script to automate RC branch creation ([#97](https://github.com/conan-io/conan-vs-extension/pull/97))
+
+
 ## 1.2.0
 
 **2019-07-22**

diff --git a/Conan.VisualStudio.Core/Conan.VisualStudio.Core.csproj b/Conan.VisualStudio.Core/Conan.VisualStudio.Core.csproj
@@ -61,6 +61,9 @@
     <Compile Include="ConanRunner.cs" />
     <Compile Include="ConanSettings.cs" />
     <Compile Include="IErrorListService.cs" />
+    <Compile Include="VCInterfaces\IVCConfiguration.cs" />
+    <Compile Include="VCInterfaces\IVCProject.cs" />
+    <Compile Include="VCInterfaces\IVCPropertySheet.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>

diff --git a/Conan.VisualStudio.Core/ConanPathHelper.cs b/Conan.VisualStudio.Core/ConanPathHelper.cs
@@ -32,15 +32,8 @@ public static bool ValidateConanExecutable(string exe, out string errorMessage)
                 return true;
             try
             {
-                var startInfo = new ProcessStartInfo
-                {
-                    FileName = exe,
-                    Arguments = "--version",
-                    UseShellExecute = false,
-                    RedirectStandardInput = true,
-                    RedirectStandardOutput = true,
-                    CreateNoWindow = true
-                };
+                var conan = new ConanRunner(exe);
+                var startInfo = conan.Version();
                 var process = Process.Start(startInfo);
 
                 process.WaitForExit();

diff --git a/Conan.VisualStudio.Core/ConanRunner.cs b/Conan.VisualStudio.Core/ConanRunner.cs
@@ -34,6 +34,20 @@ private string BuildOptions(ConanBuildType build, bool update)
             return options;
         }
 
+        public ProcessStartInfo Version()
+        {
+            var startInfo = new ProcessStartInfo
+            {
+                FileName = _executablePath,
+                Arguments = "--version",
+                UseShellExecute = false,
+                RedirectStandardOutput = true,
+                RedirectStandardError = true,
+                CreateNoWindow = true
+            };
+            return startInfo;
+        }
+
         public ProcessStartInfo Install(ConanProject project, ConanConfiguration configuration, ConanGeneratorType generator, ConanBuildType build, bool update, Core.IErrorListService errorListService)
         {
             string ProcessArgument(string name, string value) => $"-s {name}={Escape(value)}";
@@ -87,6 +101,7 @@ public ProcessStartInfo Install(ConanProject project, ConanConfiguration configu
                 RedirectStandardError = true,
                 CreateNoWindow = true
             };
+            startInfo.EnvironmentVariables.Remove("VisualStudioVersion");  // FIXME: Hack for https://github.com/conan-io/conan/issues/5580
             return startInfo;
         }
     }

diff --git a/Conan.VisualStudio.Core/Properties/AssemblyInfo.cs b/Conan.VisualStudio.Core/Properties/AssemblyInfo.cs
@@ -7,11 +7,11 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Conan.VisualStudio.Core")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("Conan extension for Visual Studio")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Conan.VisualStudio.Core")]
-[assembly: AssemblyCopyright("Copyright ©  2019")]
+[assembly: AssemblyCompany("JFrog LTD")]
+[assembly: AssemblyProduct("Conan.VisualStudio")]
+[assembly: AssemblyCopyright("Copyright (c) 2019 JFrog LTD")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

diff --git a/Conan.VisualStudio.Core/VCInterfaces/IVCConfiguration.cs b/Conan.VisualStudio.Core/VCInterfaces/IVCConfiguration.cs
@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Conan.VisualStudio.Core.VCInterfaces
+{
+    public interface IVCConfiguration
+    {
+        string ProjectDirectory { get; }
+
+        string ProjectName { get; }
+
+        string Name { get; }
+
+        string ConfigurationName { get; }
+
+        string PlatformName { get; }
+
+        string RuntimeLibrary { get; }
+
+        string Toolset { get; }
+
+        string Evaluate(string value);
+
+        void AddPropertySheet(string sheet);
+
+        void CollectIntelliSenseInfo();
+
+        List<IVCPropertySheet> PropertySheets { get; }
+
+        string AdditionalDependencies { get; set; }
+    }
+}
diff --git a/Conan.VisualStudio.Core/VCInterfaces/IVCProject.cs b/Conan.VisualStudio.Core/VCInterfaces/IVCProject.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Conan.VisualStudio.Core.VCInterfaces
+{
+    public interface IVCProject
+    {
+        string ProjectDirectory { get; }
+
+        List<IVCConfiguration> Configurations { get; }
+
+        IVCConfiguration ActiveConfiguration { get; }
+    }
+}
diff --git a/Conan.VisualStudio.Core/VCInterfaces/IVCPropertySheet.cs b/Conan.VisualStudio.Core/VCInterfaces/IVCPropertySheet.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Conan.VisualStudio.Core.VCInterfaces
+{
+    public interface IVCPropertySheet
+    {
+        string PropertySheetFile { get; }
+    }
+}
diff --git a/Conan.VisualStudio.Tests/Properties/AssemblyInfo.cs b/Conan.VisualStudio.Tests/Properties/AssemblyInfo.cs
@@ -2,8 +2,13 @@
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Conan.VisualStudio.Tests")]
-[assembly: AssemblyProduct("Conan.VisualStudio.Tests")]
-[assembly: AssemblyCopyright("Copyright © Conan.VisualStudio developers 2017")]
+[assembly: AssemblyDescription("Conan extension for Visual Studio")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("JFrog LTD")]
+[assembly: AssemblyProduct("Conan.VisualStudio")]
+[assembly: AssemblyCopyright("Copyright (c) 2019 JFrog LTD")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
 
 [assembly: ComVisible(false)]
 

diff --git a/Conan.VisualStudio.VCProjectWrapper/Conan.VisualStudio.VCProjectWrapper14.csproj b/Conan.VisualStudio.VCProjectWrapper/Conan.VisualStudio.VCProjectWrapper14.csproj
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{2B9A58F0-6002-4477-9552-1A58386EBA96}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Conan.VisualStudio.VCProjectWrapper</RootNamespace>
+    <AssemblyName>Conan.VisualStudio.VCProjectWrapper14</AssemblyName>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <Deterministic>true</Deterministic>
+  </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>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </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>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.VisualStudio.VCProject, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>..\packages\VSSDK_VCProject.14.0.0\lib\Microsoft.VisualStudio.VCProject.dll</HintPath>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.VCProjectEngine, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>..\packages\VSSDK_VCProjectEngine.14.0.0\lib\Microsoft.VisualStudio.VCProjectEngine.dll</HintPath>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="VCPropertySheetWrapper.cs" />
+    <Compile Include="VCConfigurationWrapper.cs" />
+    <Compile Include="VCProjectWrapper.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Key.snk" />
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Conan.VisualStudio.Core\Conan.VisualStudio.Core.csproj">
+      <Project>{704bddfb-cb01-4f8b-b2a0-60bcfa97f0c2}</Project>
+      <Name>Conan.VisualStudio.Core</Name>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/Conan.VisualStudio.VCProjectWrapper/Conan.VisualStudio.VCProjectWrapper15.csproj b/Conan.VisualStudio.VCProjectWrapper/Conan.VisualStudio.VCProjectWrapper15.csproj
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{896660CA-9830-425E-BC37-2928115D4FAC}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Conan.VisualStudio.VCProjectWrapper</RootNamespace>
+    <AssemblyName>Conan.VisualStudio.VCProjectWrapper15</AssemblyName>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <Deterministic>true</Deterministic>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;VS15</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE;VS15</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.VisualStudio.VCProject, Version=16.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.VCProjectEngine, Version=16.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="VCConfigurationWrapper.cs" />
+    <Compile Include="VCProjectWrapper.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="VCPropertySheetWrapper.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Key.snk" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Conan.VisualStudio.Core\Conan.VisualStudio.Core.csproj">
+      <Project>{704bddfb-cb01-4f8b-b2a0-60bcfa97f0c2}</Project>
+      <Name>Conan.VisualStudio.Core</Name>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/Conan.VisualStudio.VCProjectWrapper/Key.snk b/Conan.VisualStudio.VCProjectWrapper/Key.snk
diff --git a/Conan.VisualStudio.VCProjectWrapper/Properties/AssemblyInfo.cs b/Conan.VisualStudio.VCProjectWrapper/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Conan.VisualStudio.VCProjectWrapper")]
+[assembly: AssemblyDescription("Conan extension for Visual Studio")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("JFrog LTD")]
+[assembly: AssemblyProduct("Conan.VisualStudio")]
+[assembly: AssemblyCopyright("Copyright (c) 2019 JFrog LTD")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("2b9a58f0-6002-4477-9552-1a58386eba96")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]