Skip to content

Commit 44e3cf7

Browse files
author
Dmitry Makarov
committed
Versions updated + minor fixes
1 parent db667ee commit 44e3cf7

File tree

3 files changed

+30
-20
lines changed

3 files changed

+30
-20
lines changed

HornsHoofs.ReverseService.Tests/HornsHoofs.ReverseService.Tests.csproj

+7-4
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.0</TargetFramework>
4+
<TargetFramework>netcoreapp3.1</TargetFramework>
55
<IsPackable>false</IsPackable>
66
<RootNamespace>HornsHoofs</RootNamespace>
77
<Platforms>x64</Platforms>
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
12-
<PackageReference Include="xunit" Version="2.4.0" />
13-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
11+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
12+
<PackageReference Include="xunit" Version="2.4.1" />
13+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
14+
<PrivateAssets>all</PrivateAssets>
15+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
16+
</PackageReference>
1417
<PackageReference Include="ReverseService" Version="0.0.1" />
1518
</ItemGroup>
1619

HornsHoofs.ReverseService/CMakeLists.txt

+6-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,12 @@ add_library(${target_name} SHARED
77
"ReverseService.cpp"
88
"ReverseService.h")
99

10-
set_target_properties(${target_name} PROPERTIES COMMON_LANGUAGE_RUNTIME "")
10+
set_target_properties(${target_name} PROPERTIES
11+
COMMON_LANGUAGE_RUNTIME ""
12+
DOTNET_TARGET_FRAMEWORK_VERSION "v4.5.2"
13+
VS_DOTNET_REFERENCES "mscorlib;System;System.Data"
14+
)
1115

1216
target_link_libraries(${target_name} PRIVATE libreverse)
1317

14-
install(TARGETS ${target_name} DESTINATION "lib/netstandard1.4")
18+
install(TARGETS ${target_name} DESTINATION "lib/net452")

azure-pipelines.yml

+17-14
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,31 @@
11
trigger:
2-
- 'master'
2+
branches:
3+
include:
4+
- master
35

46
pool:
5-
vmImage: 'windows-2019'
7+
vmImage: "windows-2019"
68

79
variables:
8-
buildDir: 'out'
9-
generator: 'Visual Studio 16 2019'
10-
architecture: 'x64'
11-
configuration: 'Release'
12-
testDir: 'HornsHoofs.ReverseService.Tests'
10+
buildDir: "out"
11+
generator: "Visual Studio 16 2019"
12+
architecture: "x64"
13+
configuration: "Release"
14+
testDir: "HornsHoofs.ReverseService.Tests"
1315

1416
steps:
15-
- task: DotNetCoreInstaller@0
16-
displayName: 'Install .NET Core 3.0 SDK'
17+
- task: UseDotNet@2
18+
displayName: ".NET Core 3.1"
1719
inputs:
18-
version: '3.0.100-preview7-012821'
20+
version: "3.1.x"
21+
packageType: sdk
1922
- task: NuGetToolInstaller@0
20-
displayName: 'Install NuGet Tool'
23+
displayName: "Install NuGet Tool"
2124
- script: cmake -B "$(buildDir)" -S . -G "$(generator)" -A "$(architecture)"
22-
displayName: 'Generate Build'
25+
displayName: "Generate Build"
2326
- script: cmake --build "$(buildDir)" --config "$(configuration)" --target package
24-
displayName: 'Build Package'
27+
displayName: "Build Package"
2528
- script: dotnet restore "$(testDir)"
2629
displayName: 'Restore NuGet Packages'
2730
- script: dotnet test "$(testDir)"
28-
displayName: 'Run Tests'
31+
displayName: "Run Tests"

0 commit comments

Comments
 (0)