Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updated projects to netstandard2.0 #37

Merged
merged 4 commits into from
Jan 16, 2020

Conversation

mtrtm
Copy link
Collaborator

@mtrtm mtrtm commented Jan 15, 2020

updated projects to .net standard 2.0 for compatibility with framework 4.6.1 and up and .net core. Now using new project structure as well as new nuget project reference instead of package reference. Updated Autofac and NSubstitute to latest versions (4.9.4 and 4.2.1, respectively). Added ignore for .vs folder. Didn't keep the .nuget solution folder because I don't see it in git. Used Jason's changes for unit test fix: Jason-eCargo@c7e62b2. Used Visual Studio 2019 to create all these changes. Chose 4.9.4 as nuget package version since that is the version of Autofac it references

mtrtm added 3 commits January 15, 2020 14:45
…k 4.6.1 and up and .net core. Now using new project structure as well as new nuget project reference instead of package reference. Updated Autofac and NSubstitute to latest versions (4.9.4 and 4.2.1, respectively). Added ignore for .vs folder. Didn't keep the .nuget solution folder because I don't see it in git. Used Jason's changes for unit test fix: Jason-eCargo@c7e62b2.   Used Visual Studio 2019 to create all these changes.  Chose 4.9.4 as nuget package version since that is the version of Autofac it references
main repo master branch merged into my fork repo master branch
# Conflicts:
#	AutofacContrib.NSubstitute.Tests/AutofacContrib.NSubstitute.Tests.csproj
#	AutofacContrib.NSubstitute.Tests/packages.config
#	AutofacContrib.NSubstitute/AutofacContrib.NSubstitute.csproj
#	AutofacContrib.NSubstitute/AutofacContrib.NSubstitute.nuspec
#	AutofacContrib.NSubstitute/packages.config
@AppVeyorBot
Copy link

@mtrtm
Copy link
Collaborator Author

mtrtm commented Jan 15, 2020

I'd love to get this PR done. It includes changes in another PR, converts to .net standard (making this available/working on latest .net core 2.2, 3.0, 3.1), and would fix a few issues.

If we could get this merged to master and a new nuget package out I'd really appreciate it. This would allow us to stop using our internal package for this and let everyone else in the world use with new code, updated nuget packages, .net framework and .net core.

@robdmoore I'd be happy to help in any further way I can. If you want to add me to maintainers I'd be happy to help

@AppVeyorBot
Copy link

@robdmoore robdmoore merged commit 039f1dd into MRCollective:master Jan 16, 2020
@robdmoore
Copy link
Member

Great work @mtrtm. Thanks for this. I've released this to nuget.

I've also added you as a repository maintainer. cc @MattDavies

@mtrtm
Copy link
Collaborator Author

mtrtm commented Jan 16, 2020

@robdmoore thanks so much!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants