Skip to content

Commit 9dfe47d

Browse files
tngraftngraf
authored
Merge pull request #1 from tngraf/master
Switch to PackageReferences and use appveyor
2 parents fadf683 + 0ed51ba commit 9dfe47d

File tree

9 files changed

+32
-92
lines changed

9 files changed

+32
-92
lines changed

‎Fossology.Rest.Dotnet.Model/Fossology.Rest.dotnet.Model.csproj

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,9 @@
3232
<DocumentationFile>bin\Release\Fossology.Rest.Dotnet.Model.xml</DocumentationFile>
3333
</PropertyGroup>
3434
<ItemGroup>
35-
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
36-
<HintPath>C:\home\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
37-
</Reference>
3835
<Reference Include="System" />
3936
<Reference Include="System.Core" />
4037
<Reference Include="System.Runtime.Serialization" />
41-
<Reference Include="System.Xml.Linq" />
42-
<Reference Include="System.Data.DataSetExtensions" />
43-
<Reference Include="Microsoft.CSharp" />
44-
<Reference Include="System.Data" />
45-
<Reference Include="System.Net.Http" />
46-
<Reference Include="System.Xml" />
4738
</ItemGroup>
4839
<ItemGroup>
4940
<Compile Include="SearchResult.cs" />
@@ -57,7 +48,9 @@
5748
<Compile Include="Properties\AssemblyInfo.cs" />
5849
</ItemGroup>
5950
<ItemGroup>
60-
<None Include="packages.config" />
51+
<PackageReference Include="Newtonsoft.Json">
52+
<Version>12.0.3</Version>
53+
</PackageReference>
6154
</ItemGroup>
6255
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
6356
</Project>

‎Fossology.Rest.Dotnet.Model/packages.config

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎Fossology.Rest.Dotnet.Test/Fossology.Rest.Dotnet.Test.csproj

Lines changed: 11 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<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')" />
43
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
54
<PropertyGroup>
65
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -39,28 +38,13 @@
3938
<WarningLevel>4</WarningLevel>
4039
</PropertyGroup>
4140
<ItemGroup>
42-
<Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
43-
<HintPath>C:\home\packages\MSTest.TestFramework.2.1.1\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
44-
</Reference>
45-
<Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
46-
<HintPath>C:\home\packages\MSTest.TestFramework.2.1.1\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
47-
</Reference>
4841
<Reference Include="System" />
4942
<Reference Include="System.Core" />
50-
<Reference Include="Tethys.Logging, Version=1.4.2.0, Culture=neutral, PublicKeyToken=5fae225d9529f881, processorArchitecture=MSIL">
51-
<HintPath>C:\home\packages\Tethys.Logging.1.4.2\lib\netstandard2.0\Tethys.Logging.dll</HintPath>
52-
</Reference>
53-
<Reference Include="Tethys.Logging.Console, Version=1.4.2.0, Culture=neutral, PublicKeyToken=5fae225d9529f881, processorArchitecture=MSIL">
54-
<HintPath>C:\home\packages\Tethys.Logging.Console.1.4.2\lib\netstandard2.0\Tethys.Logging.Console.dll</HintPath>
55-
</Reference>
5643
</ItemGroup>
5744
<ItemGroup>
5845
<Compile Include="FossologyClientTest.cs" />
5946
<Compile Include="Properties\AssemblyInfo.cs" />
6047
</ItemGroup>
61-
<ItemGroup>
62-
<None Include="packages.config" />
63-
</ItemGroup>
6448
<ItemGroup>
6549
<ProjectReference Include="..\FOSSology.REST.dotnet\FOSSology.REST.dotnet.csproj">
6650
<Project>{510a1d9e-c531-4a0e-a516-6aa0125e4f9b}</Project>
@@ -71,14 +55,17 @@
7155
<Name>Fossology.Rest.Dotnet.Model</Name>
7256
</ProjectReference>
7357
</ItemGroup>
58+
<ItemGroup>
59+
<PackageReference Include="MSTest.TestAdapter">
60+
<Version>2.1.1</Version>
61+
</PackageReference>
62+
<PackageReference Include="MSTest.TestFramework">
63+
<Version>2.1.1</Version>
64+
</PackageReference>
65+
<PackageReference Include="Tethys.Logging.Console">
66+
<Version>1.4.2</Version>
67+
</PackageReference>
68+
</ItemGroup>
7469
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
7570
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
76-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
77-
<PropertyGroup>
78-
<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>
79-
</PropertyGroup>
80-
<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'))" />
81-
<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'))" />
82-
</Target>
83-
<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')" />
8471
</Project>

