Skip to content

Commit 2118630

Browse files
author
Gábor Zavarkó
committed
targetframework and version upgrade
1 parent eedc52b commit 2118630

13 files changed

Lines changed: 217 additions & 152 deletions

‎Shuttle.Core.Threading.Tests/Shuttle.Core.Threading.Tests.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp2.1;net461</TargetFrameworks>
4+
<TargetFrameworks>net461;netcoreapp3.1</TargetFrameworks>
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
9-
<PackageReference Include="Moq" Version="4.8.3" />
10-
<PackageReference Include="NUnit" Version="3.10.1" />
11-
<PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
8+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
9+
<PackageReference Include="Moq" Version="4.15.2" />
10+
<PackageReference Include="NUnit" Version="3.12.0" />
11+
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

‎Shuttle.Core.Threading/.build/Shuttle.MSBuild.dll‎

-14 KB
Binary file not shown.

‎Shuttle.Core.Threading/.build/Shuttle.MSBuild.targets‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎Shuttle.Core.Threading/.build/package.msbuild‎

Lines changed: 0 additions & 68 deletions
This file was deleted.

‎Shuttle.Core.Threading/.build/package.nuspec‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎Shuttle.Core.Threading/.package/AssemblyInfo.cs.template‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
using System.Reflection;
2+
using System.Runtime.InteropServices;
3+
4+
#if NETFRAMEWORK
5+
[assembly: AssemblyTitle(".NET Framework")]
6+
#endif
7+
8+
#if NETCOREAPP
9+
[assembly: AssemblyTitle(".NET Core")]
10+
#endif
11+
12+
#if NETSTANDARD
13+
[assembly: AssemblyTitle(".NET Standard")]
14+
#endif
15+
16+
[assembly: AssemblyVersion("#{SemanticVersionCore}#.0")]
17+
[assembly: AssemblyCopyright("Copyright (c) #{Year}#, Eben Roux")]
18+
[assembly: AssemblyProduct("Shuttle.Core.Threading")]
19+
[assembly: AssemblyCompany("Eben Roux")]
20+
[assembly: AssemblyConfiguration("Release")]
21+
[assembly: AssemblyInformationalVersion("#{SemanticVersion}#")]
22+
[assembly: ComVisible(false)]

‎Shuttle.Core.Threading/.package/Shuttle.NuGetPackager.MSBuild.dll‎

18 KB
Binary file not shown.

‎Shuttle.Core.Threading/.package/Shuttle.NuGetPackager.targets‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<PackageTasksPath Condition="'$(PackageTasksPath)' == ''">Shuttle.NuGetPackager.MSBuild.dll</PackageTasksPath>
5+
</PropertyGroup>
6+
7+
<UsingTask AssemblyFile="$(PackageTasksPath)" TaskName="Shuttle.NuGetPackager.MSBuild.Prompt" />
8+
<UsingTask AssemblyFile="$(PackageTasksPath)" TaskName="Shuttle.NuGetPackager.MSBuild.RegexFindAndReplace" />
9+
<UsingTask AssemblyFile="$(PackageTasksPath)" TaskName="Shuttle.NuGetPackager.MSBuild.NuGet.SetNuGetPackageVersions" />
10+
<UsingTask AssemblyFile="$(PackageTasksPath)" TaskName="Shuttle.NuGetPackager.MSBuild.Zip" />
11+
<UsingTask AssemblyFile="$(PackageTasksPath)" TaskName="Shuttle.NuGetPackager.MSBuild.NuGet.SemanticVersion" />
12+
</Project>

