Merge pull request #304 from WildernessLabs/develop

Nuget and ref fixes for RC3-1
WildernessLabs · May 6, 2023 · 21a9f2f · 21a9f2f
2 parents cfc045a + c66d951
commit 21a9f2f
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 50 deletions.
diff --git a/.github/workflows/nuget-f7.yml b/.github/workflows/nuget-f7.yml
@@ -11,7 +11,7 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v2
     - name: Set VERSION variable from tag
-      run: echo "VERSION=0.96.0" >> $GITHUB_ENV
+      run: echo "VERSION=0.98.0" >> $GITHUB_ENV
 
     - name: Build Meadow.F7
       run: dotnet build -c Release source/implementations/f7/Meadow.F7/Meadow.F7.csproj /p:Version=${VERSION}

diff --git a/.github/workflows/nuget-linux.yml b/.github/workflows/nuget-linux.yml
@@ -11,7 +11,7 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v2
     - name: Set VERSION variable from tag
-      run: echo "VERSION=0.96.0" >> $GITHUB_ENV
+      run: echo "VERSION=0.98.0" >> $GITHUB_ENV
 
     - name: Build Meadow.Linux
       run: dotnet build -c Release source/implementations/linux/Meadow.Linux/Meadow.Linux.csproj /p:Version=${VERSION}

diff --git a/.github/workflows/nuget-windows.yml b/.github/workflows/nuget-windows.yml
@@ -11,7 +11,7 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v2
     - name: Set VERSION variable from tag
-      run: echo "VERSION=0.96.0" >> $GITHUB_ENV
+      run: echo "VERSION=0.98.0" >> $GITHUB_ENV
 
     - name: Build Meadow.Windows
       run: dotnet build -c Release source/implementations/windows/Meadow.Windows/Meadow.Windows.csproj /p:Version=${VERSION}

diff --git a/source/Meadow.Core.sln b/source/Meadow.Core.sln
@@ -6,18 +6,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Meadow.Core", "Meadow.Core\
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{7BCFC6D6-228E-4C93-8145-EAD121AA8587}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_refs", "_refs", "{E5D88D38-57E0-46E0-913A-0CCE91826F18}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Meadow.Contracts", "..\..\Meadow.Contracts\Source\Meadow.Contracts\Meadow.Contracts.csproj", "{E6453AC7-85B7-4F5C-BA23-5DC8D7BB60C8}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Meadow.Units", "..\..\Meadow.Units\Source\Meadow.Units\Meadow.Units.csproj", "{08343570-1C97-429D-A0C9-6A9822412028}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core.Unit.Tests", "Tests\Core.Unit.Tests\Core.Unit.Tests.csproj", "{93DFC566-A413-4039-A0C1-90A42A356386}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet", "..\..\MQTTnet\Source\MQTTnet\MQTTnet.csproj", "{7E26CCF1-DDB2-4A49-93AA-08F2612A47A8}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Meadow.Logging", "..\..\Meadow.Logging\Source\Meadow.Logging\lib\Meadow.Logging.csproj", "{BC491B8D-D6EF-4AE6-B11D-1A117B6A350D}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "implementations", "implementations", "{CC469899-D08C-417C-A908-C052CA155BEC}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Meadow.F7", "implementations\f7\Meadow.F7\Meadow.F7.csproj", "{E377CD5F-1E6C-4FFD-BA70-F17620A9273E}"
@@ -51,42 +41,12 @@ Global
 		{B13C7BDD-77F5-45F8-BDB9-6CD368C67410}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B13C7BDD-77F5-45F8-BDB9-6CD368C67410}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B13C7BDD-77F5-45F8-BDB9-6CD368C67410}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E6453AC7-85B7-4F5C-BA23-5DC8D7BB60C8}.Core|Any CPU.ActiveCfg = Debug|Any CPU
