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

switch to NuGet PackageReferences #43

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

switch to NuGet PackageReferences #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3864fa6
switch back to NuGet PackageReferences
ctaggart Apr 19, 2019
b7db1fd
must set minimum versions in paket.template
ctaggart Apr 19, 2019
1875e39
update for Blazor 3.0.100-preview5
ctaggart May 16, 2019
7d34d48
resolve conflicts
ctaggart May 16, 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
3 changes: 1 addition & 2 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@ build_script:
- ps: $env:NUGET_PACKAGES = "$env:APPVEYOR_BUILD_FOLDER\.nuget"
# Chrome on AV is not latest
- ps: |
dotnet tool install paket --tool-path .paket
.paket/paket add Selenium.WebDriver.ChromeDriver --version 73.0.3683.68
dotnet add tests\Unit\Unit.fsproj package Selenium.WebDriver.ChromeDriver --version 73.0.3683.68
dotnet restore
- ps: '& $env:BUILD_SCRIPT -t pack -c Release -v "$env:SEMVER" /p:GhPages=true'

Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "3.0.100-preview4"
"version": "3.0.100-preview5"
}
}
26 changes: 0 additions & 26 deletions paket.dependencies
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,34 +3,8 @@ source https://api.nuget.org/v3/index.json
storage: none
framework: netstandard2.0, netcoreapp3.0

nuget FsCheck.NUnit ~> 2.12
nuget FSharp.Core ~> 4.5.0
nuget HtmlAgilityPack ~> 1.8.0
nuget Microsoft.AspNetCore.Blazor 3.0.0-preview5-19227-01
nuget Microsoft.AspNetCore.Blazor.Build 3.0.0-preview5-19227-01
nuget Microsoft.AspNetCore.Blazor.Server 3.0.0-preview5-19227-01
nuget Microsoft.AspNetCore.Blazor.DevServer 3.0.0-preview5-19227-01
nuget Microsoft.AspNetCore.Components 3.0.0-preview5-19227-01
nuget Microsoft.AspNetCore.Components.Browser 3.0.0-preview5-19227-01
nuget Microsoft.AspNetCore.NodeServices 3.0.0-preview5-19227-01
nuget Microsoft.AspNetCore.SpaServices 3.0.0-preview5-19227-01
nuget Microsoft.AspNetCore.SpaServices.Extensions 3.0.0-preview5-19227-01
nuget System.Runtime.CompilerServices.Unsafe 4.6.0-preview5.19224.8
nuget Microsoft.NET.Test.Sdk 15.8.0
nuget Elmish >= 2.0
nuget Microsoft.Build.Utilities.Core ~> 15.0
nuget Mono.Cecil ~> 0.10.0
nuget nunit ~> 3.10
nuget NUnit3TestAdapter ~> 3.10
nuget Selenium.Support
nuget Selenium.WebDriver
nuget Selenium.WebDriver.ChromeDriver
# nuget Selenium.WebDriver.GeckoDriver.Win64
github fsprojects/FSharp.TypeProviders.SDK src/ProvidedTypes.fsi
github fsprojects/FSharp.TypeProviders.SDK src/ProvidedTypes.fs
nuget Nerdbank.GitVersioning copy_local: true
nuget TaskBuilder.fs
nuget Blazor.Extensions.SignalR ~> 0.1.9

group fake
source https://api.nuget.org/v3/index.json
Expand Down
1,172 changes: 273 additions & 899 deletions paket.lock
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion src/Bolero.Build/Bolero.Build.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,9 @@
<BaseOutputPath>..\..\build\task</BaseOutputPath>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
</PropertyGroup>
<Import Project="..\..\.paket\Paket.Restore.targets" />
<ItemGroup>
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.*" />
<PackageReference Include="Mono.Cecil" Version="0.10.0" />
<PackageReference Include="Nerdbank.GitVersioning" Version="2.3.151" PrivateAssets="all" />
</ItemGroup>
</Project>
3 changes: 0 additions & 3 deletions src/Bolero.Build/paket.references
View file
Open in desktop

