Skip to content

Commit 37d5e2e

Browse files
authored
Bump base image and simplify configuration (#1053)
* Bump base image and simplify configuration * Bump netcore2 to netcore3 * Switch from myget to appveyor
1 parent de950cb commit 37d5e2e

File tree

5 files changed

+10
-27
lines changed

5 files changed

+10
-27
lines changed

Source/EasyNetQ.DI.Tests/EasyNetQ.DI.Tests.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.props))\build.props" />
33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
4+
<TargetFrameworks>netcoreapp3.0;net461</TargetFrameworks>
55
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
66
</PropertyGroup>
77
<ItemGroup>
@@ -14,7 +14,7 @@
1414
<ProjectReference Include="..\EasyNetQ.DI.Ninject\EasyNetQ.DI.Ninject.csproj" />
1515
<ProjectReference Include="..\EasyNetQ.Tests.Common\EasyNetQ.Tests.Common.csproj" />
1616
</ItemGroup>
17-
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
17+
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">
1818
<ProjectReference Include="..\EasyNetQ.DI.Microsoft\EasyNetQ.DI.Microsoft.csproj" />
1919
</ItemGroup>
2020
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
@@ -44,4 +44,4 @@
4444
<DefineConstants>$(DefineConstants);NETFX</DefineConstants>
4545
</PropertyGroup>
4646
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.targets))\build.targets" />
47-
</Project>
47+
</Project>

Source/EasyNetQ.Hosepipe.Tests/EasyNetQ.Hosepipe.Tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.props))\build.props" />
33
<PropertyGroup>
44
<Description>EasyNetQ.Hosepipe.Tests</Description>
5-
<TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
5+
<TargetFrameworks>netcoreapp3.0;net461</TargetFrameworks>
66
</PropertyGroup>
77
<ItemGroup>
88
<Reference Include="System" />
@@ -33,7 +33,7 @@
3333
<ItemGroup>
3434
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
3535
</ItemGroup>
36-
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
36+
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">
3737
<DefineConstants>$(DefineConstants);NET_STANDARD</DefineConstants>
3838
</PropertyGroup>
3939
<PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">

Source/EasyNetQ.Tests/EasyNetQ.Tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.props))\build.props" />
33
<PropertyGroup>
44
<Description>EasyNetQ.Tests</Description>
5-
<TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
5+
<TargetFrameworks>netcoreapp3.0;net461</TargetFrameworks>
66
</PropertyGroup>
77
<ItemGroup>
88
<ProjectReference Include="..\EasyNetQ\EasyNetQ.csproj" />
@@ -30,7 +30,7 @@
3030
<Reference Include="System.Net.Http" />
3131
<Reference Include="Microsoft.CSharp" />
3232
</ItemGroup>
33-
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
33+
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">
3434
<DefineConstants>$(DefineConstants);NET_CORE</DefineConstants>
3535
</PropertyGroup>
3636
<PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">

Source/NuGet.Config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
<configuration>
33
<packageSources>
44
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
5-
<add key="EasyNetQ Unstable" value="https://www.myget.org/F/easynetq-unstable/api/v3/index.json" />
5+
<add key="appveyor" value="https://ci.appveyor.com/nuget/easynetq-trqma83u327s" />
66
</packageSources>
7-
</configuration>
7+
</configuration>

appveyor.yml

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
image:
2-
- Visual Studio 2017
2+
- Visual Studio 2019
33

44
pull_requests:
55
do_not_increment_build_number: true
@@ -15,7 +15,6 @@ branches:
1515
only:
1616
- master
1717
- develop
18-
- feature/*
1918

2019
artifacts:
2120
- path: Package\**\*.nupkg
@@ -38,22 +37,6 @@ deploy:
3837
skip_symbols: false
3938
on:
4039
branch: develop
41-
- provider: NuGet
42-
artifact: /.*\.s?nupkg/
43-
server:
44-
api_key:
45-
secure: ejD7WLs3aqlXgHLyWq444QK6pnMT6g/QiRxptqIGaOgKvGM7SJ17r/QH6e1jEJ9M
46-
skip_symbols: false
47-
on:
48-
branch: /release\/.+/
49-
- provider: NuGet
50-
artifact: /.*\.s?nupkg/
51-
server: https://www.myget.org/F/easynetq-unstable/api/v2/package
52-
api_key:
53-
secure: +0aKxcCHqWvvdJxA4dh1ToRqwA6x8yqhfrYDIeOjQu6Skpg/UrwxAPBik8z6be99
54-
skip_symbols: false
55-
on:
56-
branch: /feature\/.+/
5740

5841
skip_commits:
5942
files:

0 commit comments

Comments
 (0)