Skip to content

Commit

Permalink
Merge Moq.csproj and Moq.NetCore.csproj
Browse files Browse the repository at this point in the history
The separate .NET Framework 4.5 and .NET Standard 1.3 projects are
merged into a single multi-targeting `.csproj`.

Note that this breaks GitLink, which isn't too much of a problem, as
the `.pdb` files aren't currently included in the Moq NuGet package
anyway, but this will have to be addressed in a later commit.
  • Loading branch information
stakx committed Jul 14, 2017
1 parent 1748529 commit cbdeb25
Show file tree
Hide file tree
Showing 7 changed files with 99 additions and 288 deletions.
2 changes: 1 addition & 1 deletion Moq.NetCore.sln
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClassLibrary2.NetCore", "Un
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moq.NetCore.Tests", "UnitTests\Moq.NetCore.Tests.csproj", "{193B5DD4-77B8-4B36-8E62-C0E6BD733FAA}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moq.NetCore", "Source\Moq.NetCore.csproj", "{4BA03097-04CA-4B7C-B618-5AAD1B27B4B5}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moq", "Source\Moq.csproj", "{4BA03097-04CA-4B7C-B618-5AAD1B27B4B5}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
6 changes: 3 additions & 3 deletions Moq.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -187,10 +187,10 @@ Version 1.0
</dependencies>
</metadata>
<files>
<file src="Source\bin\$configuration$\Moq.dll" target="lib\net45" />
<file src="Source\bin\$configuration$\net45\Moq.dll" target="lib\net45" />
<!-- Could not verify that GitLink works, so disabling pdbs for now -->
<!--<file src="Source\bin\$configuration$\Moq.pdb" target="lib\net45" />-->
<file src="Source\bin\$configuration$\Moq.xml" target="lib\net45" />
<!--<file src="Source\bin\$configuration$\net45\Moq.pdb" target="lib\net45" />-->
<file src="Source\bin\$configuration$\net45\Moq.xml" target="lib\net45" />
<file src="Source\bin\$configuration$\netstandard1.3\Moq.dll" target="lib\netstandard1.3" />
<!-- Could not verify that GitLink works, so disabling pdbs for now -->
<!--<file src="Source\bin\$configuration$\netstandard1.3\Moq.pdb" target="lib\netstandard1.3" />-->
Expand Down
76 changes: 0 additions & 76 deletions Source/Moq.NetCore.csproj

This file was deleted.

Loading

0 comments on commit cbdeb25

Please sign in to comment.