Cleanup

snowberry-software · Jan 12, 2025 · de6c7e8 · de6c7e8
1 parent 008e8be
commit de6c7e8
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 43 deletions.
diff --git a/src/FrameworkCompatibility.props b/src/FrameworkCompatibility.props
@@ -0,0 +1,11 @@
+<Project>
+    <!-- Framework Compatibility -->
+    <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
+        <PackageReference Include="System.Memory" Version="4.6.0" />
+        <PackageReference Include="IndexRange" Version="1.0.3" />
+    </ItemGroup>
+
+    <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
+        <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.0" />
+    </ItemGroup>
+</Project>
diff --git a/src/NuGetPackage.props b/src/NuGetPackage.props
@@ -49,15 +49,4 @@
         <!-- For GitHub -->
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
     </ItemGroup>
-
-    <!-- Framework Compatibility -->
-    <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-        <PackageReference Include="System.Memory" Version="4.6.0" />
-        <PackageReference Include="IndexRange" Version="1.0.3" />
-    </ItemGroup>
-
-    <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
-        <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.0" />
-    </ItemGroup>
-
 </Project>
diff --git a/src/Snowberry.IO.Common/Snowberry.IO.Common.csproj b/src/Snowberry.IO.Common/Snowberry.IO.Common.csproj
@@ -22,4 +22,6 @@
             <PackagePath>\</PackagePath>
         </None>
     </ItemGroup>
+
+    <Import Project="../FrameworkCompatibility.props" />
 </Project>
diff --git a/src/Snowberry.IO.SingleFile/Snowberry.IO.SingleFile.csproj b/src/Snowberry.IO.SingleFile/Snowberry.IO.SingleFile.csproj
@@ -14,32 +14,6 @@
         <PackageReadmeFile>README.md</PackageReadmeFile>
     </PropertyGroup>
 
-    <PropertyGroup>
-        <!-- Publish the repository URL in the built .nupkg (in the NuSpec <Repository> element) -->
-        <PublishRepositoryUrl>true</PublishRepositoryUrl>
-
-        <!-- Embed source files that are not tracked by the source control manager in the PDB -->
-        <EmbedUntrackedSources>true</EmbedUntrackedSources>
-
-        <!-- Recommended: Embed symbols containing Source Link in the main file (exe/dll) -->
-        <DebugType>embedded</DebugType>
-    </PropertyGroup>
-
-    <!-- Deterministic Builds -->
-    <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
-        <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
-        <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
-    </PropertyGroup>
-
-    <!-- SourceLink -->
-    <ItemGroup>
-        <!-- For GitHub -->
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
-    </ItemGroup>
-
     <ItemGroup>
         <None Include="README.md">
             <Pack>True</Pack>

diff --git a/src/Snowberry.IO.sln b/src/Snowberry.IO.sln
@@ -17,14 +17,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Benchmarks", "Benchmarks",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Snowberry.IO.SourceGenerator", "Snowberry.IO.SourceGenerator\Snowberry.IO.SourceGenerator.csproj", "{17701010-A115-4E43-9BC0-0D0FFD0E4C20}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Addons", "Addons", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SingleFile", "SingleFile", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Snowberry.IO.SingleFile", "Snowberry.IO.SingleFile\Snowberry.IO.SingleFile.csproj", "{135FBE22-9D4D-FF2A-0D6B-B09EF3D1C6FE}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Snowberry.IO.SingleFile.CLI", "Snowberry.IO.SingleFile.CLI\Snowberry.IO.SingleFile.CLI.csproj", "{F5A3FDCC-6423-F4E5-D1CC-5D4DE54EA124}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AddOns", "AddOns", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E2}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SingleFile", "SingleFile", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -66,9 +66,9 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{029FFEBB-9ABD-4C80-839E-D8F0C363BF24} = {BF911002-AABA-4993-AD65-63808B1F6E96}
 		{C1B7175E-3128-492A-8DCB-5DEA4415CAB7} = {48C2A5C3-51D7-4E22-8BE2-12B120DD3D09}
-		{02EA681E-C7D8-13C7-8484-4AC65E1B71E8} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
 		{135FBE22-9D4D-FF2A-0D6B-B09EF3D1C6FE} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
 		{F5A3FDCC-6423-F4E5-D1CC-5D4DE54EA124} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
+		{02EA681E-C7D8-13C7-8484-4AC65E1B71E8} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E2}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {961967CF-F3F5-41D4-9BCF-3A1C1C588103}

diff --git a/src/Snowberry.IO/Snowberry.IO.csproj b/src/Snowberry.IO/Snowberry.IO.csproj
@@ -25,4 +25,4 @@
     <ItemGroup>
         <ProjectReference Include="..\Snowberry.IO.Common\Snowberry.IO.Common.csproj" />
     </ItemGroup>
-</Project>
+</Project>