Skip to content

Commit

Permalink
upgraded to Xake 1.1, fixed build script
Browse files Browse the repository at this point in the history
  • Loading branch information
OlegZee committed May 13, 2018
1 parent 1e17f49 commit a6f2ddb
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 593 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,5 @@ samples/**/*.fsx.lock
temp
~testout~
paket-files/
/out
/out
src/Xake.*.xml
4 changes: 2 additions & 2 deletions build.fsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#r "paket:
nuget Xake ~> 1.0 prerelease //"
nuget Xake ~> 1.1 prerelease //"

#if !FAKE
#load ".fake/build.fsx/intellisense.fsx"
Expand Down Expand Up @@ -88,7 +88,7 @@ do xakeScript {
"--configuration"; "Release"
"--framework"; framework
"--output"; "../out/" + framework
"/p:DocumentationFile=Xake.xml"
"/p:DocumentationFile=Xake.Dotnet.xml"
]
}
]
Expand Down
9 changes: 1 addition & 8 deletions build.fsx.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,5 @@ RESTRICTION: == netstandard2.0
NUGET
remote: https://api.nuget.org/v3/index.json
FSharp.Core (4.3.4)
Microsoft.Win32.Registry (4.4)
System.Security.AccessControl (>= 4.4)
System.Security.Principal.Windows (>= 4.4)
System.Security.AccessControl (4.4.1)
System.Security.Principal.Windows (>= 4.4)
System.Security.Principal.Windows (4.4.1)
Xake (1.0.8.410-alpha)
Xake (1.1.0.413-alpha)
FSharp.Core (>= 4.3.4)
Microsoft.Win32.Registry (>= 4.4)
4 changes: 2 additions & 2 deletions src/Xake.Dotnet.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@
<Compile Include="CommonLib.fs" />
<Compile Include="ProcessExec.fs" />
<Compile Include="DotNetFwk.fs" />
<Compile Include="ResourceFileset.fs" />

<Compile Include="DotnetTasks.fs" />
<Compile Include="Dotnet.csc.fs" />
<Compile Include="Dotnet.fsc.fs" />
<Compile Include="ResourceFileset.fs" />
<Compile Include="Dotnet.resgen.fs" />
<Compile Include="Dotnet.Msbuild.fs" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Xake" Version="1.0.8.410-alpha" />
<PackageReference Include="Xake" Version="1.1.0.413-alpha" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
Expand Down
290 changes: 0 additions & 290 deletions src/Xake.Dotnet.xml

This file was deleted.

Loading

0 comments on commit a6f2ddb

Please sign in to comment.