Merge branch 'main' into improve-tls

nanoframework · Aug 12, 2024 · de444a5 · de444a5
2 parents 0d9c3b2 + 5753872
commit de444a5
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/M2Mqtt/nanoFramework.M2Mqtt.nfproj b/M2Mqtt/nanoFramework.M2Mqtt.nfproj
@@ -121,4 +121,4 @@
     <Error Condition="!Exists('..\packages\Nerdbank.GitVersioning.3.6.141\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Nerdbank.GitVersioning.3.6.141\build\Nerdbank.GitVersioning.targets'))" />
   </Target>
   <Import Project="..\packages\Nerdbank.GitVersioning.3.6.141\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\packages\Nerdbank.GitVersioning.3.6.141\build\Nerdbank.GitVersioning.targets')" />
-</Project>
+</Project>
diff --git a/M2Mqtt/packages.config b/M2Mqtt/packages.config
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="nanoFramework.CoreLibrary" version="1.15.5" targetFramework="netnano1.0" />
   <package id="nanoFramework.Runtime.Events" version="1.11.18" targetFramework="netnano1.0" />
@@ -8,5 +8,5 @@
   <package id="nanoFramework.System.Net" version="1.11.1" targetFramework="netnano1.0" />
   <package id="nanoFramework.System.Text" version="1.2.54" targetFramework="netnano1.0" />
   <package id="nanoFramework.System.Threading" version="1.1.32" targetFramework="netnano1.0" />
-  <package id="Nerdbank.GitVersioning" version="3.6.141" developmentDependency="true" targetFramework="netnanoframework10" />
+  <package id="Nerdbank.GitVersioning" version="3.6.141" developmentDependency="true" targetFramework="netnano1.0" />
 </packages>
diff --git a/nanoFramework.M2Mqtt.Core/nanoFramework.M2Mqtt.Core.nfproj b/nanoFramework.M2Mqtt.Core/nanoFramework.M2Mqtt.Core.nfproj
@@ -67,4 +67,4 @@
     <Error Condition="!Exists('..\packages\Nerdbank.GitVersioning.3.6.141\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Nerdbank.GitVersioning.3.6.141\build\Nerdbank.GitVersioning.targets'))" />
   </Target>
   <Import Project="..\packages\Nerdbank.GitVersioning.3.6.141\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\packages\Nerdbank.GitVersioning.3.6.141\build\Nerdbank.GitVersioning.targets')" />
-</Project>
+</Project>
diff --git a/nanoFramework.M2Mqtt.Core/packages.config b/nanoFramework.M2Mqtt.Core/packages.config
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="nanoFramework.CoreLibrary" version="1.15.5" targetFramework="netnano1.0" />
-  <package id="Nerdbank.GitVersioning" version="3.6.141" targetFramework="netnanoframework10" developmentDependency="true" />
+  <package id="Nerdbank.GitVersioning" version="3.6.141" targetFramework="netnano1.0" developmentDependency="true" />
 </packages>