Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
(build) add net core 3.0
  • Loading branch information
arturcic committed Oct 9, 2019
commit 9181ea0c7bc57d67578518692ffa1aa07b6cfae5
2 changes: 1 addition & 1 deletion build.config
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/usr/bin/env bash
CAKE_VERSION=0.35
DOTNET_VERSION=2.2.401
DOTNET_VERSION=2.1.802,3.0.100
10 changes: 7 additions & 3 deletions build/stages/common-steps.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
steps:
- task: UseDotNet@2
displayName: 'Use .NET Core sdk'
displayName: 'Use .NET Core sdk 2.1'
inputs:
packageType: sdk
version: 2.2.401
installationPath: $(Agent.ToolsDirectory)/dotnet
version: 2.1.802
- task: UseDotNet@2
displayName: 'Use .NET Core sdk 3.0'
inputs:
packageType: sdk
version: 3.0.100
- task: Bash@3
displayName: 'Env Vars'
inputs:
Expand Down
8 changes: 4 additions & 4 deletions src/Docker/docker.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
"2.1": [
"centos-7",
"debian-9",
"fedora-28",
"fedora-30",
"ubuntu-16.04",
"ubuntu-18.04"
],
"2.2": [
"3.0": [
"centos-7",
"debian-9",
"fedora-28",
"fedora-30",
"ubuntu-16.04",
"ubuntu-18.04"
]
Expand All @@ -19,7 +19,7 @@
"2.1": [
"nanoserver-1809"
],
"2.2": [
"3.0": [
"nanoserver-1809"
]
}
Expand Down
2 changes: 1 addition & 1 deletion src/GitVersionCore.Tests/GitVersionCore.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net472;netcoreapp2.1</TargetFrameworks>
<TargetFrameworks>net472;netcoreapp2.1;netcoreapp3.0</TargetFrameworks>

<DebugType>full</DebugType>
<Optimize>false</Optimize>
Expand Down
2 changes: 1 addition & 1 deletion src/GitVersionExe.Tests/GitVersionExe.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472;netcoreapp2.1</TargetFrameworks>
<TargetFrameworks>net472;netcoreapp2.1;netcoreapp3.0</TargetFrameworks>
</PropertyGroup>

<Import Project="..\test.msbuild" />
Expand Down
2 changes: 1 addition & 1 deletion src/GitVersionExe/GitVersionExe.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<OutputType>Exe</OutputType>
<RootNamespace>GitVersion</RootNamespace>
<AssemblyName>GitVersion</AssemblyName>
<TargetFrameworks>netcoreapp2.1</TargetFrameworks>
<TargetFrameworks>netcoreapp2.1;netcoreapp3.0</TargetFrameworks>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<PlatformTarget>AnyCPU</PlatformTarget>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
Expand Down
2 changes: 1 addition & 1 deletion src/GitVersionTask.MsBuild/GitVersionTask.MsBuild.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net472;netcoreapp2.1</TargetFrameworks>
<TargetFrameworks>net472;netcoreapp2.1;netcoreapp3.0</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/GitVersionTask.Tests/GitVersionTask.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472;netcoreapp2.1</TargetFrameworks>
<TargetFrameworks>net472;netcoreapp2.1;netcoreapp3.0</TargetFrameworks>
</PropertyGroup>

<Import Project="..\test.msbuild" />
Expand Down
2 changes: 1 addition & 1 deletion src/GitVersionTask/GitVersionTask.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net472;netcoreapp2.1</TargetFrameworks>
<TargetFrameworks>net472;netcoreapp2.1;netcoreapp3.0</TargetFrameworks>

<IsPackable>true</IsPackable>

Expand Down