Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions WebLogger.sln
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{7451F827-4A16-4E7E-9E5F-4813936FE4B4}"
ProjectSection(SolutionItems) = preProject
source\Directory.Build.props = source\Directory.Build.props
.github\workflows\dotnet-beta.yml = .github\workflows\dotnet-beta.yml
.github\workflows\dotnet-release.yml = .github\workflows\dotnet-release.yml
.github\workflows\dotnet-test.yml = .github\workflows\dotnet-test.yml
README.md = README.md
EndProjectSection
EndProject
Expand Down
2 changes: 1 addition & 1 deletion examples/WebLogger.ConsoleApp/WebLogger.ConsoleApp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Crestron.SimplSharp.SDK.Program" Version="2.20.66" />
<PackageReference Include="Crestron.SimplSharp.SDK.Program" Version="2.21.157" />
<PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion source/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net472;net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net472;net8.0</TargetFrameworks>
<PackageProjectUrl>https://github.com/ewilliams0305/WebLogger</PackageProjectUrl>
<PackageIcon>log.png</PackageIcon>
<PackageReadmeFile>README.md</PackageReadmeFile>
Expand Down
5 changes: 0 additions & 5 deletions source/WebLogger.Crestron/Directory.Build.targets

This file was deleted.

9 changes: 2 additions & 7 deletions source/WebLogger.Crestron/WebLogger.Crestron.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
This was originally created for use on Crestron VC4 but has since been migrated to netstandard for use in native runtime application.
Wraps the weblogger for the use within the crestron SDK
</Description>
<TargetFrameworks>net472;net6.0;</TargetFrameworks>
<TargetFrameworks>net472;net8.0;</TargetFrameworks>
<Version>1.5.5</Version>
</PropertyGroup>

Expand All @@ -20,12 +20,7 @@
</ItemGroup>

<ItemGroup>
<Content Remove="C:\Users\ewilliams\.nuget\packages\simplsharp.library.targets\0.1.8\contentFiles\any\any\Directory.Build.targets" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Crestron.SimplSharp.SDK.Library" Version="2.20.66" />
<PackageReference Include="SimplSharp.Library.Targets" Version="0.1.9" />
<PackageReference Include="Crestron.SimplSharp.SDK.Library" Version="2.21.157" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions tests/WebLogger.Benchmarks/WebLogger.Benchmarks.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.13.12" />
<PackageReference Include="BenchmarkDotNet" Version="0.15.4" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions tests/WebLogger_UnitTests/WebLogger_UnitTests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>

Expand All @@ -13,7 +13,7 @@
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="MSTest.TestAdapter" Version="3.2.2" />
<PackageReference Include="MSTest.TestFramework" Version="3.2.2" />
<PackageReference Include="coverlet.collector" Version="6.0.2">
<PackageReference Include="coverlet.collector" Version="6.0.4">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Loading