‎Fossology.Rest.Dotnet.Test/packages.config

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎Fossology.Rest.Dotnet/Fossology.Rest.Dotnet.csproj

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -32,24 +32,9 @@
3232
<DocumentationFile>bin\Release\Fossology.Rest.Dotnet.xml</DocumentationFile>
3333
</PropertyGroup>
3434
<ItemGroup>
35-
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
36-
<HintPath>C:\home\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
37-
</Reference>
38-
<Reference Include="RestSharp, Version=106.0.0.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
39-
<HintPath>C:\home\packages\RestSharp.106.10.1\lib\net452\RestSharp.dll</HintPath>
40-
</Reference>
4135
<Reference Include="System" />
4236
<Reference Include="System.Core" />
4337
<Reference Include="System.Web" />
44-
<Reference Include="System.Xml.Linq" />
45-
<Reference Include="System.Data.DataSetExtensions" />
46-
<Reference Include="Microsoft.CSharp" />
47-
<Reference Include="System.Data" />
48-
<Reference Include="System.Net.Http" />
49-
<Reference Include="System.Xml" />
50-
<Reference Include="Tethys.Logging, Version=1.4.2.0, Culture=neutral, PublicKeyToken=5fae225d9529f881, processorArchitecture=MSIL">
51-
<HintPath>C:\home\packages\Tethys.Logging.1.4.2\lib\netstandard2.0\Tethys.Logging.dll</HintPath>
52-
</Reference>
5338
</ItemGroup>
5439
<ItemGroup>
5540
<Compile Include="ErrorCode.cs" />
@@ -58,14 +43,22 @@
5843
<Compile Include="FossologyClient.cs" />
5944
<Compile Include="RestApi.cs" />
6045
</ItemGroup>
61-
<ItemGroup>
62-
<None Include="packages.config" />
63-
</ItemGroup>
6446
<ItemGroup>
6547
<ProjectReference Include="..\FOSSology.REST.dotnet.Model\FOSSology.REST.dotnet.Model.csproj">
6648
<Project>{396e05c3-9ad3-4d1b-8e0b-8c24c6c490eb}</Project>
6749
<Name>Fossology.Rest.Dotnet.Model</Name>
6850
</ProjectReference>
6951
</ItemGroup>
52+
<ItemGroup>
53+
<PackageReference Include="Newtonsoft.Json">
54+
<Version>12.0.3</Version>
55+
</PackageReference>
56+
<PackageReference Include="RestSharp">
57+
<Version>106.10.1</Version>
58+
</PackageReference>
59+
<PackageReference Include="Tethys.Logging">
60+
<Version>1.4.2</Version>
61+
</PackageReference>
62+
</ItemGroup>
7063
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
7164
</Project>

‎Fossology.Rest.Dotnet/packages.config

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎FossyApiDemo/FossyApiDemo.csproj

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -36,21 +36,8 @@
3636
<ItemGroup>
3737
<Reference Include="System" />
3838
<Reference Include="System.Core" />
39-
<Reference Include="System.Xml.Linq" />
40-
<Reference Include="System.Data.DataSetExtensions" />
41-
<Reference Include="Microsoft.CSharp" />
42-
<Reference Include="System.Data" />
43-
<Reference Include="System.Deployment" />
4439
<Reference Include="System.Drawing" />
45-
<Reference Include="System.Net.Http" />
4640
<Reference Include="System.Windows.Forms" />
47-
<Reference Include="System.Xml" />
48-
<Reference Include="Tethys.Logging, Version=1.4.2.0, Culture=neutral, PublicKeyToken=5fae225d9529f881, processorArchitecture=MSIL">
49-
<HintPath>C:\home\packages\Tethys.Logging.1.4.2\lib\netstandard2.0\Tethys.Logging.dll</HintPath>
50-
</Reference>
51-
<Reference Include="Tethys.Logging.Controls, Version=1.4.2.0, Culture=neutral, PublicKeyToken=5fae225d9529f881, processorArchitecture=MSIL">
52-
<HintPath>C:\home\packages\Tethys.Logging.Controls.1.4.2\lib\net461\Tethys.Logging.Controls.dll</HintPath>
53-
</Reference>
5441
</ItemGroup>
5542
<ItemGroup>
5643
<Compile Include="MainForm.cs">
@@ -74,7 +61,6 @@
7461
<DependentUpon>Resources.resx</DependentUpon>
7562
<DesignTime>True</DesignTime>
7663
</Compile>
77-
<None Include="packages.config" />
7864
<None Include="Properties\Settings.settings">
7965
<Generator>SettingsSingleFileGenerator</Generator>
8066
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -102,6 +88,11 @@
10288
<Name>Fossology.Rest.Dotnet</Name>
10389
</ProjectReference>
10490
</ItemGroup>
91+
<ItemGroup>
92+
<PackageReference Include="Tethys.Logging.Controls">
93+
<Version>1.4.2</Version>
94+
</PackageReference>
95+
</ItemGroup>
10596
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
10697
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
10798
Other similar extension points exist, see Microsoft.Common.targets.

‎FossyApiDemo/packages.config

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎appveyor.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@ version: 1.0.{build}
22
image: Visual Studio 2019
33
install:
44
- call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\Tools\VsDevCmd.bat"
5-
platform:
6-
- Win32
7-
- x64
85
configuration:
96
- Debug
107
- Release
@@ -14,4 +11,5 @@ before_build:
1411
- cmd: nuget restore
1512
- project: Fossology.Rest.Dotnet.sln
1613
build:
17-
verbosity: minimal
14+
verbosity: normal
15+
test: off

0 commit comments

Comments
 (0)