This repository was archived by the owner on Jan 24, 2021. It is now read-only.
Migrate to the new project system#2720
Merged
jchannon merged 48 commits intoNancyFx:masterfrom Jun 2, 2017
Merged
Conversation
5f2ab69 to
86d9d43
Compare
khellang
reviewed
Mar 24, 2017
| @@ -26,12 +26,12 @@ | |||
|
|
|||
| <ItemGroup> | |||
| <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20170106-08" /> | |||
Member
There was a problem hiding this comment.
Can't we drop -preview-20170106-08 here?
Member
Author
There was a problem hiding this comment.
Oh shit I thought I did that yesterday. I must've forgotten to push that commit.. If you check the Changes performed in this pull-request section above, I even added it after my last commit :D I'll push that out. Well spotted 👍
12 tasks
22e37b3 to
bbe815c
Compare
08e7cf2 to
75259ad
Compare
2f6322f to
8a49d83
Compare
8a49d83 to
e48bb0e
Compare
khellang
approved these changes
Jun 2, 2017
Member
Member
Author
4 tasks
38 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.


This pull-request will handle the parts of the #2719 Migrate to new project system epic, which are related to the main Nancy repository.
Todo
dotnet migrateand clean up things like solutions files and*.MSBuildfoldersNuGet.configand remove all sources excepthttps://api.nuget.org/v3/index.jsonNancy.ViewEngines.RazorandNancy.ViewEngines.Razor.BuildProviderscompile againNancy.Validation.DateAnnotationscompile againNancy.Validation.DateAnnotations.Testscompile againxunit 2.2.0,xunit.runners.visualstudio 2.2.0andMicrosoft.NET.Test.Sdk 15.0.0Directory.build.propsfile for projects intest/Directory.build.propsfile for projects insrc/.csprojforNancy.ViewEngines.Spark.TestsDirectory.build.propsfor projects insrc/Add all projects in(will be done as a separate pull-request)samples/toNancy.slnClean up(will be done as a separate pull-request)*.csprojfiles for projects insamples/*.csprojfilesSteps for updating the *.csproj files
*.csprojfiles to take an implicit dependency onNETStandard.Libraryinstead of explicitly cherry-pick packagesDisableImplicitFrameworkReferenceselement and set it totruefornet452(see gist and Allow projects to override implicit PackageReference items with item Include syntax dotnet/sdk#633 (comment))RuntimeFrameworkVersionelementNETStandard.LibraryandMicrosoft.NETCore.AppMicrosoft.Extensions.PlatformAbstractionsto1.1.0Microsoft.Extensions.DependencyModelto1.1.1(or1.1.0?)Microsoft.NETCore.Platformspackage in the test projectsnetcoreapp1.0tonetcoreapp1.1PackageTargetFallbackPackageId(will fallback toAssemblyName)AssemblyName(will fallback to the name of the.csproj)System.*andMicrosoft.*package reference to latest fornetstandardMigrate back to(will be done as a separate pull-request)netstandard1.3now that Microsoft.Extensions.DependencyModel supports it again (will have an API impact onStreamfor methods such asBegin/EndReadandBegin/EndWritewhich are not available onnetstandard1.3)See dotnet/sdk#633 for discussions on config options in
*.csprojSee Additions to the csproj format for .NET Core on MSDN for
*.csprojrecommendationsBuild scripts
build.sh
CAKE_VERSION=0.19.1DOTNET_VERSION=1.0.1DOTNET_INSTRALL_URI=https://raw.githubusercontent.com/dotnet/cli/rel/1.0.1/scripts/obtain/dotnet-install.shMSBuild wrapper for macOS
build.ps1
$CakeVersion = "0.19.1"$DotNetVersion = "1.0.1";$DotNetInstallerUri = "https://raw.githubusercontent.com/dotnet/cli/rel/1.0.1/scripts/obtain/dotnet-install.ps1";build.cake
Update all references of(will be done as a separate pull-request)netstandard1.6tonetstandard1.3Restore-NuGet-Packagestask to useNuGet.configMonoDebugandMonoRelease)net452builds on *nixUpdateProjectJsonVersionmethod so that it updates theVersionPrefixelement of*.csprojfiles instead ofproject.json(should be done after addingDirectory.build.props)Changes performed in this pull-request (will be updated as more commits are added)
*.MSBuildfolders insrc/andtest/Nancy.slnandNancy.sln.DotSettingsNancy.Next.slnandNancy.Next.sln.DotSettingstoNancy.slnandNancy.sln.DotSettingsdotnet migrateon the entire repositoryxunitto2.2.0xunit.runners.visualstudioto2.2.0Microsoft.NET.Test.Sdkto15.0.0NuGet.configbuild.sh(see above for list of changes)build.ps1(see above for list of changes)DisableImplicitFrameworkReferencesfor allnet452targets*.csprojfiles to take an implicit dependency onNETStandard.LibraryandMicrosoft.NETCore.AppMicrosoft.Extensions.PlatformAbstractionsto1.1.0Microsoft.Extensions.DependencyModelto1.1.1Microsoft.NETCore.Platforms packagein the test projectsnetcoreapp1.0tonetcoreapp1.1PackageTargetFallbackin all projectsPackageId*.csprojfilesTargetFrameworkselementsAssemblyNameelementSystem.*andMicrosoft.*package reference to latest fornetstandardDirectory.build.propsfile for projects intest/Directory.build.propsfile for projects insrc/Directory.build.propsfor projects insrc/.csprojforNancy.ViewEngines.Spark.Testsand added it toNancy.slnVersionPrefixtoVersioninsrc/Directory.build.propsNancy.slnbuild configurations