This file was deleted.

5 changes: 3 additions & 2 deletions src/Bolero.Server/Bolero.Server.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@
<ItemGroup>
<Compile Include="HttpContext.fs" />
<Compile Include="Remoting.fs" />
<None Include="paket.references" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Bolero\Bolero.fsproj" />
<PackageReference Update="FSharp.Core" Version="4.5.4" />
<PackageReference Include="TaskBuilder.fs" Version="2.1.0" />
<PackageReference Include="Nerdbank.GitVersioning" Version="2.3.151" PrivateAssets="all" />
</ItemGroup>
<Import Project="..\..\.paket\Paket.Restore.targets" />
</Project>
3 changes: 0 additions & 3 deletions src/Bolero.Server/paket.references
View file
Open in desktop

This file was deleted.

7 changes: 5 additions & 2 deletions src/Bolero.Templating.Provider/Bolero.Templating.Provider.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@
<Compile Include="ConvertExpr.fs" />
<Compile Include="CodeGen.fs" />
<Compile Include="Provider.fs" />
<None Include="paket.references" />
</ItemGroup>
<Import Project="..\..\.paket\Paket.Restore.targets" />
<ItemGroup>
<PackageReference Update="FSharp.Core" Version="4.5.4" />
<PackageReference Include="HtmlAgilityPack" Version="1.8.14" />
<PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.0.0-preview5*" />
</ItemGroup>
</Project>
3 changes: 0 additions & 3 deletions src/Bolero.Templating.Provider/paket.references
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions src/Bolero.Templating.Server/Bolero.Templating.Server.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,9 @@
</PropertyGroup>
<ItemGroup>
<Compile Include="Templating.fs" />
<None Include="paket.references" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Bolero.Templating\Bolero.Templating.fsproj" />
<PackageReference Update="FSharp.Core" Version="4.5.4" />
</ItemGroup>
<Import Project="..\..\.paket\Paket.Restore.targets" />
</Project>
1 change: 0 additions & 1 deletion src/Bolero.Templating.Server/paket.references
View file
Open in desktop

This file was deleted.

