Fixed/reverted some changes

LTRData · Sep 2, 2024 · ef576b0 · ef576b0
1 parent 708449d
commit ef576b0
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 27 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,9 @@
+bin/
+obj/
+Build/
+Debug/
+Release/
+
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 ##
@@ -7,6 +13,8 @@
 *.rsuser
 *.suo
 *.user
+*.lock.json
+LaunchSettings.json
 *.userosscache
 *.sln.docstates
 
@@ -127,6 +135,9 @@ ipch/
 # TFS 2012 Local Workspace
 $tf/
 
+# Tests
+Tests/LibraryTests/TestResults/
+
 # Guidance Automation Toolkit
 *.gpState
 
@@ -234,6 +245,7 @@ _pkginfo.txt
 ClientBin/
 ~$*
 *~
+/testenvironments.json
 *.dbmdl
 *.dbproj.schemaview
 *.jfm

diff --git a/Tests/LibraryTests/LibraryTests.csproj b/Tests/LibraryTests/LibraryTests.csproj
@@ -1,49 +1,55 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net48;net462</TargetFrameworks>
+    <TargetFrameworks>net8.0;net48;net46</TargetFrameworks>
     <DebugType>portable</DebugType>
     <AssemblyName>LibraryTests</AssemblyName>
     <PackageId>LibraryTests</PackageId>
     <SignAssembly>false</SignAssembly>
     <LangVersion>Latest</LangVersion>
     <AssemblyOriginatorKeyFile>../../SigningKey.snk</AssemblyOriginatorKeyFile>
-	<SkipDefaultAdapters>true</SkipDefaultAdapters>
-	<DisableSharedTestHost>true</DisableSharedTestHost>
+    <SkipDefaultAdapters>true</SkipDefaultAdapters>
+    <DisableSharedTestHost>true</DisableSharedTestHost>
   </PropertyGroup>
+
   <ItemGroup>
     <None Remove="_Data\*" />
     <EmbeddedResource Include="_Data\*" />
   </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\Utilities\DiscUtils.Diagnostics\DiscUtils.Diagnostics.csproj" />
     <ProjectReference Include="..\..\Library\DiscUtils.Core\DiscUtils.Core.csproj" />
     <ProjectReference Include="..\..\Library\DiscUtils\DiscUtils.csproj" />
   </ItemGroup>
 
-	<ItemGroup Condition="'$(TargetFramework)' == 'net46' Or '$(TargetFramework)' == 'net461'">
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.*" />
-		<PackageReference Include="System.IO.Compression" Version="*" />
-		<PackageReference Include="xunit" Version="2.9.*" />
-		<PackageReference Include="xunit.extensibility.core" Version="2.9.*" />
-		<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-			<PrivateAssets>all</PrivateAssets>
-		</PackageReference>
-	</ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework.CompareTo(`net462`))' &gt;= 0 And '$(TargetFramework.CompareTo(`net48`))' &lt;=0 Or '$(TargetFramework)' == 'netcoreapp3.1'">
+  <ItemGroup Condition="'$(TargetFramework.CompareTo(`net462`))' &lt; 0">
+    <PackageReference Include="K4os.Compression.LZ4" Version="1.2.*" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.*" />
+    <PackageReference Include="System.IO.Compression" Version="*" />
+    <PackageReference Include="xunit" Version="2.9.*" />
+    <PackageReference Include="xunit.extensibility.core" Version="2.9.*" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework.CompareTo(`net462`))' &gt;= 0 And '$(TargetFramework.CompareTo(`net45`))' &lt; 0">
+    <PackageReference Include="K4os.Compression.LZ4" Version="1.3.*" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.*" />
     <PackageReference Include="System.IO.Compression" Version="*" />
-	  <PackageReference Include="xunit" Version="2.9.*" />
-	  <PackageReference Include="xunit.extensibility.core" Version="2.9.*" />
-	  <PackageReference Include="xunit.runner.visualstudio" Version="2.8.*">
-		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-		  <PrivateAssets>all</PrivateAssets>
-	  </PackageReference>
+    <PackageReference Include="xunit" Version="2.9.*" />
+    <PackageReference Include="xunit.extensibility.core" Version="2.9.*" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.*">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
   </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework.CompareTo(`net481`))' &gt;= 0 And '$(TargetFramework)' != 'netcoreapp3.1'">
+
+  <ItemGroup Condition="'$(TargetFramework.CompareTo(`net5`))' &gt;= 0">
+    <PackageReference Include="K4os.Compression.LZ4" Version="1.3.*" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="*" />
     <PackageReference Include="System.IO.Compression" Version="*" />
     <PackageReference Include="xunit.extensibility.core" Version="*" />
@@ -53,19 +59,20 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
   </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="K4os.Compression.LZ4" Version="1.3.8" />
-  </ItemGroup>
+
   <ItemGroup>
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>
+
   <ItemGroup>
     <Folder Include="Swap\Data\" />
     <Folder Include="Wim\Data\" />
   </ItemGroup>
+
   <ItemGroup>
     <None Update="plist.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
-</Project>
+
+</Project>