Skip to content

Commit

Permalink
Revert "central package management"
Browse files Browse the repository at this point in the history
This reverts commit 7310e09.
  • Loading branch information
SimonCropp committed May 28, 2024
1 parent 7310e09 commit 2d43083
Show file tree
Hide file tree
Showing 12 changed files with 51 additions and 82 deletions.
8 changes: 4 additions & 4 deletions src/ApprovalTests.MSTest/ApprovalTests.MSTest.csproj
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@

<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net48;net8.0</TargetFrameworks>
<DebugType>full</DebugType>
</PropertyGroup>
<ItemGroup>
<Using Remove="System.Net.Http" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="MSTest.TestAdapter" />
<PackageReference Include="MSTest.TestFramework" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="MSTest.TestAdapter" Version="3.3.1" />
<PackageReference Include="MSTest.TestFramework" Version="3.3.1" />
<ProjectReference Include="..\ApprovalUtilities\ApprovalUtilities.csproj" />
<ProjectReference Include="..\ApprovalTests\ApprovalTests.csproj" />
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
Expand Down
8 changes: 4 additions & 4 deletions src/ApprovalTests.MSpec/ApprovalTests.MSpec.csproj
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@

<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net461</TargetFrameworks>
<Optimize>false</Optimize>
<SignAssembly>false</SignAssembly>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Machine.Specifications" />
<PackageReference Include="Machine.Specifications.Should" />
<PackageReference Include="ModuleInit.Fody" />
<PackageReference Include="Machine.Specifications" Version="1.0.0" />
<PackageReference Include="Machine.Specifications.Should" Version="1.0.0" />
<PackageReference Include="ModuleInit.Fody" Version="2.1.0" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down
8 changes: 4 additions & 4 deletions src/ApprovalTests.NUnit3/ApprovalTests.NUnit3.csproj
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@

<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net48;net8.0</TargetFrameworks>
<DebugType>full</DebugType>
</PropertyGroup>
<ItemGroup>
<Using Remove="System.Net.Http" />
<PackageReference Include="NUnit" />
<PackageReference Include="NUnit3TestAdapter" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="NUnit" Version="3.14.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<ProjectReference Include="..\ApprovalTests\ApprovalTests.csproj" />
<ProjectReference Include="..\ApprovalUtilities\ApprovalUtilities.csproj" />
</ItemGroup>
Expand Down
16 changes: 8 additions & 8 deletions src/ApprovalTests.Tests/ApprovalTests.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@

<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net48;net8.0</TargetFrameworks>
<DebugType>full</DebugType>
</PropertyGroup>
<ItemGroup>
<Using Remove="System.Net.Http" />
<PackageReference Include="itext7.bouncy-castle-adapter" />
<PackageReference Include="MarkdownSnippets.MsBuild" PrivateAssets="all" />
<PackageReference Include="itext7" />
<PackageReference Include="NUnit" />
<PackageReference Include="NUnit3TestAdapter" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="System.Management" />
<PackageReference Include="itext7.bouncy-castle-adapter" Version="8.0.4" />
<PackageReference Include="MarkdownSnippets.MsBuild" Version="27.0.2" PrivateAssets="all" />
<PackageReference Include="itext7" Version="8.0.4" />
<PackageReference Include="NUnit" Version="4.1.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="System.Management" Version="8.0.0" />
<ProjectReference Include="..\ApprovalTests\ApprovalTests.csproj" />
<ProjectReference Include="..\ApprovalUtilities\ApprovalUtilities.csproj" />

Expand Down
8 changes: 4 additions & 4 deletions src/ApprovalTests.Xunit2/ApprovalTests.Xunit2.csproj
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@

