Merge pull request #1 from tngraf/master

Switch to PackageReferences and use appveyor
fossology · May 1, 2020 · 9dfe47d · 9dfe47d
2 parents fadf683 + 0ed51ba
commit 9dfe47d
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 92 deletions.
diff --git a/Fossology.Rest.Dotnet.Model/Fossology.Rest.dotnet.Model.csproj b/Fossology.Rest.Dotnet.Model/Fossology.Rest.dotnet.Model.csproj
@@ -32,18 +32,9 @@
     <DocumentationFile>bin\Release\Fossology.Rest.Dotnet.Model.xml</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>C:\home\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
     <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="SearchResult.cs" />
@@ -57,7 +48,9 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
+    <PackageReference Include="Newtonsoft.Json">
+      <Version>12.0.3</Version>
+    </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/Fossology.Rest.Dotnet.Model/packages.config b/Fossology.Rest.Dotnet.Model/packages.config
diff --git a/Fossology.Rest.Dotnet.Test/Fossology.Rest.Dotnet.Test.csproj b/Fossology.Rest.Dotnet.Test/Fossology.Rest.Dotnet.Test.csproj
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="C:\home\packages\MSTest.TestAdapter.2.1.1\build\net45\MSTest.TestAdapter.props" Condition="Exists('C:\home\packages\MSTest.TestAdapter.2.1.1\build\net45\MSTest.TestAdapter.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -39,28 +38,13 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>C:\home\packages\MSTest.TestFramework.2.1.1\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>C:\home\packages\MSTest.TestFramework.2.1.1\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="Tethys.Logging, Version=1.4.2.0, Culture=neutral, PublicKeyToken=5fae225d9529f881, processorArchitecture=MSIL">
-      <HintPath>C:\home\packages\Tethys.Logging.1.4.2\lib\netstandard2.0\Tethys.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="Tethys.Logging.Console, Version=1.4.2.0, Culture=neutral, PublicKeyToken=5fae225d9529f881, processorArchitecture=MSIL">
-      <HintPath>C:\home\packages\Tethys.Logging.Console.1.4.2\lib\netstandard2.0\Tethys.Logging.Console.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="FossologyClientTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\FOSSology.REST.dotnet\FOSSology.REST.dotnet.csproj">
       <Project>{510a1d9e-c531-4a0e-a516-6aa0125e4f9b}</Project>
@@ -71,14 +55,17 @@
       <Name>Fossology.Rest.Dotnet.Model</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="MSTest.TestAdapter">
+      <Version>2.1.1</Version>
+    </PackageReference>
+    <PackageReference Include="MSTest.TestFramework">
+      <Version>2.1.1</Version>
+    </PackageReference>
+    <PackageReference Include="Tethys.Logging.Console">
+      <Version>1.4.2</Version>
+    </PackageReference>
+  </ItemGroup>
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('C:\home\packages\MSTest.TestAdapter.2.1.1\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', 'C:\home\packages\MSTest.TestAdapter.2.1.1\build\net45\MSTest.TestAdapter.props'))" />
-    <Error Condition="!Exists('C:\home\packages\MSTest.TestAdapter.2.1.1\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', 'C:\home\packages\MSTest.TestAdapter.2.1.1\build\net45\MSTest.TestAdapter.targets'))" />
-  </Target>
-  <Import Project="C:\home\packages\MSTest.TestAdapter.2.1.1\build\net45\MSTest.TestAdapter.targets" Condition="Exists('C:\home\packages\MSTest.TestAdapter.2.1.1\build\net45\MSTest.TestAdapter.targets')" />
 </Project>
diff --git a/Fossology.Rest.Dotnet.Test/packages.config b/Fossology.Rest.Dotnet.Test/packages.config
diff --git a/Fossology.Rest.Dotnet/Fossology.Rest.Dotnet.csproj b/Fossology.Rest.Dotnet/Fossology.Rest.Dotnet.csproj
@@ -32,24 +32,9 @@
     <DocumentationFile>bin\Release\Fossology.Rest.Dotnet.xml</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>C:\home\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="RestSharp, Version=106.0.0.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
-      <HintPath>C:\home\packages\RestSharp.106.10.1\lib\net452\RestSharp.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Web" />
-    <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="Tethys.Logging, Version=1.4.2.0, Culture=neutral, PublicKeyToken=5fae225d9529f881, processorArchitecture=MSIL">
-      <HintPath>C:\home\packages\Tethys.Logging.1.4.2\lib\netstandard2.0\Tethys.Logging.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ErrorCode.cs" />
@@ -58,14 +43,22 @@
     <Compile Include="FossologyClient.cs" />
     <Compile Include="RestApi.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\FOSSology.REST.dotnet.Model\FOSSology.REST.dotnet.Model.csproj">
       <Project>{396e05c3-9ad3-4d1b-8e0b-8c24c6c490eb}</Project>
       <Name>Fossology.Rest.Dotnet.Model</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json">
+      <Version>12.0.3</Version>
+    </PackageReference>
+    <PackageReference Include="RestSharp">
+      <Version>106.10.1</Version>
+    </PackageReference>
+    <PackageReference Include="Tethys.Logging">
+      <Version>1.4.2</Version>
+    </PackageReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/Fossology.Rest.Dotnet/packages.config b/Fossology.Rest.Dotnet/packages.config
diff --git a/FossyApiDemo/FossyApiDemo.csproj b/FossyApiDemo/FossyApiDemo.csproj
@@ -36,21 +36,8 @@
   <ItemGroup>
     <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.Deployment" />
     <Reference Include="System.Drawing" />
-    <Reference Include="System.Net.Http" />
     <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Tethys.Logging, Version=1.4.2.0, Culture=neutral, PublicKeyToken=5fae225d9529f881, processorArchitecture=MSIL">
-      <HintPath>C:\home\packages\Tethys.Logging.1.4.2\lib\netstandard2.0\Tethys.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="Tethys.Logging.Controls, Version=1.4.2.0, Culture=neutral, PublicKeyToken=5fae225d9529f881, processorArchitecture=MSIL">
-      <HintPath>C:\home\packages\Tethys.Logging.Controls.1.4.2\lib\net461\Tethys.Logging.Controls.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="MainForm.cs">
@@ -74,7 +61,6 @@
       <DependentUpon>Resources.resx</DependentUpon>
       <DesignTime>True</DesignTime>
     </Compile>
-    <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -102,6 +88,11 @@
       <Name>Fossology.Rest.Dotnet</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Tethys.Logging.Controls">
+      <Version>1.4.2</Version>
+    </PackageReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\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.

diff --git a/FossyApiDemo/packages.config b/FossyApiDemo/packages.config
diff --git a/appveyor.yml b/appveyor.yml
@@ -2,9 +2,6 @@ version: 1.0.{build}
 image: Visual Studio 2019
 install:
   - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\Tools\VsDevCmd.bat"
-platform:
-  - Win32
-  - x64
 configuration:
   - Debug
   - Release
@@ -14,4 +11,5 @@ before_build:
   - cmd: nuget restore
   - project: Fossology.Rest.Dotnet.sln
 build:
-  verbosity: minimal
+  verbosity: normal
+test: off