Skip to content

Commit

Permalink
fix appveyor build
Browse files Browse the repository at this point in the history
  • Loading branch information
punker76 committed Feb 5, 2019
1 parent 97a5ebd commit 288c4fe
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 25 deletions.
2 changes: 1 addition & 1 deletion .paket/paket-sha256.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
DEA8D2ED83FA7C56AE9A9F10198F5722DF385B558E376EFB6A6B128EE08C9C47 paket.exe
A664A299B0D62E48FD7E1DDADB2598B8589E60BD77A1B9A7060BC2DD2F920D08 paket.exe
35 changes: 17 additions & 18 deletions build.cake
Original file line number Diff line number Diff line change
Expand Up @@ -112,24 +112,23 @@ Task("Clean")
Task("Restore")
.Does(() =>
{
var msBuildSettings = new MSBuildSettings {
Verbosity = Verbosity.Minimal,
ToolPath = msBuildPathExe,
ToolVersion = MSBuildToolVersion.Default,
Configuration = configuration,
ArgumentCustomization = args => args.Append("/m")
};

MSBuild(solution, msBuildSettings.WithTarget("restore"));

// StartProcess("nuget", new ProcessSettings {
// Arguments = new ProcessArgumentBuilder()
// .Append("restore")
// .Append(solution)
// .Append("-msbuildpath")
// .AppendQuoted(msBuildPath.ToString())
// }
// );
// var msBuildSettings = new MSBuildSettings {
// Verbosity = Verbosity.Minimal,
// ToolPath = msBuildPathExe,
// ToolVersion = MSBuildToolVersion.Default,
// Configuration = configuration,
// ArgumentCustomization = args => args.Append("/m")
// };
// MSBuild(solution, msBuildSettings.WithTarget("restore"));

StartProcess("nuget", new ProcessSettings {
Arguments = new ProcessArgumentBuilder()
.Append("restore")
.Append(solution)
.Append("-msbuildpath")
.AppendQuoted(msBuildPath.ToString())
}
);
});

Task("Build")
Expand Down
9 changes: 3 additions & 6 deletions paket.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ NUGET
Caliburn.Micro (3.2)
Caliburn.Micro.Core (3.2)
Caliburn.Micro.Core (3.2)
ControlzEx (4.0.0-alpha0222)
Microsoft.Xaml.Behaviors.Wpf (>= 1.0.1)
Costura.Fody (3.3.2)
Fody (>= 3.3.5) - restriction: || (== net45) (== net452) (== net46) (== net47) (&& (== netcoreapp3.0) (>= net40))
ExposedObject (1.2)
Expand Down Expand Up @@ -33,6 +35,7 @@ NUGET
Microsoft.NET.Test.Sdk (15.9)
Microsoft.CodeCoverage (>= 15.9)
Microsoft.TestPlatform.TestHost (>= 15.9) - restriction: || (&& (== net45) (>= netcoreapp1.0)) (&& (== net452) (>= netcoreapp1.0)) (&& (== net46) (>= netcoreapp1.0)) (&& (== net47) (>= netcoreapp1.0)) (== netcoreapp3.0)
Microsoft.NETCore.Platforms (2.2) - restriction: || (== net45) (&& (== net452) (== net46) (>= wpa81)) (&& (== net452) (== net47) (>= wpa81)) (&& (== net452) (>= netcoreapp2.0)) (&& (== net46) (< net45)) (&& (== net46) (< net452)) (&& (== net46) (>= netcoreapp2.0)) (&& (== net46) (< netstandard1.0)) (&& (== net46) (< netstandard1.3) (>= wpa81)) (&& (== net46) (< portable-net45+win8+wpa81)) (&& (== net46) (>= uap10.0)) (&& (== net46) (>= wp8)) (&& (== net47) (< net45)) (&& (== net47) (< net452)) (&& (== net47) (>= netcoreapp2.0)) (&& (== net47) (< netstandard1.0)) (&& (== net47) (< netstandard1.3) (>= wpa81)) (&& (== net47) (< portable-net45+win8+wpa81)) (&& (== net47) (>= uap10.0)) (&& (== net47) (>= wp8)) (== netcoreapp3.0)
Microsoft.NETCore.Targets (2.1) - restriction: || (&& (== net45) (>= netcoreapp1.0)) (&& (== net452) (>= netcoreapp1.0)) (&& (== net46) (>= netcoreapp1.0)) (&& (== net47) (>= netcoreapp1.0)) (== netcoreapp3.0)
Microsoft.SourceLink.Common (1.0.0-beta2-18618-05) - copy_local: true
Microsoft.SourceLink.GitHub (1.0.0-beta2-18618-05) - copy_local: true
Expand Down Expand Up @@ -482,9 +485,3 @@ NUGET
xunit.extensibility.core (2.4.1)
xunit.runner.visualstudio (2.4.1)
Microsoft.NET.Test.Sdk (>= 15.0) - restriction: || (&& (== net45) (>= netcoreapp1.0)) (&& (== net452) (>= netcoreapp1.0)) (&& (== net46) (>= netcoreapp1.0)) (&& (== net47) (>= netcoreapp1.0)) (== netcoreapp3.0)
remote: https://ci.appveyor.com/nuget/controlzex
ControlzEx (4.0.0-alpha0230)
Microsoft.NETCore.Platforms (>= 3.0.0-preview.19073.11) - restriction: || (&& (== net45) (>= netcoreapp3.0)) (&& (== net452) (>= netcoreapp3.0)) (&& (== net46) (>= netcoreapp3.0)) (&& (== net47) (>= netcoreapp3.0)) (== netcoreapp3.0)
Microsoft.Xaml.Behaviors.Wpf (>= 1.0.1)
remote: https://dotnet.myget.org/F/dotnet-core/api/v3/index.json
Microsoft.NETCore.Platforms (3.0.0-preview1-27018-01) - restriction: || (== net45) (&& (== net452) (== net46) (>= wpa81)) (&& (== net452) (== net47) (>= wpa81)) (&& (== net452) (>= netcoreapp3.0)) (&& (== net46) (< net45)) (&& (== net46) (< net452)) (&& (== net46) (>= netcoreapp2.0)) (&& (== net46) (>= netcoreapp3.0)) (&& (== net46) (< netstandard1.0)) (&& (== net46) (< netstandard1.3) (>= wpa81)) (&& (== net46) (< portable-net45+win8+wpa81)) (&& (== net46) (>= uap10.0)) (&& (== net46) (>= wp8)) (&& (== net47) (< net45)) (&& (== net47) (< net452)) (&& (== net47) (>= netcoreapp2.0)) (&& (== net47) (>= netcoreapp3.0)) (&& (== net47) (< netstandard1.0)) (&& (== net47) (< netstandard1.3) (>= wpa81)) (&& (== net47) (< portable-net45+win8+wpa81)) (&& (== net47) (>= uap10.0)) (&& (== net47) (>= wp8)) (== netcoreapp3.0)

0 comments on commit 288c4fe

Please # to comment.