<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<DebugType>full</DebugType>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="xunit" />
<PackageReference Include="xunit.runner.visualstudio" PrivateAssets="all" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="xunit" Version="2.8.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<ProjectReference Include="..\ApprovalTests\ApprovalTests.csproj" />
<ProjectReference Include="..\ApprovalUtilities\ApprovalUtilities.csproj" />
</ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion src/ApprovalTests.sln
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{CC679657-AF36-470E-9976-BB00E6792F32}"
ProjectSection(SolutionItems) = preProject
Directory.Build.props = Directory.Build.props
Directory.Packages.props = Directory.Packages.props
global.json = global.json
appveyor.yml = appveyor.yml
.editorconfig = .editorconfig
Expand Down
16 changes: 8 additions & 8 deletions src/ApprovalTests/ApprovalTests.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT'">net472;net48</TargetFrameworks>
Expand All @@ -10,14 +10,14 @@
</PropertyGroup>
<ItemGroup>
<Using Remove="System.Net.Http" />
<PackageReference Include="Polyfill" PrivateAssets="all" />
<PackageReference Include="Polyfill" Version="5.2.2" PrivateAssets="all" />
<Compile Include="..\ApprovalUtilities\InternalsVisibleTo.cs" Link="InternalsVisibleTo.cs" />
<PackageReference Include="DiffEngine" />
<PackageReference Include="EmptyFiles" PrivateAssets="None" />
<PackageReference Include="Fody" PrivateAssets="all" />
<PackageReference Include="Publicize.Fody" PrivateAssets="All" />
<PackageReference Include="Virtuosity.Fody" PrivateAssets="All" />
<PackageReference Include="TextCopy" />
<PackageReference Include="DiffEngine" Version="15.4.0" />
<PackageReference Include="EmptyFiles" Version="8.2.0" PrivateAssets="None" />
<PackageReference Include="Fody" Version="6.8.0" PrivateAssets="all" />
<PackageReference Include="Publicize.Fody" Version="1.8.0" PrivateAssets="All" />
<PackageReference Include="Virtuosity.Fody" Version="3.1.1" PrivateAssets="All" />
<PackageReference Include="TextCopy" Version="6.2.1" />
<ProjectReference Include="..\ApprovalUtilities\ApprovalUtilities.csproj" />
<Content Include="build\ApprovalTests.props" PackagePath="build\ApprovalTests.props" />
<Content Include="buildMultiTargeting\ApprovalTests.props" PackagePath="buildMultiTargeting\ApprovalTests.props" />
Expand Down
8 changes: 4 additions & 4 deletions src/ApprovalUtilities.Tests/ApprovalUtilities.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@

<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net48;net8.0</TargetFrameworks>
<DebugType>full</DebugType>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="xunit" />
<PackageReference Include="xunit.runner.visualstudio" PrivateAssets="all" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="xunit" Version="2.8.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<ProjectReference Include="..\ApprovalTests\ApprovalTests.csproj" />
<ProjectReference Include="..\ApprovalUtilities\ApprovalUtilities.csproj" />
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
Expand Down
12 changes: 6 additions & 6 deletions src/ApprovalUtilities/ApprovalUtilities.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT'">net472;net48</TargetFrameworks>
Expand All @@ -10,10 +10,10 @@
</PropertyGroup>
<ItemGroup>
<Using Remove="System.Net.Http" />
<PackageReference Include="Fody" PrivateAssets="all" />
<PackageReference Include="Publicize.Fody" PrivateAssets="All" />
<PackageReference Include="System.Management" />
<PackageReference Include="Virtuosity.Fody" PrivateAssets="All" />
<PackageReference Include="System.Data.SqlClient" />
<PackageReference Include="Fody" Version="6.8.0" PrivateAssets="all" />
<PackageReference Include="Publicize.Fody" Version="1.8.0" PrivateAssets="All" />
<PackageReference Include="System.Management" Version="8.0.0" />
<PackageReference Include="Virtuosity.Fody" Version="3.1.1" PrivateAssets="All" />
<PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
</ItemGroup>
</Project>
8 changes: 4 additions & 4 deletions src/AssembliesExistInBin/AssembliesExistInBin.csproj
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@

<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6</TargetFrameworks>
<!-- no CopyLocalLockFileAssemblies=false. So approvalTests.dll is resolved from bin dir -->
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NUnit" />
<PackageReference Include="NUnit3TestAdapter" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="NUnit" Version="3.13.2" />
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
<ProjectReference Include="..\ApprovalTests\ApprovalTests.csproj" />
<ProjectReference Include="..\ApprovalUtilities\ApprovalUtilities.csproj" />
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
Expand Down
10 changes: 5 additions & 5 deletions src/AssembliesExistInNuget/AssembliesExistInNuget.csproj
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@

<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6</TargetFrameworks>
<!-- do not copy reference assemblies to bin. So approvalTests.dll is resolved from nuget cache dir -->
<CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="ApprovalTests" />
<PackageReference Include="NUnit" />
<PackageReference Include="NUnit3TestAdapter" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="ApprovalTests" Version="$(Version)" />
<PackageReference Include="NUnit" Version="3.13.2" />
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
<None Update="ExistInNugetTests.ShouldResolveCorrectPath.approved.txt">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
Expand Down
30 changes: 0 additions & 30 deletions src/Directory.Packages.props

This file was deleted.

0 comments on commit 2d43083

Please sign in to comment.