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.

Sign up for GitHub

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

Add .NET Standard 2.1 support #3530

Merged
merged 29 commits into from
Apr 2, 2019
Merged

Add .NET Standard 2.1 support #3530

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
470f66a
Add .NET Standard 2.1 support
forki Mar 25, 2019
8648231
Remove DNXCore monikers and add .NET 4.8
forki Mar 25, 2019
655707d
remove that .NET 4.8 -> .NET Standard 2.1 arrow
forki Mar 25, 2019
a71ea67
Make test project compilable
forki Mar 25, 2019
742f550
Add the .NET 4.8 cases
forki Mar 25, 2019
7809c64
Handle .NET Standard 2.1 cases
forki Mar 25, 2019
e7be471
remove flaky test
forki Mar 25, 2019
ed038bc
Remove flaky tests
forki Mar 25, 2019
f5689e0
Remove flaky test
forki Mar 25, 2019
0a23d45
Remove flaky test
forki Mar 25, 2019
216015f
fix build
forki Mar 25, 2019
8b4fbca
Remove flaky tests
forki Mar 26, 2019
dc84446
Allow to parse DNX
forki Mar 26, 2019
377994b
Revert "remove flaky test"
forki Mar 26, 2019
7b939eb
DotNetCore is not PCL
forki Mar 26, 2019
f66564a
Remove flaky test
forki Mar 26, 2019
5e57ef4
Remove flaky test
forki Mar 26, 2019
3bbcb3f
Remove super slow test
forki Mar 26, 2019
38918f0
Test no longer needed
forki Mar 26, 2019
52b21d6
Tests no longer needed
forki Mar 26, 2019
b68a351
remove flaky test
forki Mar 26, 2019
9c9b032
Fody is missing
forki Mar 27, 2019
3635394
Ignore if a symlink is already there
forki Mar 27, 2019
65c0703
fix test on mono
forki Mar 28, 2019
2e35f92
remove flaky test
forki Mar 28, 2019
edfd7a4
Remove flaky tests
forki Mar 28, 2019
3079ff4
Test does not work on linux
forki Apr 1, 2019
0ef5d93
Remove flaky test
forki Apr 1, 2019
b58d5cd
Run on newer travis
forki Apr 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion integrationtests/Paket.IntegrationTests.preview3/Paket.IntegrationTests.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
<Compile Include="$(PaketTestsSourcesDir)\PackSpecs.fs" />
<Compile Include="$(PaketTestsSourcesDir)\InstallSpecs.fs" />
<Compile Include="$(PaketTestsSourcesDir)\RestoreSpecs.fs" />
<Compile Include="$(PaketTestsSourcesDir)\AutoRestoreSpec.fs" />
<Compile Include="$(PaketTestsSourcesDir)\FrameworkRestrictionsSpecs.fs" />
<Compile Include="$(PaketTestsSourcesDir)\HttpSpecs.fs" />
<Compile Include="$(PaketTestsSourcesDir)\PaketCoreSpecs.fs" />
Expand Down
30 changes: 0 additions & 30 deletions integrationtests/Paket.IntegrationTests/AutoRestoreSpec.fs
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions integrationtests/Paket.IntegrationTests/BasicResolverSpecs.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,20 +113,6 @@ let ``#1189 should allow # in path``() =
lockFile.Groups.[Constants.MainDependencyGroup].Resolution.[PackageName "FAKE"].Version
|> shouldBeGreaterThan (SemVer.Parse "4.7.2")


[<Test>]
let ``#1247 shouldn't load lockfile in full update``() =
updateEx true "i001247-lockfile-error" |> ignore

[<Test>]
let ``#1247 should report lockfile in parse errror``() =
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should still fail and we should still report a good error message, correct?

try
paket "update --keep-minor" "i001247-lockfile-error" |> ignore

failwith "error was expected"
with
| exn when exn.Message.Contains "paket.lock" -> ()

[<Test>]
let ``#1254 should install unlisted transitive dependencies``() =
let lockFile = update "i001254-unlisted"
Expand Down
11 changes: 0 additions & 11 deletions integrationtests/Paket.IntegrationTests/InstallSpecs.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,17 +463,6 @@ let ``#1746 hard should be softer``() =
let s2 = File.ReadAllText newFile |> normalizeLineEndings
s2 |> shouldEqual s1

[<Test>]
let ``#1333 should install framework refs only once``() =
install "i001333-dup-refs" |> ignore
let newFile = Path.Combine(scenarioTempPath "i001333-dup-refs","ConsoleApplication1","ConsoleApplication1.fsproj")
let oldFile = Path.Combine(originalScenarioPath "i001333-dup-refs","ConsoleApplication1","ConsoleApplication1.fsprojtemplate")
if updateBaselines then
File.Copy (newFile, oldFile, overwrite=true)
let s1 = File.ReadAllText oldFile |> normalizeLineEndings
let s2 = File.ReadAllText newFile |> normalizeLineEndings
s2 |> shouldEqual s1

