Merge branch 'feature/asyncpackage' of https://github.com/stefankert/…

…buildvision into feature/asyncpackage
StefanKert · Mar 22, 2019 · e99bd6e · e99bd6e
2 parents fd16d33 + 12c8e7c
commit e99bd6e
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 324 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -65,6 +65,10 @@ steps:
     platform: '$(BuildPlatform)'
     configuration: '$(BuildConfiguration)'
 
+- powershell: |
+    & "$env:userprofile/.nuget/packages/xunit.runner.console/2.4.1/tools/net472/xunit.console.x86.exe"  (Get-Childitem -Filter "BuildVision.IntegrationTests.dll" -Recurse | Where-Object {$_.FullName -like "*\bin\$(BuildConfiguration)\*" }).FullName
+  displayName: Execute Integration Tests
+
 - task: PublishBuildArtifacts@1
   inputs:
     PathtoPublish: $(Build.ArtifactStagingDirectory)/artifacts

diff --git a/src/BuildVision.Common/BuildVision.Common.csproj b/src/BuildVision.Common/BuildVision.Common.csproj
@@ -1,79 +1,24 @@
-<?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')" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{848412D1-95BF-4E56-A9EF-2926AF5C6D67}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>BuildVision.Common</RootNamespace>
-    <AssemblyName>BuildVision.Common</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-  </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>
-  </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>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
+    <TargetFramework>net472</TargetFramework>
   </PropertyGroup>
+
   <PropertyGroup>
     <AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
+    <SignAssembly>true</SignAssembly>
   </PropertyGroup>
+
   <ItemGroup>
-    <Reference Include="PresentationCore" />
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Runtime.Serialization" />
-    <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" />
-    <Reference Include="WindowsBase" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AppVersionInfo.cs" />
-    <Compile Include="CustomStringFormatProvider.cs" />
-    <Compile Include="Extensions\DateTimeExtensions.cs" />
-    <Compile Include="FilePathHelper.cs" />
-    <Compile Include="GenericXmlSerializer.cs" />
-    <Compile Include="GithubHelper.cs" />
-    <Compile Include="SettingsBase.cs" />
-    <Compile Include="LegacyConfigurationSerializer.cs" />
-    <Compile Include="ObservableCollectionExtensions.cs" />
-    <Compile Include="ObservableRangeCollection.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="PropertyColumnSorter.cs" />
-    <Compile Include="RelayCommand.cs" />
-    <Compile Include="BindableBase.cs" />
-    <Compile Include="VSVersion.cs" />
+    <None Include="Key.snk" />
   </ItemGroup>
+
   <ItemGroup>
-    <None Include="Key.snk" />
+    <Reference Include="PresentationCore" />
+    <Reference Include="WindowsBase" />
   </ItemGroup>
+
   <ItemGroup>
-    <ProjectReference Include="..\BuildVision.Contracts\BuildVision.Contracts.csproj">
-      <Project>{13D64A57-5DB3-4CC7-AC2B-9034E767D754}</Project>
-      <Name>BuildVision.Contracts</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\BuildVision.Contracts\BuildVision.Contracts.csproj" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+
 </Project>
diff --git a/src/BuildVision.Common/Properties/AssemblyInfo.cs b/src/BuildVision.Common/Properties/AssemblyInfo.cs
diff --git a/src/BuildVision.Contracts/BuildVision.Contracts.csproj b/src/BuildVision.Contracts/BuildVision.Contracts.csproj
@@ -1,80 +1,20 @@
-<?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')" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{13D64A57-5DB3-4CC7-AC2B-9034E767D754}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>BuildVision.Contracts</RootNamespace>
-    <AssemblyName>BuildVision.Contracts</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-  </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>
-  </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>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
+    <TargetFramework>net472</TargetFramework>
   </PropertyGroup>
+
   <PropertyGroup>
     <AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
+    <SignAssembly>true</SignAssembly>
   </PropertyGroup>
+
   <ItemGroup>
