Skip to content

Commit

Permalink
NET9
Browse files Browse the repository at this point in the history
  • Loading branch information
LiorBanai-Intuitive committed Nov 13, 2024
1 parent a9c1757 commit df3eaba
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 25 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/dotnet-core-desktop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ jobs:

# Install the .NET Core workload
- name: Install .NET Core
uses: actions/setup-dotnet@v3.2.0
uses: actions/setup-dotnet@v4.1.0
with:
dotnet-version: 8.0.x
dotnet-version: 9.0.x

# Add MSBuild to the PATH: https://github.com/microsoft/setup-msbuild
- name: Setup MSBuild.exe
Expand Down Expand Up @@ -66,7 +66,7 @@ jobs:
runs-on: windows-latest
steps:
- name: 'Download Artifact'
uses: actions/[email protected].7
uses: actions/[email protected].8
with:
name: artifactory_Release
- name: 'Dotnet NuGet Push'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net8.0-windows;net48</TargetFrameworks>
<TargetFrameworks>net9.0-windows;net8.0-windows;net48</TargetFrameworks>
<UseWindowsForms>true</UseWindowsForms>
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Analogy.LogViewer.Interfaces" Version="7.0.0.1" />
<PackageReference Include="System.Resources.Extensions" Version="8.0.0" />
<PackageReference Include="Analogy.LogViewer.Interfaces" Version="7.1.0" />
<PackageReference Include="System.Resources.Extensions" Version="9.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Analogy.LogServer.Clients\Analogy.LogServer.Clients.csproj" />
Expand Down
10 changes: 5 additions & 5 deletions Analogy.LogServer.Clients/Analogy.LogServer.Clients.csproj
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0;net6.0;net48</TargetFrameworks>
<TargetFrameworks>net9.0;net8.0;net48</TargetFrameworks>
<OutputType>Library</OutputType>
<Authors>Lior Banai</Authors>
<Company>Analogy.LogViewer</Company>
<Description>grpc client to send messages To Analogy Log Viewer with gRPC server running</Description>
<Copyright>Lior Banai @ 2020-2024</Copyright>
<Copyright>Lior Banai 2020-2025</Copyright>
<PackageIcon>Analogy.gRPC.service.png</PackageIcon>
<VersionPrefix>7.0.0</VersionPrefix>
<VersionPrefix>7.1.0</VersionPrefix>
<VersionSuffix></VersionSuffix>
<RepositoryUrl>https://github.com/Analogy-LogViewer/Analogy.LogViewer.gRPC</RepositoryUrl>
<PackageProjectUrl>https://github.com/Analogy-LogViewer/Analogy.LogViewer.gRPC</PackageProjectUrl>
Expand All @@ -28,14 +28,14 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Analogy.Interfaces.DataTypes" Version="1.0.0" />
<PackageReference Include="Analogy.Interfaces.DataTypes" Version="1.1.0" />
<PackageReference Include="Google.Protobuf" Version="3.28.3" />
<PackageReference Include="Grpc.Core" Version="2.46.6" />
<PackageReference Include="Grpc.Net.Client" Version="2.66.0" />
<PackageReference Include="Grpc.Tools" Version="2.67.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.0" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFrameworks>net8.0-windows;net6.0-windows;net48</TargetFrameworks>
<TargetFrameworks>net9.0-windows;net8.0-windows;net48</TargetFrameworks>
<UseWindowsForms>true</UseWindowsForms>
<IsPackable>true</IsPackable>
<Authors>Lior Banai</Authors>
Expand All @@ -12,12 +12,13 @@
<Version>0.0.3</Version>
<Copyright>Lior Banai @ 2020-2024</Copyright>
<PackageIcon>Analogy.gRPC.service.png</PackageIcon>
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Analogy.LogViewer.Interfaces" Version="7.0.0.1" />
<PackageReference Include="Analogy.LogViewer.Interfaces" Version="7.1.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="System.Resources.Extensions" Version="8.0.0" />
<PackageReference Include="System.Resources.Extensions" Version="9.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
9 changes: 4 additions & 5 deletions Analogy.LogServer.Tests/Analogy.LogServer.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,20 @@

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFrameworks>net8.0-windows;net7.0-windows</TargetFrameworks>
<TargetFrameworks>net9.0-windows;net8.0-windows</TargetFrameworks>
<UseWindowsForms>true</UseWindowsForms>
<Copyright>Lior Banai @ 2020-2024</Copyright>
<Copyright>Lior Banai 2020-2025</Copyright>
<PackageProjectUrl>https://github.com/Analogy-LogViewer/Analogy.LogViewer.gRPC</PackageProjectUrl>
<RepositoryUrl>https://github.com/Analogy-LogViewer/Analogy.LogViewer.gRPC</RepositoryUrl>
<PackageIcon>Analogy.gRPC2.png</PackageIcon>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Analogy.LogViewer.Interfaces" Version="7.0.0.1" />
<PackageReference Include="System.Resources.Extensions" Version="8.0.0" />
<PackageReference Include="Analogy.LogViewer.Interfaces" Version="7.1.0" />
<PackageReference Include="System.Resources.Extensions" Version="9.0.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Analogy.LogServer.Clients\Analogy.LogServer.Clients.csproj" />
</ItemGroup>

</Project>
8 changes: 4 additions & 4 deletions Analogy.LogServer/Analogy.LogServer.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFrameworks>net8.0-windows</TargetFrameworks>
<TargetFramework>net9.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<OutputType>Exe</OutputType>
<StartupObject>Analogy.LogServer.Program</StartupObject>
Expand All @@ -12,17 +12,17 @@
<RepositoryType>git</RepositoryType>
<PackageProjectUrl>https://github.com/Analogy-LogViewer/Real-Time-Log-Server</PackageProjectUrl>
<ApplicationIcon>Analogy.gRPC.service.ico</ApplicationIcon>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
<PackageIcon>Analogy.gRPC.service.png</PackageIcon>
<IsPackable>true</IsPackable>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
<VersionPrefix>4.0.0.0</VersionPrefix>
<VersionPrefix>4.1.0.0</VersionPrefix>
<VersionSuffix></VersionSuffix>
<Copyright>Lior Banai @ 2020-2024</Copyright>
<Copyright>Lior Banai 2020-2025</Copyright>
</PropertyGroup>
<ItemGroup>
<Protobuf Include="Protos\Analogy.proto" GrpcServices="Server" />
Expand Down
4 changes: 2 additions & 2 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Meziantou.Analyzer" Version="2.0.178">
<PackageReference Include="Meziantou.Analyzer" Version="2.0.179">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand All @@ -51,7 +51,7 @@
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net48' or '$(TargetFramework)' == 'net471' ">
<PackageReference Include="Microsoft.Bcl.HashCode" Version="1.1.1" />
<PackageReference Include="Microsoft.Bcl.HashCode" Version="6.0.0" />
<PackageReference Include="PolySharp" Version="1.14.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down

0 comments on commit df3eaba

Please sign in to comment.