Skip to content

Commit

Permalink
Use BuildLib 0.3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
veblush committed Apr 25, 2016
1 parent 4c453fb commit 7666dac
Show file tree
Hide file tree
Showing 96 changed files with 3,148 additions and 162 deletions.
12 changes: 6 additions & 6 deletions build.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ SET PACKAGEPATH=.\packages\
SET NUGET=.\tools\nuget\NuGet.exe
SET NUGETOPTIONS=-ConfigFile .\tools\nuget\NuGet.Config -OutputDirectory %PACKAGEPATH% -ExcludeVersion

IF NOT EXIST %PACKAGEPATH%FAKE\Ver_4.23.0 (
IF NOT EXIST %PACKAGEPATH%FAKE\Ver_4.25.4 (
RD /S/Q %PACKAGEPATH%FAKE
%NUGET% install FAKE -Version 4.23.0 %NUGETOPTIONS%
COPY NUL %PACKAGEPATH%FAKE\Ver_4.23.0
%NUGET% install FAKE -Version 4.25.4 %NUGETOPTIONS%
COPY NUL %PACKAGEPATH%FAKE\Ver_4.25.4
)

IF NOT EXIST %PACKAGEPATH%FAKE.BuildLib\Ver_0.1.8 (
IF NOT EXIST %PACKAGEPATH%FAKE.BuildLib\Ver_0.3.1 (
RD /S/Q %PACKAGEPATH%FAKE.BuildLib
%NUGET% install FAKE.BuildLib -Version 0.1.8 %NUGETOPTIONS%
COPY NUL %PACKAGEPATH%FAKE.BuildLib\Ver_0.1.8
%NUGET% install FAKE.BuildLib -Version 0.3.1 %NUGETOPTIONS%
COPY NUL %PACKAGEPATH%FAKE.BuildLib\Ver_0.3.1
)

set encoding=utf-8
Expand Down
12 changes: 7 additions & 5 deletions build.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,16 @@ let solution = initSolution "" "" []

Target "Clean" <| fun _ -> cleanBin

Target "Package" <| fun _ -> buildUnityPackage "./src/UnityPackage"
Target "PackUnity" <| fun _ ->
packUnityPackage "./src/UnityPackage/UiManager.unitypackage.json"

Target "Pack" <| fun _ -> ()

Target "Help" <| fun _ ->
showUsage solution (fun name ->
if name = "package" then Some("Build package", "")
else None)
showUsage solution (fun _ -> None)

"Clean"
==> "Package"
==> "PackUnity"
==> "Pack"

RunTargetOrDefault "Help"
18 changes: 0 additions & 18 deletions src/UnityPackage/Assets/Editor/PackageBuilder.cs

This file was deleted.

12 changes: 0 additions & 12 deletions src/UnityPackage/Assets/Editor/PackageBuilder.cs.meta

This file was deleted.

9 changes: 0 additions & 9 deletions src/UnityPackage/Assets/Middlewares.meta

This file was deleted.

9 changes: 0 additions & 9 deletions src/UnityPackage/Assets/Middlewares/CommonLogging.meta

This file was deleted.

This file was deleted.

Binary file not shown.
Binary file not shown.

This file was deleted.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@ private UiDialogHandle ShowModalInternal(UiDialog dialog, bool isTemporary, obje
// When there is a curtain fading out, reuse it to reduce flickering

curtain = _fadingOutBlackCurtain;

DOTween.Kill(curtain.GetComponentInChildren<Image>());
_fadingOutBlackCurtain = null;
}
Expand Down
5 changes: 5 additions & 0 deletions src/UnityPackage/Assets/UnityPackages.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions src/UnityPackage/Assets/UnityPackages/CommonLogging.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"Id": "CommonLogging",
"Version": "3.3.1",
"Authors": [
"Aleksandar Seovic",
"Mark Pollack",
"Erich Eichinger",
"Stephen Bohlen"
],
"Owners": [
"Esun Kim"
],
"Description": "Unity3D port of Common.Logging library which introduces a simple abstraction to allow you to select a specific logging implementation at runtime.",
"Files": [
"Assets/UnityPackages/CommonLogging/Common.Logging.Core.dll",
"Assets/UnityPackages/CommonLogging/Common.Logging.Core.dll.mdb",
"Assets/UnityPackages/CommonLogging/Common.Logging.dll",
"Assets/UnityPackages/CommonLogging/Common.Logging.dll.mdb",
"Assets/UnityPackages/CommonLogging/Common.Logging.Extensions.dll",
"Assets/UnityPackages/CommonLogging/Common.Logging.Extensions.dll.mdb",
{
"Target": "Assets/UnityPackages/CommonLoggingSample/CommonLoggingSample.cs",
"Extra": true
},
{
"Target": "Assets/UnityPackages/CommonLoggingSample/CommonLoggingSample.unity",
"Extra": true
}
]
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 7666dac

Please sign in to comment.