Skip to content

Commit

Permalink
Update references and schema (#8)
Browse files Browse the repository at this point in the history
  • Loading branch information
ds5678 authored Sep 17, 2024
1 parent 7862453 commit 04ae73f
Show file tree
Hide file tree
Showing 9 changed files with 2,551 additions and 301 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: 5.0.x
dotnet-version: 8.0.x
- name: Restore dependencies
run: dotnet restore
- name: Build
Expand Down
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"sdk": {
"version": "5.0.100",
"rollForward": "latestMajor",
"version": "8.0.400",
"rollForward": "latestPatch",
"allowPrerelease": false
}
}
6 changes: 3 additions & 3 deletions src/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<Project>
<PropertyGroup>
<Authors>nietras</Authors>
<Copyright>Copyright © nietras 2023</Copyright>
<Copyright>Copyright © nietras 2024</Copyright>
<NeutralLanguage>en</NeutralLanguage>
<AssemblyVersion>0.2.0.0</AssemblyVersion>
<FileVersion>0.2.1</FileVersion>
<AssemblyVersion>0.3.0.0</AssemblyVersion>
<FileVersion>0.3.0</FileVersion>
<InformationalVersion>$(FileVersion)</InformationalVersion>
<PackageVersion>$(InformationalVersion)</PackageVersion>

Expand Down
12 changes: 6 additions & 6 deletions src/OnnxSharp.Test/OnnxSharp.Test.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />

<PropertyGroup>
<TargetFrameworks>net461;net5.0</TargetFrameworks>
<TargetFrameworks>net462;net8.0</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
Expand All @@ -20,13 +20,13 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
<PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
<PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="MSTest.TestAdapter" Version="3.6.0" />
<PackageReference Include="MSTest.TestFramework" Version="3.6.0" />
</ItemGroup>

<ItemGroup Condition="$(TargetFramework) == 'net461'">
<PackageReference Include="System.Text.Json" Version="5.0" />
<ItemGroup Condition="$(TargetFramework) == 'net462'">
<PackageReference Include="System.Text.Json" Version="8.0.4" />
</ItemGroup>

<!-- Change logical name of all embedded resources to be like file system paths. -->
Expand Down
2,602 changes: 2,345 additions & 257 deletions src/OnnxSharp/Onnx.cs

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions src/OnnxSharp/OnnxSharp.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project>
<Project>
<!-- Custom properties need to be included before the Sdk.props
The Directory.Build.props way of doing this would have to be replicated in multiple places,
so instead using the old props customization trick but define it before Sdk.props. -->
Expand Down Expand Up @@ -29,8 +29,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Google.Protobuf" Version="3.14.0" />
<!--<PackageReference Include="Google.Protobuf.Tools" Version="3.14.0" />-->
<PackageReference Include="Google.Protobuf" Version="3.28.1" />
<!--<PackageReference Include="Google.Protobuf.Tools" Version="3.28.1" />-->
</ItemGroup>

<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
Expand Down
Loading

0 comments on commit 04ae73f

Please sign in to comment.