Updates/rename

HakanL · Dec 3, 2024 · f362181 · f362181
1 parent 47d7dff
commit f362181
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 11 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -48,9 +48,9 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '6.0.x'
+        dotnet-version: '9.0.x'
     - name: Install dependencies
-      run: dotnet restore
+      run: dotnet restore /p:Configuration=Release
       env:
         DOTNET_CLI_TELEMETRY_OPTOUT: 1
     - name: Build

diff --git a/ArtNet/ArtNet.csproj → ArtNet/Haukcode.ArtNet.csproj b/ArtNet/ArtNet.csproj → ArtNet/Haukcode.ArtNet.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage</TargetsForTfmSpecificBuildOutput>
     <RootNamespace>Haukcode.ArtNet</RootNamespace>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -28,9 +28,22 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Rdm\Rdm.csproj" Condition="'$(TargetFramework)' == 'netstandard2.0'" PrivateAssets="all" />
+    <ProjectReference Include="..\Rdm\Haukcode.Rdm.csproj" />
   </ItemGroup>
 
+  <Choose>
+    <When Condition="'$(Configuration)' == 'Debug'">
+      <ItemGroup>
+        <ProjectReference Include="..\..\Haukcode.HighPerfComm\src\Haukcode.HighPerfComm.csproj" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <PackageReference Include="Haukcode.HighPerfComm" Version="1.0.8" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+
   <Target Name="CopyProjectReferencesToPackage" DependsOnTargets="ResolveReferences">
     <ItemGroup>
       <BuildOutputInPackage Include="@(ReferenceCopyLocalPaths-&gt;WithMetadataValue('ReferenceSourceTarget', 'ProjectReference'))" />

diff --git a/Haukcode-ArtNet.sln b/Haukcode-ArtNet.sln
@@ -1,13 +1,15 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28307.136
+# Visual Studio Version 17
+VisualStudioVersion = 17.12.35521.163 d17.12
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ArtNet", "ArtNet\ArtNet.csproj", "{FE79213B-0C06-4AFA-8BD7-23200879BC9A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Haukcode.ArtNet", "ArtNet\Haukcode.ArtNet.csproj", "{FE79213B-0C06-4AFA-8BD7-23200879BC9A}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples", "Samples\Samples.csproj", "{695B172A-8C82-4B7F-9C67-D2BB195CF024}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Rdm", "Rdm\Rdm.csproj", "{DEFB7DF2-2833-4A71-A47E-F7993BB0EFC0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Haukcode.Rdm", "Rdm\Haukcode.Rdm.csproj", "{DEFB7DF2-2833-4A71-A47E-F7993BB0EFC0}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Haukcode.HighPerfComm", "..\Haukcode.HighPerfComm\src\Haukcode.HighPerfComm.csproj", "{21476F46-49AB-4252-9DD1-8858238711CF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -27,6 +29,10 @@ Global
 		{DEFB7DF2-2833-4A71-A47E-F7993BB0EFC0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DEFB7DF2-2833-4A71-A47E-F7993BB0EFC0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DEFB7DF2-2833-4A71-A47E-F7993BB0EFC0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{21476F46-49AB-4252-9DD1-8858238711CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{21476F46-49AB-4252-9DD1-8858238711CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{21476F46-49AB-4252-9DD1-8858238711CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{21476F46-49AB-4252-9DD1-8858238711CF}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/Rdm/Rdm.csproj → Rdm/Haukcode.Rdm.csproj b/Rdm/Rdm.csproj → Rdm/Haukcode.Rdm.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <RootNamespace>Haukcode.Rdm</RootNamespace>
     <PackageId>Haukcode.ArtNet.Rdm</PackageId>
     <Authors>Hakan Lindestaf</Authors>

diff --git a/Samples/Samples.csproj b/Samples/Samples.csproj
@@ -2,12 +2,12 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <RootNamespace>Haukcode.Samples</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\ArtNet\ArtNet.csproj" />
+    <ProjectReference Include="..\ArtNet\Haukcode.ArtNet.csproj" />
   </ItemGroup>
 
 </Project>