‎Shuttle.Core.Threading/.package/package.msbuild‎

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Version" ToolsVersion="15">
2+
<PropertyGroup>
3+
<PackageName>Shuttle.Core.Threading</PackageName>
4+
<PackageSource Condition="$(PackageSource) == ''">https://www.nuget.org</PackageSource>
5+
<Configuration Condition="$(Configuration) == ''">Release</Configuration>
6+
</PropertyGroup>
7+
8+
<Import Project="Shuttle.NuGetPackager.targets" />
9+
10+
<ItemGroup>
11+
<ProjectReference Include="..\$(PackageName).csproj" />
12+
</ItemGroup>
13+
14+
<Target Name="Build">
15+
<MSBuild Projects="@(ProjectReference)" Targets="Rebuild" Properties="Configuration=Debug;Platform=AnyCPU" />
16+
<MSBuild Projects="@(ProjectReference)" Targets="Rebuild" Properties="Configuration=Release;Platform=AnyCPU" />
17+
</Target>
18+
19+
<Target Name="Version">
20+
<Prompt Text="Enter semantic version:" Condition="$(SemanticVersion) == ''">
21+
<Output TaskParameter="UserInput" PropertyName="SemanticVersion" />
22+
</Prompt>
23+
24+
<Error Text="Please enter a version number." Condition="$(SemanticVersion) == ''" />
25+
26+
<SemanticVersion Value="$(SemanticVersion)">
27+
<Output TaskParameter="VersionCore" PropertyName="SemanticVersionCore" />
28+
<Output TaskParameter="Prerelease" PropertyName="SemanticVersionPrerelease" />
29+
<Output TaskParameter="BuildMetadata" PropertyName="SemanticVersionBuildMetadata" />
30+
</SemanticVersion>
31+
32+
<Copy SourceFiles="AssemblyInfo.cs.template" DestinationFiles="..\Properties\AssemblyInfo.cs" SkipUnchangedFiles="false" />
33+
34+
<RegexFindAndReplace Files="..\Properties\AssemblyInfo.cs" FindExpression="#\{SemanticVersionCore\}#"
35+
ReplacementText="$(SemanticVersionCore)" />
36+
<RegexFindAndReplace Files="..\Properties\AssemblyInfo.cs" FindExpression="#\{SemanticVersion\}#"
37+
ReplacementText="$(SemanticVersion)" />
38+
<RegexFindAndReplace Files="..\Properties\AssemblyInfo.cs" FindExpression="#\{Year\}#"
39+
ReplacementText="$([System.DateTime]::Now.ToString(`yyyy`))" />
40+
41+
<Copy SourceFiles="package.nuspec.template" DestinationFiles="package.nuspec" SkipUnchangedFiles="false" />
42+
43+
<RegexFindAndReplace Files="package.nuspec" FindExpression="#\{SemanticVersion\}#"
44+
ReplacementText="$(SemanticVersion)" />
45+
<RegexFindAndReplace Files="package.nuspec" FindExpression="#\{Year\}#"
46+
ReplacementText="$([System.DateTime]::Now.ToString(`yyyy`))" />
47+
48+
<SetNuGetPackageVersions Files="package.nuspec" ProjectFile="..\$(PackageName).csproj" />
49+
</Target>
50+
51+
<Target Name="Pack" DependsOnTargets="Build">
52+
<Error
53+
Text="Before executing the 'Package' target first execute the 'Version' target to set the relevant semantic version in all applicable files."
54+
Condition="!Exists('package.nuspec')" />
55+
56+
<ItemGroup>
57+
<NuGetBinaries Include="..\bin\$(Configuration)\**\$(PackageName).dll" />
58+
</ItemGroup>
59+
60+
<RemoveDir Directories="release" />
61+
62+
<Copy SourceFiles="package.nuspec" DestinationFolder="release\" SkipUnchangedFiles="false" />
63+
<Copy SourceFiles="@(NuGetBinaries)" DestinationFolder="release\lib\%(RecursiveDir)" SkipUnchangedFiles="false" />
64+
65+
<Exec Command="nuget pack release\package.nuspec -OutputDirectory release -NoPackageAnalysis" />
66+
</Target>
67+
68+
<Target Name="Push" DependsOnTargets="Version">
69+
<MSBuild
70+
Projects="$(MSBuildProjectFile)"
71+
Targets="Pack"
72+
Properties="SemanticVersion=$(SemanticVersion)" />
73+
74+
<Exec
75+
Command="nuget push release\$(PackageName).$(SemanticVersion).nupkg -source $(PackageSource)" />
76+
</Target>
77+
78+
<Target Name="Bump" DependsOnTargets="Version">
79+
<MSBuild
80+
Projects="$(MSBuildProjectFile)"
81+
Targets="Pack"
82+
Properties="SemanticVersion=$(SemanticVersion)" />
83+
84+
<ItemGroup>
85+
<PackageFile Include="release\$(PackageName).*.nupkg" />
86+
</ItemGroup>
87+
88+
<MakeDir Directories="$(NuGetPackageSourceFolder)" Condition="$(NuGetPackageSourceFolder) != ''" />
89+
90+
<Copy
91+
SourceFiles="@(PackageFile)"
92+
DestinationFolder="$(NuGetPackageSourceFolder)"
93+
SkipUnchangedFiles="false"
94+
Condition="$(NuGetPackageSourceFolder) != ''" />
95+
</Target>
96+
97+
<Target Name="Flush">
98+
<ItemGroup>
99+
<PackageFolder Include="$(UserProfile)\.nuget\packages\$(PackageName)" />
100+
</ItemGroup>
101+
102+
<RemoveDir Directories="@(PackageFolder)" />
103+
</Target>
104+
</Project>

‎Shuttle.Core.Threading/.package/package.nuspec‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<?xml version="1.0"?>
2+
3+
<package>
4+
<metadata>
5+
<id>Shuttle.Core.Threading</id>
6+
<version>11.0.1</version>
7+
<authors>Eben Roux</authors>
8+
<owners>Eben Roux</owners>
9+
<license type="expression">BSD-3-Clause</license>
10+
<requireLicenseAcceptance>false</requireLicenseAcceptance>
11+
<icon>images\logo.png</icon>
12+
<repository type="git" url="https://github.com/shuttle/Shuttle.Core.Threading.git" />
13+
<projectUrl>https://github.com/shuttle/Shuttle.Core.Threading</projectUrl>
14+
<description>Thread-based processing.</description>
15+
<copyright>Copyright (c) 2020, Eben Roux</copyright>
16+
<tags>shuttle threading processor</tags>
17+
<dependencies>
18+
<dependency id="Shuttle.Core.Configuration" version="10.0.4" />
19+
<dependency id="Shuttle.Core.Contract" version="10.0.3" />
20+
<dependency id="Shuttle.Core.Logging" version="10.0.4" />
21+
<dependency id="Shuttle.Core.Reflection" version="10.0.11" />
22+
</dependencies>
23+
</metadata>
24+
<files>
25+
<file src="..\..\..\.media\logo.png" target="images" />
26+
<file src="lib\**\*.*" target="lib" />
27+
</files>
28+
</package>

0 commit comments

Comments
 (0)