8 changes: 6 additions & 2 deletions src/Bolero.Templating/Bolero.Templating.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,14 @@
<EmbeddedResource Include="content\**" Exclude="**\*.js;**\*.css" LogicalName="blazor:file:%(RecursiveDir)%(Filename)%(Extension)" />
<EmbeddedResource Include="content\**\*.js" LogicalName="blazor:js:%(RecursiveDir)%(Filename)%(Extension)" />
<EmbeddedResource Include="content\**\*.css" LogicalName="blazor:css:%(RecursiveDir)%(Filename)%(Extension)" />
<None Include="paket.references" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Bolero\Bolero.fsproj" />
<PackageReference Update="FSharp.Core" Version="4.5.4" />
<PackageReference Include="HtmlAgilityPack" Version="1.8.14" />
<PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.0.0-preview5*" />
<PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.0.0-preview5*" />
<PackageReference Include="Blazor.Extensions.SignalR" Version="0.1.9" />
<PackageReference Include="Nerdbank.GitVersioning" Version="2.3.151" PrivateAssets="all" />
</ItemGroup>
<Import Project="..\..\.paket\Paket.Restore.targets" />
</Project>
6 changes: 0 additions & 6 deletions src/Bolero.Templating/paket.references
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/Bolero.Templating/paket.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ files
../../build/Release/netstandard2.0/Bolero.Templating.xml ==> lib/netstandard2.0
dependencies
Bolero CURRENTVERSION
HtmlAgilityPack >= LOCKED:Minor
HtmlAgilityPack >= 1.8.14
# Blazor.Extensions.SignalR >= LOCKED:Patch
8 changes: 6 additions & 2 deletions src/Bolero/Bolero.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
<Compile Include="Remoting.Client.fs" />
<Compile Include="Program.fs" />
<Compile Include="Html.fs" />
<None Include="paket.references" />
<None Include="paket.template" />
</ItemGroup>
<ItemGroup>
Expand All @@ -28,6 +27,11 @@
<ProjectReference Include="..\Bolero.Templating.Provider\Bolero.Templating.Provider.fsproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<PackageReference Update="FSharp.Core" Version="4.5.4" />
<PackageReference Include="Microsoft.JSInterop" Version="3.0.0-preview5*" />
<PackageReference Include="Mono.WebAssembly.Interop" Version="3.0.0-preview5*" />
<PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.0.0-preview5*" />
<PackageReference Include="Elmish" Version="2.0" />
<PackageReference Include="Nerdbank.GitVersioning" Version="2.3.151" PrivateAssets="all" />
</ItemGroup>
<Import Project="..\..\.paket\Paket.Restore.targets" />
</Project>
6 changes: 0 additions & 6 deletions src/Bolero/paket.references
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions src/Bolero/paket.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ files
../../build/Release/typeproviders/fsharp41/netstandard2.0/HtmlAgilityPack.dll ==> typeproviders/fsharp41/netstandard2.0
../../build/Release/typeproviders/fsharp41/netstandard2.0/Microsoft.AspNetCore.Blazor.dll ==> typeproviders/fsharp41/netstandard2.0
dependencies
FSharp.Core >= LOCKED:Minor
Microsoft.AspNetCore.Blazor >= LOCKED:Minor
Elmish >= LOCKED:Minor
FSharp.Core >= 4.5.0
Microsoft.AspNetCore.Blazor >= 3.0.0-preview5
Elmish >= 2.0.0
10 changes: 7 additions & 3 deletions tests/Client/Client.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk.Web">
<Import Project="..\..\tools\Common.props" />
<PropertyGroup>
Expand All @@ -9,12 +8,17 @@
<ItemGroup>
<Compile Include="Main.fs" />
<Compile Include="Startup.fs" />
<None Include="paket.references" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\Bolero.Templating\Bolero.Templating.fsproj" />
<ProjectReference Include="..\..\src\Bolero\Bolero.fsproj" />
</ItemGroup>
<Import Project="..\..\src\Bolero.Build\Bolero.Build.targets" />
<Import Project="..\..\.paket\Paket.Restore.targets" />
<ItemGroup>
<DotNetCliToolReference Include="Microsoft.AspNetCore.Blazor" Version="3.0.0-preview5*" />
<PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.0.0-preview5*" PrivateAssets="all" />
<PackageReference Include="Microsoft.AspNetCore.Blazor.DevServer" Version="3.0.0-preview5*" PrivateAssets="all" />
<PackageReference Update="FSharp.Core" Version="4.5.4" />
<PackageReference Include="Elmish" Version="2.0" />
</ItemGroup>
</Project>
5 changes: 0 additions & 5 deletions tests/Client/paket.references
View file
Open in desktop

This file was deleted.

8 changes: 6 additions & 2 deletions tests/Remoting.Client/Remoting.Client.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,12 @@
</ItemGroup>
<ItemGroup>
<Compile Include="Main.fs" />
<None Include="paket.references" />
</ItemGroup>
<Import Project="..\..\src\Bolero.Build\Bolero.Build.targets" />
<Import Project="..\..\.paket\Paket.Restore.targets" />
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.0.0-preview5*" PrivateAssets="all" />
<PackageReference Include="Microsoft.AspNetCore.Blazor.DevServer" Version="3.0.0-preview5*" PrivateAssets="all" />
<PackageReference Update="FSharp.Core" Version="4.5.4" />
<PackageReference Include="Elmish" Version="2.0" />
</ItemGroup>
</Project>
4 changes: 0 additions & 4 deletions tests/Remoting.Client/paket.references
View file
Open in desktop

This file was deleted.