-    <Reference Include="Microsoft.Build.Framework" />
-    <Reference Include="PresentationFramework" />
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Runtime.Serialization" />
-    <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="Models\BuildProjectContextEntry.cs" />
-    <Compile Include="Enums\BuildResultState.cs" />
-    <Compile Include="Enums\BuildActions.cs" />
-    <Compile Include="Models\BuildedProject.cs" />
-    <Compile Include="BuildErrorRaisedEventArgs.cs" />
-    <Compile Include="BuildOutputFileTypes.cs" />
-    <Compile Include="Enums\BuildScopes.cs" />
-    <Compile Include="Enums\BuildState.cs" />
-    <Compile Include="Enums\ColumnsOrder.cs" />
-    <Compile Include="Models\ErrorItem.cs" />
-    <Compile Include="Enums\ErrorLevel.cs" />
-    <Compile Include="Models\ErrorsBox.cs" />
-    <Compile Include="Enums\ProjectState.cs" />
-    <Compile Include="Models\IBuildInformationModel.cs" />
-    <Compile Include="Models\IBuildProgressViewModel.cs" />
-    <Compile Include="Models\IProjectItem.cs" />
-    <Compile Include="Models\ISolutionModel.cs" />
-    <Compile Include="ProjectNotFoundException.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="PropertyNotFoundException.cs" />
-    <Compile Include="Enums\RegisterLoggerResult.cs" />
-    <Compile Include="VisualStudioProject.cs" />
+    <None Include="Key.snk" />
   </ItemGroup>
+
   <ItemGroup>
-    <None Include="Key.snk" />
+    <Reference Include="Microsoft.Build.Framework" />
+    <Reference Include="PresentationFramework" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+
 </Project>
diff --git a/src/BuildVision.Contracts/Models/ErrorItem.cs b/src/BuildVision.Contracts/Models/ErrorItem.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using Microsoft.Build.Framework;

diff --git a/src/BuildVision.Contracts/Properties/AssemblyInfo.cs b/src/BuildVision.Contracts/Properties/AssemblyInfo.cs
diff --git a/test/BuildVision.IntegrationTests/BuildVision.IntegrationTests.csproj b/test/BuildVision.IntegrationTests/BuildVision.IntegrationTests.csproj
@@ -9,9 +9,7 @@
     <PackageReference Include="EnvDTE80" Version="8.0.3" />
     <PackageReference Include="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="15.0.27" />
     <PackageReference Include="Microsoft.VSSDK.UnitTestLibrary" Version="14.3.25407" />
-    <PackageReference Include="MSTest.TestAdapter" Version="1.4.0" />
     <PackageReference Include="stdole" Version="7.0.3303" />
-    <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.console" Version="2.4.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -32,9 +30,6 @@
      <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework">
        <HintPath>..\..\libs\2017\Microsoft.VisualStudio.QualityTools.UnitTestFramework.dll</HintPath>
      </Reference>
-     <Reference Include="Microsoft.VisualStudioTools.VSTestHost.15.0">
-       <HintPath>..\..\libs\2017\Microsoft.VisualStudioTools.VSTestHost.15.0.dll</HintPath>
-     </Reference>
      <Reference Include="Microsoft.VSSDK.TestHostFramework">
        <HintPath>..\..\libs\2017\Microsoft.VSSDK.TestHostFramework.dll</HintPath>
      </Reference>

diff --git a/test/BuildVision.IntegrationTests/PackageTests.cs b/test/BuildVision.IntegrationTests/PackageTests.cs
@@ -18,7 +18,7 @@ public class PackageTests
         private static IVsUIShell UiShellService => GlobalServices.GetService<SVsUIShell>() as IVsUIShell;
         private static DTE DTE => GlobalServices.GetService<DTE>() as DTE;
 
-        [VsixFact("15.0", DisplayName = "PackageLoad_Should_Succeed")]
+        [VsixFact(VisualStudioVersion.Current, RootSuffix = "Exp", RunOnUIThread = true)]
         public void PackageLoad_Should_Succeed()
         {
             IVsPackage package;
@@ -29,9 +29,10 @@ public void PackageLoad_Should_Succeed()
             Assert.NotNull(package);
         }
 
-        [VsixFact("15.0", DisplayName = "ClickOnBuildVisionMenuItem_Should_ShowBuildVision")]
+        [VsixFact(VisualStudioVersion.Current, RootSuffix = "Exp", RunOnUIThread = true)]
         public void ClickOnBuildVisionMenuItem_Should_ShowBuildVision()
         {
+            Assert.True(false);
             var toolwndCommandId = new CommandID(PackageGuids.GuidBuildVisionCmdSet, (int) PackageIds.CmdIdBuildVisionToolWindow);
             ExecuteCommand(toolwndCommandId);
             Assert.True(CanFindToolwindow(PackageGuids.GuidBuildVisionToolWindow));

diff --git a/test/BuildVision.IntegrationTests/vstesthost.exp.testsettings b/test/BuildVision.IntegrationTests/vstesthost.exp.testsettings