Skip to content

Commit 0ef25b6

Browse files
Update supported dotnet versions
* Also add Directory.Build.props to the solution * Add support for running `dotnet test` * Add Test step to CI +semver:major
1 parent 1a6392b commit 0ef25b6

File tree

7 files changed

+50
-20
lines changed

7 files changed

+50
-20
lines changed

.github/workflows/CI-CD.yml

+6-4
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,15 @@ jobs:
2121
- name: Install .NET Core
2222
uses: actions/setup-dotnet@3e891b0cb619bf60e2c25674b222b8940e2c1c25 # v4.1.0
2323
with:
24-
dotnet-version: 6.0.x
24+
dotnet-version: 8.0.x
2525

2626
- name: Restore Windows
27-
run: dotnet restore --runtime=win10-x64
27+
run: dotnet restore --runtime=win-x64
2828

29-
- name: Build Windows
30-
run: dotnet build IdlImpTool --no-restore --runtime=win10-x64
29+
- name: Build & Test Windows
30+
run: |
31+
dotnet build IdlImpTool --no-restore --runtime=win-x64
32+
dotnet test IdlImporterTests
3133
3234
- name: Restore Linux
3335
run: dotnet restore --runtime=linux-x64

CHANGELOG.md

+5-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
1414
### Security
1515
-->
1616

17-
## [Unreleased]
17+
## [4.0.0] - 2024-11-22
18+
19+
- Add net4.6.2 and net8.0 support
20+
- Drop net5.0, netcore3.1, and net4.6.1 support
21+
- Update dependencies
1822

1923
## [3.0.1] - 2022-09-08
2024

Directory.Build.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<TargetFrameworks>net461;netstandard2.0;net5.0</TargetFrameworks>
3+
<TargetFrameworks>net462;netstandard2.0;net8.0</TargetFrameworks>
44
<RootNamespace>SIL.IDLImporterTool</RootNamespace>
55
<Configurations>Debug;Release</Configurations>
66
<Company>SIL International</Company>

IDLImporterTests/IDLImporterTests.csproj

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net461</TargetFrameworks>
54
<AssemblyTitle>IDLImporterTests</AssemblyTitle>
65
<PackageId>SIL.IdlImporter.Tests</PackageId>
76
<IsPackable>false</IsPackable>
87
</PropertyGroup>
98

109
<ItemGroup>
1110
<PackageReference Include="GitVersion.MsBuild" Version="5.12.0" PrivateAssets="All" />
11+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
1212
<PackageReference Include="NUnit" Version="3.14.0" />
13+
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
1314
<PackageReference Include="SIL.ReleaseTasks" Version="3.0.0" PrivateAssets="All" />
1415
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
1516
</ItemGroup>

IdlImpTool/IDLImp.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
54
<OutputType>Exe</OutputType>
6-
<RuntimeIdentifiers>win10-x64;linux-x64</RuntimeIdentifiers>
5+
<TargetFrameworks>net8.0</TargetFrameworks>
6+
<RuntimeIdentifiers>win-x64;linux-x64</RuntimeIdentifiers>
77
<AssemblyTitle>IDLImp</AssemblyTitle>
88
<Description>Imports the COM interfaces from an IDL file for use with .NET. Can handle c-style arrays and OLECHAR pointers.</Description>
99
<PackAsTool>true</PackAsTool>

IdlImporter.sln

+17-10
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,23 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IDLImporter", "IDLImporter\IDLImporter.csproj", "{D23CFDE1-DF89-433E-BE88-6C08279F7349}"
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.11.35327.3
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IDLImporter", "IDLImporter\IDLImporter.csproj", "{D23CFDE1-DF89-433E-BE88-6C08279F7349}"
47
EndProject
5-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IDLImp", "IdlImpTool\IDLImp.csproj", "{B5904870-00F3-4833-A981-E22B79A16106}"
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IDLImp", "IdlImpTool\IDLImp.csproj", "{B5904870-00F3-4833-A981-E22B79A16106}"
69
EndProject
7-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IDLImporterTests", "IDLImporterTests\IDLImporterTests.csproj", "{6E18BE34-1CF5-48EA-9C47-F0E89A32E648}"
10+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IDLImporterTests", "IDLImporterTests\IDLImporterTests.csproj", "{6E18BE34-1CF5-48EA-9C47-F0E89A32E648}"
811
EndProject
912
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionFolder", "SolutionFolder", "{17449FC8-15AE-49B9-9DEA-22AAFF0F9285}"
10-
ProjectSection(SolutionItems) = preProject
11-
README.md = README.md
12-
GitVersion.yml = GitVersion.yml
13-
CHANGELOG.md = CHANGELOG.md
14-
.gitignore = .gitignore
15-
.editorconfig = .editorconfig
16-
EndProjectSection
13+
ProjectSection(SolutionItems) = preProject
14+
.editorconfig = .editorconfig
15+
.gitignore = .gitignore
16+
CHANGELOG.md = CHANGELOG.md
17+
Directory.Build.props = Directory.Build.props
18+
GitVersion.yml = GitVersion.yml
19+
README.md = README.md
20+
EndProjectSection
1721
EndProject
1822
Global
1923
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -34,4 +38,7 @@ Global
3438
{6E18BE34-1CF5-48EA-9C47-F0E89A32E648}.Release|Any CPU.ActiveCfg = Release|Any CPU
3539
{6E18BE34-1CF5-48EA-9C47-F0E89A32E648}.Release|Any CPU.Build.0 = Release|Any CPU
3640
EndGlobalSection
41+
GlobalSection(SolutionProperties) = preSolution
42+
HideSolutionNode = FALSE
43+
EndGlobalSection
3744
EndGlobal

README.md

+16
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,19 @@ Install the [SIL.IdlImporter](https://www.nuget.org/packages/SIL.IdlImporter) nu
1717
dotnet restore
1818
dotnet build
1919
```
20+
21+
## Testing Locally
22+
23+
### Unit testing
24+
```bash
25+
dotnet test
26+
```
27+
28+
### Using your local changes
29+
```bash
30+
dotnet pack
31+
dotnet tool uninstall -g SIL.IdlImporter.Tool
32+
dotnet tool install -g --add-source output SIL.IdlImporter.Tool --version [new version]
33+
```
34+
Note: If you are testing with FieldWorks you should make this change in the BuildInclude.targets in the ViewsInterfaces project
35+

0 commit comments

Comments
 (0)