add facade rename to build

haf · Dec 1, 2016 · 6b2ad7d · 6b2ad7d
1 parent f268249
commit 6b2ad7d
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 13 deletions.
diff --git a/Expecto.BenchmarkDotNet/Expecto.BenchmarkDotNet.fs b/Expecto.BenchmarkDotNet/Expecto.BenchmarkDotNet.fs
@@ -12,9 +12,8 @@ open BenchmarkDotNet.Loggers
 open BenchmarkDotNet.Order
 open BenchmarkDotNet.Validators
 open Expecto
-//open Expecto.Logging
-//open Expecto.Logging.Message
-open Logary.Facade
+open Expecto.Logging
+open Expecto.Logging.Message
 
 [<AutoOpen; CompilationRepresentationAttribute(CompilationRepresentationFlags.ModuleSuffix)>]
 module BenchmarkDotNet =

diff --git a/Expecto.netcore/Expecto.netcore.fsproj b/Expecto.netcore/Expecto.netcore.fsproj
@@ -1,8 +1,8 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <PropertyGroup>
-    <AssemblyName>Expecto.netcore</AssemblyName>
-    <Version>1.0.0-preview3</Version>
+    <AssemblyName>Expecto</AssemblyName>
+    <Version>1.1.2</Version>
     <OutputType>Library</OutputType>
     <TargetFramework>netstandard1.6</TargetFramework>
     <DebugType>pdbonly</DebugType>
@@ -14,7 +14,7 @@
     <Compile Include="..\paket-files\logary\logary\src\Logary.Facade\Facade.fs" />
     <Compile Include="..\Expecto\Expecto.fs" />
     <Compile Include="..\Expecto\Expect.fs" />
-    <EmbeddedResource Include="**\*.resx" />
+
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Sdk">

diff --git a/Expecto.sln b/Expecto.sln
@@ -19,9 +19,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "project", "project", "{1870
 		.editorconfig = .editorconfig
 		.gitignore = .gitignore
 		.travis.yml = .travis.yml
+		appveyor.yml = appveyor.yml
 		build.cmd = build.cmd
+		build.fsx = build.fsx
 		build.sh = build.sh
+		docker-build.sh = docker-build.sh
 		Gemfile = Gemfile
+		globals.json = globals.json
 		paket.dependencies = paket.dependencies
 		Rakefile = Rakefile
 		README.md = README.md

diff --git a/Expecto/Expecto.fs b/Expecto/Expecto.fs
@@ -128,11 +128,9 @@ module Test =
 
 
 module Impl =
-//  open Expecto.Logging
-//  open Expecto.Logging.Message
+  open Expecto.Logging
+  open Expecto.Logging.Message
   open Helpers
-  open Logary.Facade
-  open Logary.Facade.Message
 
   let logger = Log.create "Expecto"
 
@@ -430,11 +428,10 @@ module Impl =
 
 [<AutoOpen; Extension>]
 module Tests =
-//  open Expecto.Logging
   open Impl
   open Helpers
   open Argu
-  open Logary.Facade
+  open Expecto.Logging
 
   /// Fail this test
   let inline failtest msg = raise <| AssertException msg

diff --git a/build.fsx b/build.fsx
@@ -15,6 +15,21 @@ let run cmd args dir =
   ) System.TimeSpan.MaxValue = false then
       failwithf "Error while running '%s' with args: %s" cmd args
 
+// --------------------------------------------------------------------------------------
+// Rename Logary Facades for Expecto
+//  (why this is necessary - https://github.com/logary/logary/#using-logary-in-a-library)
+
+Target "ExpectoChangeo" (fun _ ->
+    ReplaceInFiles [
+        "namespace Logary.Facade", "namespace Expecto.Logging"
+        "namespace Logary.Facade.Messages", "namespace Expecto.Logging.Messages"
+        "open Logary.Facade", "open Expecto.Logging"
+        "open Logary.Facade.Messages", "open Expecto.Logging.Messages"
+    ][
+        "paket-files/logary/logary/src/Logary.Facade/Facade.fs"
+    ]
+)
+
 
 // --------------------------------------------------------------------------------------
 // Clean Build Detritus
@@ -57,7 +72,8 @@ Target "DotnetBuild" (fun _ ->
 
 Target "All" DoNothing
 
-"Clean"
+"ExpectoChangeo"
+  ==> "Clean"
   ==> "Build"
   <=> "DotnetBuild"