[<Test>]
let ``#1779 net20 only in net461``() =
install "i001779-net20-only-in-net461" |> ignore
Expand Down
31 changes: 15 additions & 16 deletions integrationtests/Paket.IntegrationTests/Paket.IntegrationTests.fsproj
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 0 additions & 12 deletions integrationtests/Paket.IntegrationTests/UpdatePackageSpecs.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,18 +141,6 @@ let ``#1703 resolves locally``() =
update "i001703-local" |> ignore


[<Test>]
let ``#1635 should tell about auth issue``() =
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you sure this is not a regression?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes. because I looked at the error message.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, you were right. it was a regression. fixed

try
update "i001635-wrong-pw" |> ignore
failwith "error expected"
with
| exn when exn.Message.Contains("Unable to retrieve package versions for 'Argu'") ->
exn.Message.Contains "Could not load resources from 'https://www.myget.org/F/paket-test/api/v3/index.json': Unauthorized (401)"
|> shouldEqual true
()


[<Test>]
let ``#2572 should tell about late resolver issue``() =
try
Expand Down
2 changes: 1 addition & 1 deletion ...narios/i000346-aliases/before/MyClassLibrary/MyClassLibrary/MyClassLibrary.csprojtemplate
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
</Reference>
</ItemGroup>
</When>
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v4.7.1' Or $(TargetFrameworkVersion) == 'v4.7.2')">
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v4.7.1' Or $(TargetFrameworkVersion) == 'v4.7.2' Or $(TargetFrameworkVersion) == 'v4.8')">
<ItemGroup>
<Reference Include="Dapper">
<HintPath>..\..\packages\Dapper\lib\net45\Dapper.dll</HintPath>
Expand Down
2 changes: 1 addition & 1 deletion ...arios/i001145-excludes/before/MyClassLibrary/MyClassLibrary/MyClassLibrary.csprojtemplate
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
</Reference>
</ItemGroup>
</When>
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v4.7.1' Or $(TargetFrameworkVersion) == 'v4.7.2')">
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v4.7.1' Or $(TargetFrameworkVersion) == 'v4.7.2' Or $(TargetFrameworkVersion) == 'v4.8')">
<ItemGroup>
<Reference Include="Dapper">
<HintPath>..\..\packages\Dapper\lib\net45\Dapper.dll</HintPath>
Expand Down
2 changes: 1 addition & 1 deletion ...os/i001219-props-files/before/MyClassLibrary/MyClassLibrary/MyClassLibrary.csprojtemplate
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
</Reference>
</ItemGroup>
</When>
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v4.7.1' Or $(TargetFrameworkVersion) == 'v4.7.2')">
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v4.7.1' Or $(TargetFrameworkVersion) == 'v4.7.2' Or $(TargetFrameworkVersion) == 'v4.8')">
<ItemGroup>
<Reference Include="Dapper">
<HintPath>..\..\packages\Dapper\lib\net45\Dapper.dll</HintPath>
Expand Down
2 changes: 1 addition & 1 deletion ...s/i001219-props-files/before/MyClassLibrary/MyClassLibrary2/MyClassLibrary.csprojtemplate
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@
</Reference>
</ItemGroup>
</When>
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v4.7.1' Or $(TargetFrameworkVersion) == 'v4.7.2')">
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v4.7.1' Or $(TargetFrameworkVersion) == 'v4.7.2' Or $(TargetFrameworkVersion) == 'v4.8')">
<ItemGroup>
<Reference Include="Dapper">
<HintPath>..\..\packages\Dapper\lib\net45\Dapper.dll</HintPath>
Expand Down
2 changes: 1 addition & 1 deletion ...s/i001219-props-files/before/MyClassLibrary/MyClassLibrary3/MyClassLibrary.csprojtemplate
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@
</Reference>
</ItemGroup>
</When>
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v4.7.1') Or $(TargetFrameworkVersion) == 'v4.7.2')">
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v4.7.1') Or $(TargetFrameworkVersion) == 'v4.7.2' Or $(TargetFrameworkVersion) == 'v4.8')">
<ItemGroup>
<Reference Include="Dapper">
<HintPath>..\..\packages\Dapper\lib\net45\Dapper.dll</HintPath>
Expand Down
18 changes: 0 additions & 18 deletions integrationtests/scenarios/i001247-lockfile-error/before/paket.dependencies
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions integrationtests/scenarios/i001247-lockfile-error/before/paket.lock
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ...enarios/i001270-net461/before/MyClassLibrary/MyClassLibrary/MyClassLibrary.csprojtemplate
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
</Reference>
</ItemGroup>
</When>
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v4.7.1' Or $(TargetFrameworkVersion) == 'v4.7.2')">
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v4.7.1' Or $(TargetFrameworkVersion) == 'v4.7.2' Or $(TargetFrameworkVersion) == 'v4.8')">
<ItemGroup>
<Reference Include="System.Transactions">
<Paket>True</Paket>
Expand Down
6 changes: 0 additions & 6 deletions integrationtests/scenarios/i001333-dup-refs/before/ConsoleApplication1/App.config
View file
Open in desktop

This file was deleted.

41 changes: 0 additions & 41 deletions integrationtests/scenarios/i001333-dup-refs/before/ConsoleApplication1/AssemblyInfo.fs
View file
Open in desktop

This file was deleted.

Loading