-		{E6453AC7-85B7-4F5C-BA23-5DC8D7BB60C8}.Core|Any CPU.Build.0 = Debug|Any CPU
-		{E6453AC7-85B7-4F5C-BA23-5DC8D7BB60C8}.Core|Any CPU.Deploy.0 = Debug|Any CPU
-		{E6453AC7-85B7-4F5C-BA23-5DC8D7BB60C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E6453AC7-85B7-4F5C-BA23-5DC8D7BB60C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E6453AC7-85B7-4F5C-BA23-5DC8D7BB60C8}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{E6453AC7-85B7-4F5C-BA23-5DC8D7BB60C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E6453AC7-85B7-4F5C-BA23-5DC8D7BB60C8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E6453AC7-85B7-4F5C-BA23-5DC8D7BB60C8}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{08343570-1C97-429D-A0C9-6A9822412028}.Core|Any CPU.ActiveCfg = Debug|Any CPU
-		{08343570-1C97-429D-A0C9-6A9822412028}.Core|Any CPU.Build.0 = Debug|Any CPU
-		{08343570-1C97-429D-A0C9-6A9822412028}.Core|Any CPU.Deploy.0 = Debug|Any CPU
-		{08343570-1C97-429D-A0C9-6A9822412028}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{08343570-1C97-429D-A0C9-6A9822412028}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{08343570-1C97-429D-A0C9-6A9822412028}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{08343570-1C97-429D-A0C9-6A9822412028}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{08343570-1C97-429D-A0C9-6A9822412028}.Release|Any CPU.Build.0 = Release|Any CPU
-		{08343570-1C97-429D-A0C9-6A9822412028}.Release|Any CPU.Deploy.0 = Release|Any CPU
 		{93DFC566-A413-4039-A0C1-90A42A356386}.Core|Any CPU.ActiveCfg = Debug|Any CPU
 		{93DFC566-A413-4039-A0C1-90A42A356386}.Core|Any CPU.Build.0 = Debug|Any CPU
 		{93DFC566-A413-4039-A0C1-90A42A356386}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{93DFC566-A413-4039-A0C1-90A42A356386}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{93DFC566-A413-4039-A0C1-90A42A356386}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{93DFC566-A413-4039-A0C1-90A42A356386}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7E26CCF1-DDB2-4A49-93AA-08F2612A47A8}.Core|Any CPU.ActiveCfg = Debug|Any CPU
-		{7E26CCF1-DDB2-4A49-93AA-08F2612A47A8}.Core|Any CPU.Build.0 = Debug|Any CPU
-		{7E26CCF1-DDB2-4A49-93AA-08F2612A47A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7E26CCF1-DDB2-4A49-93AA-08F2612A47A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7E26CCF1-DDB2-4A49-93AA-08F2612A47A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7E26CCF1-DDB2-4A49-93AA-08F2612A47A8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BC491B8D-D6EF-4AE6-B11D-1A117B6A350D}.Core|Any CPU.ActiveCfg = Debug|Any CPU
-		{BC491B8D-D6EF-4AE6-B11D-1A117B6A350D}.Core|Any CPU.Build.0 = Debug|Any CPU
-		{BC491B8D-D6EF-4AE6-B11D-1A117B6A350D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BC491B8D-D6EF-4AE6-B11D-1A117B6A350D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BC491B8D-D6EF-4AE6-B11D-1A117B6A350D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BC491B8D-D6EF-4AE6-B11D-1A117B6A350D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E377CD5F-1E6C-4FFD-BA70-F17620A9273E}.Core|Any CPU.ActiveCfg = Debug|Any CPU
 		{E377CD5F-1E6C-4FFD-BA70-F17620A9273E}.Core|Any CPU.Build.0 = Debug|Any CPU
 		{E377CD5F-1E6C-4FFD-BA70-F17620A9273E}.Core|Any CPU.Deploy.0 = Debug|Any CPU
@@ -128,11 +88,7 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{E6453AC7-85B7-4F5C-BA23-5DC8D7BB60C8} = {E5D88D38-57E0-46E0-913A-0CCE91826F18}
-		{08343570-1C97-429D-A0C9-6A9822412028} = {E5D88D38-57E0-46E0-913A-0CCE91826F18}
 		{93DFC566-A413-4039-A0C1-90A42A356386} = {7BCFC6D6-228E-4C93-8145-EAD121AA8587}
-		{7E26CCF1-DDB2-4A49-93AA-08F2612A47A8} = {E5D88D38-57E0-46E0-913A-0CCE91826F18}
-		{BC491B8D-D6EF-4AE6-B11D-1A117B6A350D} = {E5D88D38-57E0-46E0-913A-0CCE91826F18}
 		{E377CD5F-1E6C-4FFD-BA70-F17620A9273E} = {716A47C0-59CB-485F-B6C8-57F073F5B633}
 		{5543D2D5-FA80-43CE-8844-40510A7DBED6} = {89E8BFD9-BC4E-4409-8AB5-9B1FD0A72CAB}
 		{40647101-F527-478F-888E-8D2041A8A614} = {7BCFC6D6-228E-4C93-8145-EAD121AA8587}

diff --git a/source/Meadow.Core/Meadow.Core.csproj b/source/Meadow.Core/Meadow.Core.csproj
@@ -20,9 +20,9 @@
 	</PropertyGroup>
 	<ItemGroup>
 		<None Include="..\icon.png" Link="icon.png" Pack="true" PackagePath="" />
-		<ProjectReference Include="..\..\..\MQTTnet\Source\MQTTnet\MQTTnet.csproj" />
-		<PackageReference Include="Meadow.Contracts" Version="0.*" />
-		<PackageReference Include="Meadow.Modbus" Version="0.*" />
+		<PackageReference Include="Meadow.Contracts" Version="0.98.0" />
+		<PackageReference Include="Meadow.Modbus" Version="0.98.0" />
+		<PackageReference Include="Meadow.MQTT" Version="0.33.0" />
 		<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
 		<PackageReference Include="NetEscapades.Configuration.Yaml" Version="2.2.0" />
 	</ItemGroup>