Skip to content

Commit 2a7314e

Browse files
tngraftngraf
committed
Merge remote-tracking branch 'upstream/master'
2 parents 62abdd2 + fadf683 commit 2a7314e

File tree

5 files changed

+28
-11
lines changed

5 files changed

+28
-11
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
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.0.0\build\net45\MSTest.TestAdapter.props" Condition="Exists('C:\home\packages\MSTest.TestAdapter.2.0.0\build\net45\MSTest.TestAdapter.props')" />
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')" />
44
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
55
<PropertyGroup>
66
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -40,10 +40,10 @@
4040
</PropertyGroup>
4141
<ItemGroup>
4242
<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.0.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
43+
<HintPath>C:\home\packages\MSTest.TestFramework.2.1.1\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
4444
</Reference>
4545
<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.0.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
46+
<HintPath>C:\home\packages\MSTest.TestFramework.2.1.1\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
4747
</Reference>
4848
<Reference Include="System" />
4949
<Reference Include="System.Core" />
@@ -77,8 +77,8 @@
7777
<PropertyGroup>
7878
<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>
7979
</PropertyGroup>
80-
<Error Condition="!Exists('C:\home\packages\MSTest.TestAdapter.2.0.0\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', 'C:\home\packages\MSTest.TestAdapter.2.0.0\build\net45\MSTest.TestAdapter.props'))" />
81-
<Error Condition="!Exists('C:\home\packages\MSTest.TestAdapter.2.0.0\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', 'C:\home\packages\MSTest.TestAdapter.2.0.0\build\net45\MSTest.TestAdapter.targets'))" />
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'))" />
8282
</Target>
83-
<Import Project="C:\home\packages\MSTest.TestAdapter.2.0.0\build\net45\MSTest.TestAdapter.targets" Condition="Exists('C:\home\packages\MSTest.TestAdapter.2.0.0\build\net45\MSTest.TestAdapter.targets')" />
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')" />
8484
</Project>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="MSTest.TestAdapter" version="2.0.0" targetFramework="net472" />
4-
<package id="MSTest.TestFramework" version="2.0.0" targetFramework="net472" />
3+
<package id="MSTest.TestAdapter" version="2.1.1" targetFramework="net472" />
4+
<package id="MSTest.TestFramework" version="2.1.1" targetFramework="net472" />
55
<package id="Tethys.Logging" version="1.4.2" targetFramework="net472" />
66
<package id="Tethys.Logging.Console" version="1.4.2" targetFramework="net472" />
77
</packages>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
<Reference Include="Newtonsoft.Json, Version=12.0.3.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
3636
<HintPath>C:\home\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
3737
</Reference>
38-
<Reference Include="RestSharp, Version=106.6.10.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
39-
<HintPath>C:\home\packages\RestSharp.106.6.10\lib\net452\RestSharp.dll</HintPath>
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>
4040
</Reference>
4141
<Reference Include="System" />
4242
<Reference Include="System.Core" />

‎Fossology.Rest.Dotnet/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net472" />
4-
<package id="RestSharp" version="106.6.10" targetFramework="net472" />
4+
<package id="RestSharp" version="106.10.1" targetFramework="net472" />
55
<package id="Tethys.Logging" version="1.4.2" targetFramework="net472" />
66
</packages>

‎appveyor.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
version: 1.0.{build}
2+
image: Visual Studio 2019
3+
install:
4+
- call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\Tools\VsDevCmd.bat"
5+
platform:
6+
- Win32
7+
- x64
8+
configuration:
9+
- Debug
10+
- Release
11+
cache:
12+
- packages -> **\packages.config
13+
before_build:
14+
- cmd: nuget restore
15+
- project: Fossology.Rest.Dotnet.sln
16+
build:
17+
verbosity: minimal

0 commit comments

Comments
 (0)