Update CI

Abc-Arbitrage · Oct 29, 2020 · ddb888e · ddb888e
1 parent 6199630
commit ddb888e
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -5,7 +5,7 @@ variables:
 jobs:
   - job: Windows
     pool:
-      vmImage: windows-2019
+      vmImage: windows-latest
     steps:
       - task: DotNetCoreCLI@2
         displayName: Build
@@ -38,14 +38,14 @@ jobs:
 
   - job: Linux
     pool:
-      vmImage: ubuntu-16.04
+      vmImage: ubuntu-latest
     steps:
       - task: DotNetCoreCLI@2
         displayName: Build tests
         inputs:
           command: build
           projects: src/Abc.Zebus.MessageDsl.Tests/Abc.Zebus.MessageDsl.Tests.csproj
-          arguments: --configuration $(BuildConfiguration) --framework netcoreapp2.1
+          arguments: --configuration $(BuildConfiguration) --framework netcoreapp3.1
 
       - task: DotNetCoreCLI@2
         displayName: Build Integration
@@ -59,4 +59,4 @@ jobs:
         inputs:
           command: test
           projects: src/Abc.Zebus.MessageDsl.Tests/Abc.Zebus.MessageDsl.Tests.csproj
-          arguments: --configuration $(BuildConfiguration) --framework netcoreapp2.1
+          arguments: --configuration $(BuildConfiguration) --framework netcoreapp3.1
diff --git a/src/Abc.Zebus.MessageDsl.Build.Integration/Abc.Zebus.MessageDsl.Build.Integration.csproj b/src/Abc.Zebus.MessageDsl.Build.Integration/Abc.Zebus.MessageDsl.Build.Integration.csproj
@@ -24,7 +24,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="protobuf-net" Version="2.4.4" />
+    <PackageReference Include="protobuf-net" Version="3.0.52" />
     <PackageReference Include="Zebus.Contracts" Version="3.0.0" />
   </ItemGroup>
 

diff --git a/src/Abc.Zebus.MessageDsl.Tests/Abc.Zebus.MessageDsl.Tests.csproj b/src/Abc.Zebus.MessageDsl.Tests/Abc.Zebus.MessageDsl.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net471;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>net48;netcoreapp3.1</TargetFrameworks>
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>..\Abc.Zebus.MessageDsl\Abc.Zebus.MessageDsl.snk</AssemblyOriginatorKeyFile>
     <Nullable>disable</Nullable>
@@ -11,9 +11,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Abc.Zebus.MessageDsl.sln b/src/Abc.Zebus.MessageDsl.sln
@@ -12,6 +12,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{A0123301
 		Directory.Build.props = Directory.Build.props
 		Directory.Build.targets = Directory.Build.targets
 		..\README.md = ..\README.md
+		..\azure-pipelines.yml = ..\azure-pipelines.yml
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Abc.Zebus.MessageDsl.Build", "Abc.Zebus.MessageDsl.Build\Abc.Zebus.MessageDsl.Build.csproj", "{D7C3B2A7-F5EA-4BD1-95FF-0736EF745160}"

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -10,6 +10,7 @@
     <DebugType>embedded</DebugType>
     <IsPackable>false</IsPackable>
     <Deterministic>true</Deterministic>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -37,7 +38,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="2019.1.3" PrivateAssets="all" />
+    <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" PrivateAssets="all" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="all" />
   </ItemGroup>