7 changes: 4 additions & 3 deletions tests/Remoting.Server/Remoting.Server.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk.Web">
<Import Project="..\..\tools\Common.props" />
<PropertyGroup>
Expand All @@ -7,7 +6,6 @@
</PropertyGroup>
<ItemGroup>
<Compile Include="Program.fs" />
<None Include="paket.references" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\Bolero.Templating\Bolero.Templating.fsproj" />
Expand All @@ -16,5 +14,8 @@
<ProjectReference Include="..\..\src\Bolero.Server\Bolero.Server.fsproj" />
<ProjectReference Include="..\Remoting.Client\Remoting.Client.fsproj" />
</ItemGroup>
<Import Project="..\..\.paket\Paket.Restore.targets" />
<ItemGroup>
<PackageReference Update="FSharp.Core" Version="4.5.4" />
<PackageReference Include="Microsoft.AspNetCore.Blazor.Server" Version="3.0.0-preview5*" />
</ItemGroup>
</Project>
2 changes: 0 additions & 2 deletions tests/Remoting.Server/paket.references
View file
Open in desktop

This file was deleted.

7 changes: 4 additions & 3 deletions tests/Server/Server.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk.Web">
<Import Project="..\..\tools\Common.props" />
<PropertyGroup>
Expand All @@ -7,11 +6,13 @@
</PropertyGroup>
<ItemGroup>
<Compile Include="Startup.fs" />
<None Include="paket.references" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\Bolero\Bolero.fsproj" />
<ProjectReference Include="..\Client\Client.fsproj" />
</ItemGroup>
<Import Project="..\..\.paket\Paket.Restore.targets" />
<ItemGroup>
<PackageReference Update="FSharp.Core" Version="4.5.4" />
<PackageReference Include="Microsoft.AspNetCore.Blazor.Server" Version="3.0.0-preview5*" />
</ItemGroup>
</Project>
2 changes: 0 additions & 2 deletions tests/Server/paket.references
View file
Open in desktop

This file was deleted.

7 changes: 5 additions & 2 deletions tests/Unit.Client/Unit.Client.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,13 @@
<Compile Include="Remoting.fs" />
<Compile Include="App.fs" />
<Compile Include="Startup.fs" />
<None Include="paket.references" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\Bolero\Bolero.fsproj" />
</ItemGroup>
<Import Project="..\..\.paket\Paket.Restore.targets" />
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.0.0-preview5*" PrivateAssets="all" />
<PackageReference Update="FSharp.Core" Version="4.5.4" />
<PackageReference Include="Elmish" Version="2.0" />
</ItemGroup>
</Project>
3 changes: 0 additions & 3 deletions tests/Unit.Client/paket.references
View file
Open in desktop

This file was deleted.

15 changes: 12 additions & 3 deletions tests/Unit/Unit.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk.Web">
<Import Project="..\..\tools\Common.props" />
<PropertyGroup>
Expand All @@ -16,13 +15,23 @@
<Compile Include="Tests\Elmish.fs" />
<Compile Include="Tests\Routing.fs" />
<Compile Include="Tests\Remoting.fs" />
<None Include="paket.references" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\Bolero\Bolero.fsproj" />
<ProjectReference Include="..\..\src\Bolero.Templating\Bolero.Templating.fsproj" />
<ProjectReference Include="..\..\src\Bolero.Server\Bolero.Server.fsproj" />
<ProjectReference Include="..\Unit.Client\Unit.Client.fsproj" />
</ItemGroup>
<Import Project="..\..\.paket\Paket.Restore.targets" />
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8" />
<PackageReference Include="nunit" Version="3.11" />
<PackageReference Include="NUnit3TestAdapter" Version="3.13" />
<PackageReference Update="FSharp.Core" Version="4.5.4" />
<PackageReference Include="FsCheck.NUnit" Version="2.14" />
<PackageReference Include="Selenium.WebDriver" Version="3.141" />
<PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="74.0.3729.6" />
<PackageReference Include="Microsoft.AspNetCore.Blazor.Server" Version="3.0.0-preview5*" />
<PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.0.0-preview5*" PrivateAssets="all" />
<PackageReference Include="Selenium.Support" Version="3.141" />
</ItemGroup>
</Project>
11 changes: 0 additions & 11 deletions tests/Unit/paket.references
View file
Open in desktop

This file was deleted.