This repository has been archived by the owner on Jan 24, 2021. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 1.5k
Migrate to the new project system #2720
Merged
jchannon
merged 48 commits into
NancyFx:master
from
thecodejunkie:migrate-project-format
Jun 2, 2017
Merged
Migrate to the new project system #2720
jchannon
merged 48 commits into
NancyFx:master
from
thecodejunkie:migrate-project-format
Jun 2, 2017
Conversation
This file contains 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
thecodejunkie
force-pushed
the
migrate-project-format
branch
from
March 23, 2017 10:03
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" /> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can't we drop -preview-20170106-08
here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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
thecodejunkie
force-pushed
the
migrate-project-format
branch
from
June 1, 2017 20:01
22e37b3
to
bbe815c
Compare
thecodejunkie
force-pushed
the
migrate-project-format
branch
2 times, most recently
from
June 1, 2017 21:31
08e7cf2
to
75259ad
Compare
thecodejunkie
force-pushed
the
migrate-project-format
branch
3 times, most recently
from
June 2, 2017 08:28
2f6322f
to
8a49d83
Compare
thecodejunkie
force-pushed
the
migrate-project-format
branch
from
June 2, 2017 08:30
8a49d83
to
e48bb0e
Compare
khellang
approved these changes
Jun 2, 2017
thecodejunkie
changed the title
[WIP] Migrate to the new project system
Migrate to the new project system
Jun 2, 2017
4 tasks
38 tasks
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 migrate
and clean up things like solutions files and*.MSBuild
foldersNuGet.config
and remove all sources excepthttps://api.nuget.org/v3/index.json
Nancy.ViewEngines.Razor
andNancy.ViewEngines.Razor.BuildProviders
compile againNancy.Validation.DateAnnotations
compile againNancy.Validation.DateAnnotations.Tests
compile againxunit 2.2.0
,xunit.runners.visualstudio 2.2.0
andMicrosoft.NET.Test.Sdk 15.0.0
Directory.build.props
file for projects intest/
Directory.build.props
file for projects insrc/
.csproj
forNancy.ViewEngines.Spark.Tests
Directory.build.props
for projects insrc/
Add all projects in(will be done as a separate pull-request)samples/
toNancy.sln
Clean up(will be done as a separate pull-request)*.csproj
files for projects insamples/
*.csproj
filesSteps for updating the *.csproj files
*.csproj
files to take an implicit dependency onNETStandard.Library
instead of explicitly cherry-pick packagesDisableImplicitFrameworkReferences
element and set it totrue
fornet452
(see gist and Allow projects to override implicit PackageReference items with item Include syntax dotnet/sdk#633 (comment))RuntimeFrameworkVersion
elementNETStandard.Library
andMicrosoft.NETCore.App
Microsoft.Extensions.PlatformAbstractions
to1.1.0
Microsoft.Extensions.DependencyModel
to1.1.1
(or1.1.0
?)Microsoft.NETCore.Platforms
package in the test projectsnetcoreapp1.0
tonetcoreapp1.1
PackageTargetFallback
PackageId
(will fallback toAssemblyName
)AssemblyName
(will fallback to the name of the.csproj
)System.*
andMicrosoft.*
package reference to latest fornetstandard
Migrate back to(will be done as a separate pull-request)netstandard1.3
now that Microsoft.Extensions.DependencyModel supports it again (will have an API impact onStream
for methods such asBegin/EndRead
andBegin/EndWrite
which are not available onnetstandard1.3
)See dotnet/sdk#633 for discussions on config options in
*.csproj
See Additions to the csproj format for .NET Core on MSDN for
*.csproj
recommendationsBuild scripts
build.sh
CAKE_VERSION=0.19.1
DOTNET_VERSION=1.0.1
DOTNET_INSTRALL_URI=https://raw.githubusercontent.com/dotnet/cli/rel/1.0.1/scripts/obtain/dotnet-install.sh
MSBuild 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.6
tonetstandard1.3
Restore-NuGet-Packages
task to useNuGet.config
MonoDebug
andMonoRelease
)net452
builds on *nixUpdateProjectJsonVersion
method so that it updates theVersionPrefix
element of*.csproj
files instead ofproject.json
(should be done after addingDirectory.build.props
)Changes performed in this pull-request (will be updated as more commits are added)
*.MSBuild
folders insrc/
andtest/
Nancy.sln
andNancy.sln.DotSettings
Nancy.Next.sln
andNancy.Next.sln.DotSettings
toNancy.sln
andNancy.sln.DotSettings
dotnet migrate
on the entire repositoryxunit
to2.2.0
xunit.runners.visualstudio
to2.2.0
Microsoft.NET.Test.Sdk
to15.0.0
NuGet.config
build.sh
(see above for list of changes)build.ps1
(see above for list of changes)DisableImplicitFrameworkReferences
for allnet452
targets*.csproj
files to take an implicit dependency onNETStandard.Library
andMicrosoft.NETCore.App
Microsoft.Extensions.PlatformAbstractions
to1.1.0
Microsoft.Extensions.DependencyModel
to1.1.1
Microsoft.NETCore.Platforms package
in the test projectsnetcoreapp1.0
tonetcoreapp1.1
PackageTargetFallback
in all projectsPackageId
*.csproj
filesTargetFrameworks
elementsAssemblyName
elementSystem.*
andMicrosoft.*
package reference to latest fornetstandard
Directory.build.props
file for projects intest/
Directory.build.props
file for projects insrc/
Directory.build.props
for projects insrc/
.csproj
forNancy.ViewEngines.Spark.Tests
and added it toNancy.sln
VersionPrefix
toVersion
insrc/Directory.build.props
Nancy.sln
build configurations