Skip to content

Commit 8236305

Browse files
sibartlettsibartlett
committed
Update runtime and packages
1 parent a9f23ad commit 8236305

File tree

10 files changed

+428
-267
lines changed

10 files changed

+428
-267
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,18 @@
33
"isRoot": true,
44
"tools": {
55
"husky": {
6-
"version": "0.7.1",
6+
"version": "0.7.2",
77
"commands": [
88
"husky"
9-
]
9+
],
10+
"rollForward": false
1011
},
1112
"csharpier": {
12-
"version": "0.29.2",
13+
"version": "1.0.2",
1314
"commands": [
14-
"dotnet-csharpier"
15-
]
15+
"csharpier"
16+
],
17+
"rollForward": false
1618
}
1719
}
1820
}

‎.husky/task-runner.json‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,14 @@
33
{
44
"name": "Run csharpier on staged files",
55
"group": "pre-commit",
6-
"command": "dotnet",
7-
"args": ["csharpier", "${staged}"],
8-
"include": ["**/*.cs"]
6+
"command": "csharpier",
7+
"args": ["format", "${staged}"]
98
},
109
{
1110
"name": "Check csharpier on entire repository",
1211
"group": "verify",
13-
"command": "dotnet",
14-
"args": ["csharpier", "."],
15-
"include": ["**/*.cs"]
12+
"command": "csharpier",
13+
"args": ["check", "."]
1614
}
1715
]
1816
}

‎.nuke/build.schema.json‎

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,5 @@
11
{
22
"$schema": "http://json-schema.org/draft-04/schema#",
3-
"properties": {
4-
"Configuration": {
5-
"type": "string",
6-
"description": "Configuration to build - Default is 'Debug' (local) or 'Release' (server)",
7-
"enum": [
8-
"Debug",
9-
"Release"
10-
]
11-
},
12-
"Solution": {
13-
"type": "string",
14-
"description": "Path to a solution file that is automatically loaded"
15-
}
16-
},
173
"definitions": {
184
"Host": {
195
"type": "string",
@@ -114,5 +100,25 @@
114100
}
115101
}
116102
},
117-
"$ref": "#/definitions/NukeBuild"
103+
"allOf": [
104+
{
105+
"properties": {
106+
"Configuration": {
107+
"type": "string",
108+
"description": "Configuration to build - Default is 'Debug' (local) or 'Release' (server)",
109+
"enum": [
110+
"Debug",
111+
"Release"
112+
]
113+
},
114+
"Solution": {
115+
"type": "string",
116+
"description": "Path to a solution file that is automatically loaded"
117+
}
118+
}
119+
},
120+
{
121+
"$ref": "#/definitions/NukeBuild"
122+
}
123+
]
118124
}

‎Geo.Tests/Geo.Tests.csproj‎

Lines changed: 20 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,22 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
3-
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
5-
<IsPackable>false</IsPackable>
6-
<LangVersion>default</LangVersion>
7-
</PropertyGroup>
8-
9-
<ItemGroup>
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
11-
<PackageReference Include="xunit" Version="2.9.2" />
12-
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
13-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
14-
<PrivateAssets>all</PrivateAssets>
15-
</PackageReference>
16-
<PackageReference Include="coverlet.collector" Version="6.0.2">
17-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
18-
<PrivateAssets>all</PrivateAssets>
19-
</PackageReference>
20-
</ItemGroup>
21-
22-
<ItemGroup>
23-
<ProjectReference Include="..\Geo\Geo.csproj"/>
24-
</ItemGroup>
2+
<PropertyGroup>
3+
<TargetFramework>net8.0</TargetFramework>
4+
<IsPackable>false</IsPackable>
5+
<LangVersion>default</LangVersion>
6+
</PropertyGroup>
7+
<ItemGroup>
8+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
9+
<PackageReference Include="xunit" Version="2.9.3" />
10+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.1">
11+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
12+
<PrivateAssets>all</PrivateAssets>
13+
</PackageReference>
14+
<PackageReference Include="coverlet.collector" Version="6.0.4">
15+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
16+
<PrivateAssets>all</PrivateAssets>
17+
</PackageReference>
18+
</ItemGroup>
19+
<ItemGroup>
20+
<ProjectReference Include="..\Geo\Geo.csproj" />
21+
</ItemGroup>
2522
</Project>

‎Geo/Geo.csproj‎

