Skip to content

Commit 474f5e4

Browse files
rlabbeptcrlabbeptc
authored
Merge pull request #58 from PTCInc/dev-1.0
Update for .Net 10 support
2 parents 43b5a26 + b1c438f commit 474f5e4

10 files changed

Lines changed: 29 additions & 33 deletions

File tree

‎.github/workflows/nuget-test-and-build.yml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,19 +67,17 @@ jobs:
6767
fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
6868
- name: Setup .NET
6969
uses: actions/setup-dotnet@v4
70-
with:
71-
dotnet-version: 9.0.x
7270
- name: Restore dependencies
7371
run: dotnet restore
7472
- name: Build
7573
run: dotnet build --no-restore --configuration release
7674
- name: Test
77-
run: dotnet test Kepware.Api.Test/Kepware.Api.Test.csproj --no-build --verbosity normal --configuration Release --logger "trx;LogFileName=${{ matrix.platform }}-test-results.trx"
78-
- name: Publish Test Report (${{ matrix.platform }})
75+
run: dotnet test Kepware.Api.Test/Kepware.Api.Test.csproj --no-build --verbosity normal --configuration Release --logger "trx;LogFilePrefix=${{ matrix.platform }}-test-results"
76+
- name: Publish Test Reports (${{ matrix.platform }})
7977
if: ${{ github.event_name == 'pull_request' }}
8078
uses: dorny/test-reporter@v1
8179
with:
82-
name: .NET 9 Test Report (${{ matrix.platform }})
80+
name: .NET Test Reports (${{ matrix.platform }})
8381
path: "**/TestResults/**/*.trx"
8482
reporter: dotnet-trx
8583
- name: store NuGet package

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<ItemGroup>
44
<PackageReference Include="Nerdbank.GitVersioning" Condition="!Exists('packages.config')">
55
<PrivateAssets>all</PrivateAssets>
6-
<Version>3.7.115</Version>
6+
<Version>3.9.50</Version>
77
</PackageReference>
88
</ItemGroup>
99
</Project>

‎Kepware-ConfigAPI-SDK-dotnet.sln‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 17
4-
VisualStudioVersion = 17.13.35617.110
3+
# Visual Studio Version 18
4+
VisualStudioVersion = 18.3.11505.172 d18.3
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kepware.SyncService", "KepwareSync.Service\Kepware.SyncService.csproj", "{19B2841F-01D1-4A7E-BE26-A93CF8C57628}"
77
EndProject
@@ -10,7 +10,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionFiles", "SolutionFi
1010
.copilot.json = .copilot.json
1111
.dockerignore = .dockerignore
1212
.gitignore = .gitignore
13-
.runsettings = .runsettings
1413
Directory.Build.props = Directory.Build.props
1514
LICENSE.txt = LICENSE.txt
1615
README.md = README.md
@@ -22,14 +21,16 @@ EndProject
2221
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{A904D930-41F6-4016-A8BE-AED91D9E5B26}"
2322
ProjectSection(SolutionItems) = preProject
2423
.github\copilot-instructions.md = .github\copilot-instructions.md
25-
.github\release-drafter.yml = .github\release-drafter.yml
24+
.github\nuget-release-drafter.yml = .github\nuget-release-drafter.yml
25+
.github\syncservice-release-drafter.yml = .github\syncservice-release-drafter.yml
2626
EndProjectSection
2727
EndProject
2828
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{F0A34611-31AD-4698-A368-4D65F9A0F9D9}"
2929
ProjectSection(SolutionItems) = preProject
3030
.github\workflows\docfx-build-and-push.yml = .github\workflows\docfx-build-and-push.yml
3131
.github\workflows\docker-build-and-push.yml = .github\workflows\docker-build-and-push.yml
32-
.github\workflows\dotnet.yml = .github\workflows\dotnet.yml
32+
.github\workflows\nuget-test-and-build.yml = .github\workflows\nuget-test-and-build.yml
33+
.github\workflows\syncservice-build.yml = .github\workflows\syncservice-build.yml
3334
EndProjectSection
3435
EndProject
3536
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kepware.Api.Sample", "Kepware.Api.Sample\Kepware.Api.Sample.csproj", "{C7A179F8-E6D4-4163-9780-23B866636A3F}"

