Post merge fix

MindscapeHQ · Jun 7, 2023 · 10ffb3d · 10ffb3d
1 parent 7d3ef29
commit 10ffb3d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/AllStandardProjects.sln b/AllStandardProjects.sln
@@ -34,7 +34,6 @@ EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mindscape.Raygun4Net4.Integration.Tests", "Mindscape.Raygun4Net4.Intergration.Tests\Mindscape.Raygun4Net4.Integration.Tests.csproj", "{7C77FC80-08E0-4B41-AEEC-8D27F93E91E2}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mindscape.Raygun4Net.Common", "Mindscape.Raygun4Net.Common\Mindscape.Raygun4Net.Common.csproj", "{F6087DF7-625D-45F7-AF91-A0C53DA312F1}"
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mindscape.Raygun4Net.Common", "Mindscape.Raygun4Net.Common\Mindscape.Raygun4Net.Common.csproj", "{F6087DF7-625D-45F7-AF91-A0C53DA312F1}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/Mindscape.Raygun4Net.Common/Mindscape.Raygun4Net.Common.csproj b/Mindscape.Raygun4Net.Common/Mindscape.Raygun4Net.Common.csproj
@@ -6,11 +6,6 @@
 
   <ItemGroup >
     <Reference Include="System.Net"  Condition=" '$(TargetFramework)' != 'net6' " />
-    <TargetFrameworks>net4;net45;netstandard2.0;net6</TargetFrameworks>
-  </PropertyGroup>
-
-  <ItemGroup >
-    <Reference Include="System.Net"  Condition=" '$(TargetFramework)' == 'net4' Or '$(TargetFramework)' == 'net45'  " />
   </ItemGroup>
 
 </Project>
diff --git a/Mindscape.Raygun4Net4.Intergration.Tests/Mindscape.Raygun4Net4.Integration.Tests.csproj b/Mindscape.Raygun4Net4.Intergration.Tests/Mindscape.Raygun4Net4.Integration.Tests.csproj
@@ -29,4 +29,6 @@
     <ProjectReference Include="..\Mindscape.Raygun4Net4\Mindscape.Raygun4Net4.csproj" />
   </ItemGroup>
 
+
+
 </Project>