Lines changed: 45 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,47 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
3-
<PropertyGroup>
4-
<Copyright>Copyright © Simon Bartlett 2012</Copyright>
5-
<NeutralLanguage>en</NeutralLanguage>
6-
<Authors>Simon Bartlett</Authors>
7-
<AssemblyName>Geo</AssemblyName>
8-
<Version>1.1.1</Version>
9-
<Description>A geospatial library for .NET</Description>
10-
<PackageLicenseExpression>LGPL-3.0-or-later</PackageLicenseExpression>
11-
<PackageTags>geo;spatial;gps;coordinates;wgs84;geography;WKT;WKB;GeoJSON;GPX;IGC;NMEA;Garmin;PocketFMS;SkyDemon;magnetic declination;magnetic variation;geomagnetism;igrf;wmm</PackageTags>
12-
<RepositoryType>git</RepositoryType>
13-
<RepositoryUrl>https://github.com/sibartlett/Geo</RepositoryUrl>
14-
<DefineConstants>SIMPLE_JSON_TYPEINFO</DefineConstants>
15-
<TargetFramework>netstandard2.0</TargetFramework>
16-
<LangVersion>default</LangVersion>
17-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
18-
</PropertyGroup>
19-
20-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
21-
<NoWarn/>
22-
<DefineConstants>$(DefineConstants);DEBUG;TRACE</DefineConstants>
23-
</PropertyGroup>
24-
25-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
26-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
27-
</PropertyGroup>
28-
29-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3'">
30-
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.7.0"/>
31-
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0"/>
32-
<PackageReference Include="System.Xml.XmlDocument" Version="4.3.0"/>
33-
<PackageReference Include="System.Xml.XmlSerializer" Version="4.3.0"/>
34-
</ItemGroup>
35-
36-
<ItemGroup>
37-
<None Include="..\README.md" Pack="true" PackagePath="\" />
38-
</ItemGroup>
39-
40-
<Target Name="Husky" BeforeTargets="Restore;CollectPackageReferences" Condition="'$(HUSKY)' != 0">
41-
<Exec Command="dotnet tool restore" StandardOutputImportance="Low" StandardErrorImportance="High" />
42-
<Exec Command="dotnet husky install" StandardOutputImportance="Low" StandardErrorImportance="High" WorkingDirectory=".." />
43-
</Target>
44-
2+
<PropertyGroup>
3+
<Copyright>Copyright © Simon Bartlett 2012</Copyright>
4+
<NeutralLanguage>en</NeutralLanguage>
5+
<Authors>Simon Bartlett</Authors>
6+
<AssemblyName>Geo</AssemblyName>
7+
<Version>1.1.1</Version>
8+
<Description>A geospatial library for .NET</Description>
9+
<PackageLicenseExpression>LGPL-3.0-or-later</PackageLicenseExpression>
10+
<PackageTags>geo;spatial;gps;coordinates;wgs84;geography;WKT;WKB;GeoJSON;GPX;IGC;NMEA;Garmin;PocketFMS;SkyDemon;magnetic declination;magnetic variation;geomagnetism;igrf;wmm</PackageTags>
11+
<RepositoryType>git</RepositoryType>
12+
<RepositoryUrl>https://github.com/sibartlett/Geo</RepositoryUrl>
13+
<DefineConstants>SIMPLE_JSON_TYPEINFO</DefineConstants>
14+
<TargetFramework>netstandard2.0</TargetFramework>
15+
<LangVersion>default</LangVersion>
16+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
17+
</PropertyGroup>
18+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
19+
<NoWarn />
20+
<DefineConstants>$(DefineConstants);DEBUG;TRACE</DefineConstants>
21+
</PropertyGroup>
22+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
23+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
24+
</PropertyGroup>
25+
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3'">
26+
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.7.0" />
27+
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
28+
<PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" />
29+
<PackageReference Include="System.Xml.XmlSerializer" Version="4.3.0" />
30+
</ItemGroup>
31+
<ItemGroup>
32+
<None Include="..\README.md" Pack="true" PackagePath="\" />
33+
</ItemGroup>
34+
<Target Name="Husky" BeforeTargets="Restore;CollectPackageReferences" Condition="'$(HUSKY)' != 0">
35+
<Exec
36+
Command="dotnet tool restore"
37+
StandardOutputImportance="Low"
38+
StandardErrorImportance="High"
39+
/>
40+
<Exec
41+
Command="dotnet husky install"
42+
StandardOutputImportance="Low"
43+
StandardErrorImportance="High"
44+
WorkingDirectory=".."
45+
/>
46+
</Target>
4547
</Project>

‎build/Build.cs‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ class Build : NukeBuild
1717
/// - JetBrains Rider https://nuke.build/rider
1818
/// - Microsoft VisualStudio https://nuke.build/visualstudio
1919
/// - Microsoft VSCode https://nuke.build/vscode
20-
2120
public static int Main() => Execute<Build>(x => x.Compile);
2221

2322
[Parameter("Configuration to build - Default is 'Debug' (local) or 'Release' (server)")]
@@ -36,11 +35,6 @@ class Build : NukeBuild
3635
_.Executes(() =>
3736
{
3837
DotNetTasks.DotNet("husky run --group verify");
39-
40-
if (Git($"status --porcelain").Count > 0)
41-
{
42-
Assert.Fail("Uncommitted changes - run csharpier and prettier");
43-
}
4438
});
4539

4640
Target Clean =>

‎build/Directory.Build.props‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
2+
<Project
3+
ToolsVersion="4.0"
4+
DefaultTargets="Build"
5+
xmlns="http://schemas.microsoft.com/developer/msbuild/2003"
6+
>
47
<!-- This file prevents unintended imports of unrelated MSBuild files -->
58
<!-- Uncomment to include parent Directory.Build.props file -->
69
<!--<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />-->
7-
810
</Project>

‎build/Directory.Build.targets‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
2+
<Project
3+
ToolsVersion="4.0"
4+
DefaultTargets="Build"
5+
xmlns="http://schemas.microsoft.com/developer/msbuild/2003"
6+
>
47
<!-- This file prevents unintended imports of unrelated MSBuild files -->
58
<!-- Uncomment to include parent Directory.Build.targets file -->
69
<!--<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />-->
7-
810
</Project>

‎build/_build.csproj‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
43
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
65
<RootNamespace></RootNamespace>
76
<NoWarn>CS0649;CS0169;CA1050;CA1822;CA2211;IDE1006</NoWarn>
87
<NukeRootDirectory>..</NukeRootDirectory>
98
<NukeScriptDirectory>..</NukeScriptDirectory>
109
<NukeTelemetryVersion>1</NukeTelemetryVersion>
1110
<IsPackable>false</IsPackable>
1211
</PropertyGroup>
13-
1412
<ItemGroup>
15-
<PackageReference Include="Nuke.Common" Version="8.1.0" />
13+
<PackageReference Include="Nuke.Common" Version="8.1.4" />
1614
</ItemGroup>
17-
1815
</Project>

0 commit comments

Comments
 (0)
⚡