Support Span<T> conversion (#29)

nanoframework · May 21, 2021 · ad489d5 · ad489d5
1 parent 425b4d7
commit ad489d5
Show file tree

Hide file tree

Showing 388 changed files with 5,464 additions and 3,635 deletions.
diff --git a/src/devices_generated/AD5328/AD5328.nfproj b/src/devices_generated/AD5328/AD5328.nfproj
@@ -8,11 +8,7 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-<<<<<<< HEAD
-    <ProjectGuid>{A4169A41-716A-4BDF-88B9-BF865CD48DB2}</ProjectGuid>
-=======
-    <ProjectGuid>{9BA0D0ED-ADE3-4A2D-97F0-7A31A282668E}</ProjectGuid>
->>>>>>> 209f1bf2c74c8b011c27f4f865042bb02006d437
+    <ProjectGuid>{4138F0FE-525F-4BE3-8069-893FD582C7AB}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <FileAlignment>512</FileAlignment>

diff --git a/src/devices_generated/AD5328/AD5328.sln b/src/devices_generated/AD5328/AD5328.sln
@@ -3,16 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.30413.136
 MinimumVisualStudioVersion = 10.0.40219.1
-<<<<<<< HEAD
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "AD5328", "AD5328.nfproj", "{A4169A41-716A-4BDF-88B9-BF865CD48DB2}"
+Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "AD5328", "AD5328.nfproj", "{4138F0FE-525F-4BE3-8069-893FD582C7AB}"
 EndProject
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "AD5328.Samples", "samples\AD5328.Samples.nfproj", "{6DF271D6-BF4B-4157-A6AC-32B810BC3975}"
-=======
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "AD5328", "AD5328.nfproj", "{9BA0D0ED-ADE3-4A2D-97F0-7A31A282668E}"
-EndProject
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "AD5328.Samples", "samples\\AD5328.Samples.nfproj", "{264ADA55-EBE3-48CB-A3D6-C9F00183CE8C}"
->>>>>>> 209f1bf2c74c8b011c27f4f865042bb02006d437
+Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "AD5328.Samples", "samples\\AD5328.Samples.nfproj", "{3F838663-81A4-45B3-99A1-1DC04C155404}"
 EndProject
+<!-- SAMPLES PROJECT PLACEHOLDER -->
 <!-- UNIT TESTS PROJECT PLACEHOLDER -->
 
 Global
@@ -21,20 +16,11 @@ Global
         Release|Any CPU = Release|Any CPU
     EndGlobalSection
     GlobalSection(ProjectConfigurationPlatforms) = postSolution
-<<<<<<< HEAD
-        {A4169A41-716A-4BDF-88B9-BF865CD48DB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-        {A4169A41-716A-4BDF-88B9-BF865CD48DB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-        {A4169A41-716A-4BDF-88B9-BF865CD48DB2}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-        {A4169A41-716A-4BDF-88B9-BF865CD48DB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-        {A4169A41-716A-4BDF-88B9-BF865CD48DB2}.Release|Any CPU.Build.0 = Release|Any CPU
-        {A4169A41-716A-4BDF-88B9-BF865CD48DB2}.Release|Any CPU.Deploy.0 = Release|Any CPU
-=======
-        {9BA0D0ED-ADE3-4A2D-97F0-7A31A282668E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-        {9BA0D0ED-ADE3-4A2D-97F0-7A31A282668E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-        {9BA0D0ED-ADE3-4A2D-97F0-7A31A282668E}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-        {9BA0D0ED-ADE3-4A2D-97F0-7A31A282668E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-        {9BA0D0ED-ADE3-4A2D-97F0-7A31A282668E}.Release|Any CPU.Build.0 = Release|Any CPU
-        {9BA0D0ED-ADE3-4A2D-97F0-7A31A282668E}.Release|Any CPU.Deploy.0 = Release|Any CPU
->>>>>>> 209f1bf2c74c8b011c27f4f865042bb02006d437
+        {4138F0FE-525F-4BE3-8069-893FD582C7AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+        {4138F0FE-525F-4BE3-8069-893FD582C7AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+        {4138F0FE-525F-4BE3-8069-893FD582C7AB}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+        {4138F0FE-525F-4BE3-8069-893FD582C7AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+        {4138F0FE-525F-4BE3-8069-893FD582C7AB}.Release|Any CPU.Build.0 = Release|Any CPU
+        {4138F0FE-525F-4BE3-8069-893FD582C7AB}.Release|Any CPU.Deploy.0 = Release|Any CPU
     EndGlobalSection
 EndGlobal
diff --git a/src/devices_generated/AD5328/samples/AD5328.Samples.nfproj b/src/devices_generated/AD5328/samples/AD5328.Samples.nfproj
@@ -8,11 +8,7 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-<<<<<<< HEAD
-    <ProjectGuid>{6DF271D6-BF4B-4157-A6AC-32B810BC3975}</ProjectGuid>
-=======
-    <ProjectGuid>{264ADA55-EBE3-48CB-A3D6-C9F00183CE8C}</ProjectGuid>
->>>>>>> 209f1bf2c74c8b011c27f4f865042bb02006d437
+    <ProjectGuid>{3F838663-81A4-45B3-99A1-1DC04C155404}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <FileAlignment>512</FileAlignment>

diff --git a/src/devices_generated/Ads1115/Ads1115.nfproj b/src/devices_generated/Ads1115/Ads1115.nfproj
@@ -8,11 +8,7 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-<<<<<<< HEAD
-    <ProjectGuid>{2D9441E2-F64F-4876-9C3F-1E1D010FEB50}</ProjectGuid>
-=======
-    <ProjectGuid>{07AC0697-656E-44CB-AF14-3A1942C782FD}</ProjectGuid>
->>>>>>> 209f1bf2c74c8b011c27f4f865042bb02006d437
+    <ProjectGuid>{23157B46-B815-4876-9FE7-A28B613DC044}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <FileAlignment>512</FileAlignment>

diff --git a/src/devices_generated/Ads1115/Ads1115.sln b/src/devices_generated/Ads1115/Ads1115.sln
@@ -3,15 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.30413.136
 MinimumVisualStudioVersion = 10.0.40219.1
-<<<<<<< HEAD
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "Ads1115", "Ads1115.nfproj", "{2D9441E2-F64F-4876-9C3F-1E1D010FEB50}"
+Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "Ads1115", "Ads1115.nfproj", "{23157B46-B815-4876-9FE7-A28B613DC044}"
 EndProject
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "Ads1115.Samples", "samples\\Ads1115.Samples.nfproj", "{CA079A53-86EE-470B-AAEB-2F07B12EF823}"
-=======
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "Ads1115", "Ads1115.nfproj", "{07AC0697-656E-44CB-AF14-3A1942C782FD}"
-EndProject
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "Ads1115.Samples", "samples\\Ads1115.Samples.nfproj", "{DB46D7A9-617C-4C54-801A-08450BC6D855}"
->>>>>>> 209f1bf2c74c8b011c27f4f865042bb02006d437
+Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "Ads1115.Samples", "samples\\Ads1115.Samples.nfproj", "{10894E56-C9D1-4BE9-BB0A-176906C2E882}"
 EndProject
 <!-- SAMPLES PROJECT PLACEHOLDER -->
 <!-- UNIT TESTS PROJECT PLACEHOLDER -->
@@ -22,20 +16,11 @@ Global
         Release|Any CPU = Release|Any CPU
     EndGlobalSection
     GlobalSection(ProjectConfigurationPlatforms) = postSolution
-<<<<<<< HEAD
-        {2D9441E2-F64F-4876-9C3F-1E1D010FEB50}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-        {2D9441E2-F64F-4876-9C3F-1E1D010FEB50}.Debug|Any CPU.Build.0 = Debug|Any CPU
-        {2D9441E2-F64F-4876-9C3F-1E1D010FEB50}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-        {2D9441E2-F64F-4876-9C3F-1E1D010FEB50}.Release|Any CPU.ActiveCfg = Release|Any CPU
-        {2D9441E2-F64F-4876-9C3F-1E1D010FEB50}.Release|Any CPU.Build.0 = Release|Any CPU
-        {2D9441E2-F64F-4876-9C3F-1E1D010FEB50}.Release|Any CPU.Deploy.0 = Release|Any CPU
-=======
-        {07AC0697-656E-44CB-AF14-3A1942C782FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-        {07AC0697-656E-44CB-AF14-3A1942C782FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-        {07AC0697-656E-44CB-AF14-3A1942C782FD}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-        {07AC0697-656E-44CB-AF14-3A1942C782FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-        {07AC0697-656E-44CB-AF14-3A1942C782FD}.Release|Any CPU.Build.0 = Release|Any CPU
-        {07AC0697-656E-44CB-AF14-3A1942C782FD}.Release|Any CPU.Deploy.0 = Release|Any CPU
->>>>>>> 209f1bf2c74c8b011c27f4f865042bb02006d437
+        {23157B46-B815-4876-9FE7-A28B613DC044}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+        {23157B46-B815-4876-9FE7-A28B613DC044}.Debug|Any CPU.Build.0 = Debug|Any CPU
+        {23157B46-B815-4876-9FE7-A28B613DC044}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+        {23157B46-B815-4876-9FE7-A28B613DC044}.Release|Any CPU.ActiveCfg = Release|Any CPU
+        {23157B46-B815-4876-9FE7-A28B613DC044}.Release|Any CPU.Build.0 = Release|Any CPU
+        {23157B46-B815-4876-9FE7-A28B613DC044}.Release|Any CPU.Deploy.0 = Release|Any CPU
     EndGlobalSection
 EndGlobal
diff --git a/src/devices_generated/Ads1115/samples/Ads1115.Samples.nfproj b/src/devices_generated/Ads1115/samples/Ads1115.Samples.nfproj
@@ -8,11 +8,7 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-<<<<<<< HEAD
-    <ProjectGuid>{CA079A53-86EE-470B-AAEB-2F07B12EF823}</ProjectGuid>
-=======
-    <ProjectGuid>{DB46D7A9-617C-4C54-801A-08450BC6D855}</ProjectGuid>
->>>>>>> 209f1bf2c74c8b011c27f4f865042bb02006d437
+    <ProjectGuid>{10894E56-C9D1-4BE9-BB0A-176906C2E882}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <FileAlignment>512</FileAlignment>

diff --git a/src/devices_generated/Adxl345/Adxl345.nfproj b/src/devices_generated/Adxl345/Adxl345.nfproj
@@ -8,11 +8,7 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-<<<<<<< HEAD
-    <ProjectGuid>{6352C35C-B851-489B-A68E-902516DFB72D}</ProjectGuid>
-=======
-    <ProjectGuid>{950CCB6F-49AE-41C1-8AE4-57431043A407}</ProjectGuid>
->>>>>>> 209f1bf2c74c8b011c27f4f865042bb02006d437
+    <ProjectGuid>{29EDC693-5A44-4DD5-96C5-88D335A1A333}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <FileAlignment>512</FileAlignment>

diff --git a/src/devices_generated/Adxl345/Adxl345.sln b/src/devices_generated/Adxl345/Adxl345.sln
@@ -3,15 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.30413.136
 MinimumVisualStudioVersion = 10.0.40219.1
-<<<<<<< HEAD
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "Adxl345", "Adxl345.nfproj", "{6352C35C-B851-489B-A68E-902516DFB72D}"
+Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "Adxl345", "Adxl345.nfproj", "{29EDC693-5A44-4DD5-96C5-88D335A1A333}"
 EndProject
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "Adxl345.Samples", "samples\\Adxl345.Samples.nfproj", "{6D8F1122-1FF0-4633-A93D-644B101F2BA7}"
-=======
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "Adxl345", "Adxl345.nfproj", "{950CCB6F-49AE-41C1-8AE4-57431043A407}"
-EndProject
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "Adxl345.Samples", "samples\\Adxl345.Samples.nfproj", "{D561BAE3-E81C-411B-987A-C06377E9A232}"
->>>>>>> 209f1bf2c74c8b011c27f4f865042bb02006d437
+Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "Adxl345.Samples", "samples\\Adxl345.Samples.nfproj", "{50BEAC6A-A52D-447F-BD27-E131D0D92953}"
 EndProject
 <!-- SAMPLES PROJECT PLACEHOLDER -->
 <!-- UNIT TESTS PROJECT PLACEHOLDER -->
@@ -22,20 +16,11 @@ Global
         Release|Any CPU = Release|Any CPU
     EndGlobalSection
     GlobalSection(ProjectConfigurationPlatforms) = postSolution
-<<<<<<< HEAD
-        {6352C35C-B851-489B-A68E-902516DFB72D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-        {6352C35C-B851-489B-A68E-902516DFB72D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-        {6352C35C-B851-489B-A68E-902516DFB72D}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-        {6352C35C-B851-489B-A68E-902516DFB72D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-        {6352C35C-B851-489B-A68E-902516DFB72D}.Release|Any CPU.Build.0 = Release|Any CPU
-        {6352C35C-B851-489B-A68E-902516DFB72D}.Release|Any CPU.Deploy.0 = Release|Any CPU
-=======
-        {950CCB6F-49AE-41C1-8AE4-57431043A407}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-        {950CCB6F-49AE-41C1-8AE4-57431043A407}.Debug|Any CPU.Build.0 = Debug|Any CPU
-        {950CCB6F-49AE-41C1-8AE4-57431043A407}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-        {950CCB6F-49AE-41C1-8AE4-57431043A407}.Release|Any CPU.ActiveCfg = Release|Any CPU
-        {950CCB6F-49AE-41C1-8AE4-57431043A407}.Release|Any CPU.Build.0 = Release|Any CPU
-        {950CCB6F-49AE-41C1-8AE4-57431043A407}.Release|Any CPU.Deploy.0 = Release|Any CPU
->>>>>>> 209f1bf2c74c8b011c27f4f865042bb02006d437
+        {29EDC693-5A44-4DD5-96C5-88D335A1A333}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+        {29EDC693-5A44-4DD5-96C5-88D335A1A333}.Debug|Any CPU.Build.0 = Debug|Any CPU
+        {29EDC693-5A44-4DD5-96C5-88D335A1A333}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+        {29EDC693-5A44-4DD5-96C5-88D335A1A333}.Release|Any CPU.ActiveCfg = Release|Any CPU
+        {29EDC693-5A44-4DD5-96C5-88D335A1A333}.Release|Any CPU.Build.0 = Release|Any CPU
+        {29EDC693-5A44-4DD5-96C5-88D335A1A333}.Release|Any CPU.Deploy.0 = Release|Any CPU
     EndGlobalSection
 EndGlobal
diff --git a/src/devices_generated/Adxl345/samples/Adxl345.Samples.nfproj b/src/devices_generated/Adxl345/samples/Adxl345.Samples.nfproj
@@ -8,11 +8,7 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-<<<<<<< HEAD
-    <ProjectGuid>{6D8F1122-1FF0-4633-A93D-644B101F2BA7}</ProjectGuid>
-=======
-    <ProjectGuid>{D561BAE3-E81C-411B-987A-C06377E9A232}</ProjectGuid>
->>>>>>> 209f1bf2c74c8b011c27f4f865042bb02006d437
+    <ProjectGuid>{50BEAC6A-A52D-447F-BD27-E131D0D92953}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <FileAlignment>512</FileAlignment>

diff --git a/src/devices_generated/Adxl357/Adxl357.nfproj b/src/devices_generated/Adxl357/Adxl357.nfproj
@@ -8,11 +8,7 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-<<<<<<< HEAD
-    <ProjectGuid>{364286C8-63C3-4660-9FB0-9EAAF10A57C2}</ProjectGuid>
-=======
-    <ProjectGuid>{A8CDA624-682A-4119-B70E-7D8A21858DE7}</ProjectGuid>
->>>>>>> 209f1bf2c74c8b011c27f4f865042bb02006d437
+    <ProjectGuid>{5A451F02-535C-4ACF-86C2-540E6EF0833B}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <FileAlignment>512</FileAlignment>

diff --git a/src/devices_generated/Adxl357/Adxl357.sln b/src/devices_generated/Adxl357/Adxl357.sln
@@ -3,15 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.30413.136
 MinimumVisualStudioVersion = 10.0.40219.1
-<<<<<<< HEAD
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "Adxl357", "Adxl357.nfproj", "{364286C8-63C3-4660-9FB0-9EAAF10A57C2}"
+Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "Adxl357", "Adxl357.nfproj", "{5A451F02-535C-4ACF-86C2-540E6EF0833B}"
 EndProject
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "Adxl357.Samples", "samples\\Adxl357.Samples.nfproj", "{3FAD3A87-51C5-4CCB-BCEA-3474378A7B84}"
-=======
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "Adxl357", "Adxl357.nfproj", "{A8CDA624-682A-4119-B70E-7D8A21858DE7}"
-EndProject
-Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "Adxl357.Samples", "samples\\Adxl357.Samples.nfproj", "{7ABFFB96-A555-4B1C-AB15-F103F4724AED}"
->>>>>>> 209f1bf2c74c8b011c27f4f865042bb02006d437
+Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "Adxl357.Samples", "samples\\Adxl357.Samples.nfproj", "{627A6EA9-17C7-4FC8-BC7C-D4F166489A4D}"
 EndProject
 <!-- SAMPLES PROJECT PLACEHOLDER -->
 <!-- UNIT TESTS PROJECT PLACEHOLDER -->
@@ -22,20 +16,11 @@ Global
         Release|Any CPU = Release|Any CPU
     EndGlobalSection
     GlobalSection(ProjectConfigurationPlatforms) = postSolution
-<<<<<<< HEAD
-        {364286C8-63C3-4660-9FB0-9EAAF10A57C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-        {364286C8-63C3-4660-9FB0-9EAAF10A57C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-        {364286C8-63C3-4660-9FB0-9EAAF10A57C2}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-        {364286C8-63C3-4660-9FB0-9EAAF10A57C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-        {364286C8-63C3-4660-9FB0-9EAAF10A57C2}.Release|Any CPU.Build.0 = Release|Any CPU
-        {364286C8-63C3-4660-9FB0-9EAAF10A57C2}.Release|Any CPU.Deploy.0 = Release|Any CPU
-=======
-        {A8CDA624-682A-4119-B70E-7D8A21858DE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-        {A8CDA624-682A-4119-B70E-7D8A21858DE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-        {A8CDA624-682A-4119-B70E-7D8A21858DE7}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-        {A8CDA624-682A-4119-B70E-7D8A21858DE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-        {A8CDA624-682A-4119-B70E-7D8A21858DE7}.Release|Any CPU.Build.0 = Release|Any CPU
-        {A8CDA624-682A-4119-B70E-7D8A21858DE7}.Release|Any CPU.Deploy.0 = Release|Any CPU
->>>>>>> 209f1bf2c74c8b011c27f4f865042bb02006d437
+        {5A451F02-535C-4ACF-86C2-540E6EF0833B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+        {5A451F02-535C-4ACF-86C2-540E6EF0833B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+        {5A451F02-535C-4ACF-86C2-540E6EF0833B}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+        {5A451F02-535C-4ACF-86C2-540E6EF0833B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+        {5A451F02-535C-4ACF-86C2-540E6EF0833B}.Release|Any CPU.Build.0 = Release|Any CPU
+        {5A451F02-535C-4ACF-86C2-540E6EF0833B}.Release|Any CPU.Deploy.0 = Release|Any CPU
     EndGlobalSection
 EndGlobal
diff --git a/src/devices_generated/Adxl357/samples/Adxl357.Samples.nfproj b/src/devices_generated/Adxl357/samples/Adxl357.Samples.nfproj
@@ -8,11 +8,7 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-<<<<<<< HEAD
-    <ProjectGuid>{3FAD3A87-51C5-4CCB-BCEA-3474378A7B84}</ProjectGuid>
-=======
-    <ProjectGuid>{7ABFFB96-A555-4B1C-AB15-F103F4724AED}</ProjectGuid>
->>>>>>> 209f1bf2c74c8b011c27f4f865042bb02006d437
+    <ProjectGuid>{627A6EA9-17C7-4FC8-BC7C-D4F166489A4D}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <FileAlignment>512</FileAlignment>

diff --git a/src/devices_generated/Ags01db/Ags01db.nfproj b/src/devices_generated/Ags01db/Ags01db.nfproj
@@ -8,11 +8,7 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectTypeGuids>{11A8DD76-328B-46DF-9F39-F559912D0360};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-<<<<<<< HEAD
-    <ProjectGuid>{BA242A23-53CA-4FE2-872D-7EA46ED426ED}</ProjectGuid>
-=======
-    <ProjectGuid>{73E9472D-2EA1-42E6-B941-B7F04807DAD7}</ProjectGuid>
->>>>>>> 209f1bf2c74c8b011c27f4f865042bb02006d437
+    <ProjectGuid>{085CDF82-804F-4096-9DD1-B4011B43E80C}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <FileAlignment>512</FileAlignment>