‎Kepware.Api.Sample/Kepware.Api.Sample.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net9.0</TargetFramework>
5+
<TargetFramework>net10.0</TargetFramework>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.1" />
12-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.1" />
11+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.3" />
12+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.3" />
1313
</ItemGroup>
1414

1515
<ItemGroup>

‎Kepware.Api.Test/Kepware.Api.Test.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
4+
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<IsPackable>false</IsPackable>

‎Kepware.Api.TestIntg/Kepware.Api.TestIntg.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
4+
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<IsPackable>false</IsPackable>
@@ -42,12 +42,9 @@
4242
<None Update="appsettings.json">
4343
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
4444
</None>
45-
<None Update="_data\doc_drivers.json">
46-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
47-
</None>
48-
<None Update="_data\simdemo_en-us.json">
49-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
50-
</None>
45+
<None Update="_data/*.*">
46+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
47+
</None>
5148
</ItemGroup>
5249

5350
</Project>

‎Kepware.Api.TestIntg/appsettings.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
"TestSettings": {
33
"IntegrationTest": true,
44
"TestServer": {
5-
"Host": "http://localhost",
6-
"Port": 57412,
5+
"Host": "https://localhost",
6+
"Port": 57513,
77
"UserName": "Administrator",
8-
"Password": "ReallyStrongPassword400!"
8+
"Password": "Kepware400400400"
99
}
1010
}
1111
}

‎Kepware.Api/Kepware.Api.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

33
<PropertyGroup>
4-
<TargetFrameworks>net8.0; net9.0</TargetFrameworks>
4+
<TargetFrameworks>net8.0; net9.0; net10.0</TargetFrameworks>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
77
<GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -32,8 +32,8 @@
3232
</ItemGroup>
3333

3434
<ItemGroup>
35-
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.1" />
36-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.1" />
35+
<PackageReference Include="Microsoft.Extensions.Http" Version="10.0.3" />
36+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.3" />
3737
<PackageReference Include="Vecc.YamlDotNet.Analyzers.StaticGenerator" Version="16.3.0" />
3838
<PackageReference Include="CsvHelper" Version="33.0.1" />
3939
<PackageReference Include="YamlDotNet" Version="16.3.0" />

‎KepwareSync.Service/Kepware.SyncService.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@
2828

2929
<ItemGroup>
3030

31-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.1" />
32-
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="9.0.1" />
33-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.1" />
31+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.3" />
32+
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="10.0.3" />
33+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.3" />
3434
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
35-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.1" />
35+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.3" />
3636
<PackageReference Include="Polly" Version="8.5.1" />
3737
<PackageReference Include="Serilog" Version="4.2.0" />
3838
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />

‎docs/nuget-README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Kepware.Api
22

3-
[![Build Status](https://github.com/PTCInc/Kepware-ConfigAPI-SDK-dotnet/actions/workflows/dotnet.yml/badge.svg)](https://github.com/PTCInc/Kepware-ConfigAPI-SDK-dotnet/actions)
3+
[![Build Status](https://github.com/PTCInc/Kepware-ConfigAPI-SDK-dotnet/actions/workflows/nuget-test-and-build.yml/badge.svg)](https://github.com/PTCInc/Kepware-ConfigAPI-SDK-dotnet/actions)
44

55
## Overview
66
The `Kepware.Api` library provides a robust client implementation to interact with the Kepware Configuration API. It supports managing channels, devices, tags, and other configurations programmatically while ensuring secure and efficient communication.

0 commit comments

Comments
 (0)