nugetパッケージを作成するようにした

diff --git a/.gitignore b/.gitignore
index 711de8b..26a1618 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ bin
 /UWP/FooEditEngine.UWP/project.lock.json
 packages
 .vs
+*.nupkg

diff --git a/Installer/install.cmd b/Installer/install.cmd
index b7a3ddb..b709146 100644 (file)
--- a/Installer/install.cmd
+++ b/Installer/install.cmd
@@ -18,22 +18,24 @@ if errorlevel 1 goto end
 "%BUILD_PATH%\MSBuild.exe" /p:Configuration=Release ..\Help\fooeditengine_api.shfbproj
 if errorlevel 1 echo "building help file is failed"
 
+pushd ..\Windows\FooEditEngine
+nuget pack FooEditEngine.Windows.nuspec
+popd
+
+pushd ..\WPF\FooEditEngine
+nuget pack FooEditEngine.WPF.nuspec
+popd
+
+pushd ..\UWP\FooEditEngine.UWP
+nuget pack FooEditEngine.UWP.nuspec
+popd
+
 :copy_dist
 md dist
 copy ..\Help\Help\Documentation.chm dist
-md dist\winform
-copy ..\Windows\FooEditEngine\bin\%BUILD_TYPE%\*.dll dist\winform
-copy ..\Windows\FooEditEngine\bin\%BUILD_TYPE%\*.pdb dist\winform
-md dist\wpf
-copy ..\WPF\FooEditEngine\bin\%BUILD_TYPE%\*.dll dist\wpf
-copy ..\WPF\FooEditEngine\bin\%BUILD_TYPE%\*.pdb dist\wpf
-md dist\uwp
-copy ..\UWP\FooEditEngine.UWP\bin\%BUILD_TYPE%\*.dll dist\uwp
-copy ..\UWP\FooEditEngine.UWP\bin\%BUILD_TYPE%\*.pdb dist\uwp
-copy ..\UWP\FooEditEngine.UWP\bin\%BUILD_TYPE%\*.pri dist\uwp
-md dist\uwp\FooEditEngine.UWP\Themes
-copy ..\UWP\FooEditEngine.UWP\bin\%BUILD_TYPE%\*.xr.xml dist\uwp\FooEditEngine.UWP
-copy ..\UWP\FooEditEngine.UWP\bin\%BUILD_TYPE%\Themes\*.* dist\uwp\FooEditEngine.UWP\Themes
+copy ..\Windows\FooEditEngine\FooEditEngine.Windows*.nupkg dist
+copy ..\WPF\FooEditEngine\FooEditEngine.WPF*.nupkg dist
+copy ..\UWP\FooEditEngine.UWP\FooEditEngine.UWP*.nupkg dist
 
 :end
 endlocal

diff --git a/UWP/FooEditEngine.UWP/FooEditEngine.UWP.nuspec b/UWP/FooEditEngine.UWP/FooEditEngine.UWP.nuspec
new file mode 100644 (file)
index 0000000..ab3416c
--- /dev/null
+++ b/UWP/FooEditEngine.UWP/FooEditEngine.UWP.nuspec
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<package >
+  <metadata>
+    <id>FooEditEngine.UWP</id>
+    <version>1.1.2.1</version>
+    <title>FooTextBox</title>
+    <authors>Foo Project</authors>
+    <owners>Foo Project</owners>
+    <licenseUrl>https://ja.osdn.net/projects/fooeditengine/</licenseUrl>
+    <projectUrl>https://ja.osdn.net/projects/fooeditengine/</projectUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>Textbox with Hilight and Regex and Folding</description>
+    <releaseNotes>first release</releaseNotes>
+    <copyright>Copyright 2018</copyright>
+    <tags>Textbox Hilight</tags>
+    <dependencies>
+      <dependency id="SharpDX" version="4.0.1" />
+      <dependency id="SharpDX.Direct2D1" version="4.0.1" />
+      <dependency id="SharpDX.Direct3D11" version="4.0.1" />
+      <dependency id="SharpDX.DXGI" version="4.0.1" />
+      <dependency id="SharpDX.Mathematics" version="4.0.1" />
+    </dependencies>
+  </metadata>
+  <files>
+    <file src=".\bin\Release\FooEditEngine.UWP.dll" target="lib\uap10.0.10586"/>
+    <file src=".\bin\Release\FooEditEngine.UWP.pdb" target="lib\uap10.0.10586"/>
+    <file src=".\bin\Release\FooEditEngine.UWP.pri" target="lib\uap10.0.10586"/>
+    <file src=".\bin\Release\FooEditEngine.UWP.xr.xml" target="lib\uap10.0.10586\FooEditEngine.UWP"/>
+    <file src=".\bin\Release\Themes\Generic.xbf" target="lib\uap10.0.10586\FooEditEngine.UWP\Themes"/>
+    <file src="Themes\Generic.xaml" target="lib\uap10.0.10586\FooEditEngine.UWP\Themes"/>
+  </files>
+</package>
\ No newline at end of file

diff --git a/WPF/FooEditEngine/FooEditEngine.WPF.nuspec b/WPF/FooEditEngine/FooEditEngine.WPF.nuspec
new file mode 100644 (file)
index 0000000..cec98df
--- /dev/null
+++ b/WPF/FooEditEngine/FooEditEngine.WPF.nuspec
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<package >
+  <metadata>
+    <id>FooEditEngine.WPF</id>
+    <version>1.203.0.0</version>
+    <title>FooTextBox</title>
+    <authors>Foo Project</authors>
+    <owners>Foo Project</owners>
+    <licenseUrl>https://ja.osdn.net/projects/fooeditengine/</licenseUrl>
+    <projectUrl>https://ja.osdn.net/projects/fooeditengine/</projectUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>Textbox with Hilight and Regex and Folding</description>
+    <releaseNotes>first release</releaseNotes>
+    <copyright>Copyright 2018</copyright>
+    <tags>Textbox Hilight</tags>
+    <dependencies>
+      <dependency id="SharpDX" version="4.0.1" />
+      <dependency id="SharpDX.Direct3D9" version="4.0.1" />
+      <dependency id="SharpDX.Direct3D11" version="4.0.1" />
+      <dependency id="SharpDX.Direct2D1" version="4.0.1" />
+      <dependency id="SharpDX.DXGI" version="4.0.1" />
+      <dependency id="SharpDX.Mathematics" version="4.0.1" />
+    </dependencies>
+  </metadata>
+  <files>
+    <file src=".\bin\Release\FooEditEngine.WPF.dll" target="lib\wpf"/>
+    <file src=".\bin\Release\FooEditEngine.WPF.pdb" target="lib\wpf"/>
+    <file src=".\bin\Release\DotNetTextStore.pdb" target="lib\wpf"/>
+    <file src=".\bin\Release\DotNetTextStore.pdb" target="lib\wpf"/>
+  </files>
+</package>
\ No newline at end of file

diff --git a/Windows/FooEditEngine/FooEditEngine.Windows.nuspec b/Windows/FooEditEngine/FooEditEngine.Windows.nuspec
new file mode 100644 (file)
index 0000000..b453a13
--- /dev/null
+++ b/Windows/FooEditEngine/FooEditEngine.Windows.nuspec
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<package >
+  <metadata>
+    <id>FooEditEngine.Windows</id>
+    <version>1.34.1.0</version>
+    <title>FooTextBox</title>
+    <authors>Foo Project</authors>
+    <owners>Foo Project</owners>
+    <licenseUrl>https://ja.osdn.net/projects/fooeditengine/</licenseUrl>
+    <projectUrl>https://ja.osdn.net/projects/fooeditengine/</projectUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>Textbox with Hilight and Regex and Folding</description>
+    <releaseNotes>first release</releaseNotes>
+    <copyright>Copyright 2018</copyright>
+    <tags>Textbox Hilight</tags>
+    <dependencies>
+      <dependency id="SharpDX" version="4.0.1" />
+      <dependency id="SharpDX.Direct2D1" version="4.0.1" />
+      <dependency id="SharpDX.DXGI" version="4.0.1" />
+      <dependency id="SharpDX.Mathematics" version="4.0.1" />
+    </dependencies>
+  </metadata>
+  <files>
+    <file src=".\bin\Release\FooEditEngine.Windows.dll" target="lib\winfrom"/>
+    <file src=".\bin\Release\FooEditEngine.Windows.pdb" target="lib\winfrom"/>
+  </files>
+</package>
\ No newline at end of file

diff --git a/Windows/FooEditEngine/FooTextBox.cs b/Windows/FooEditEngine/FooTextBox.cs
index 0c9709b..0b7c134 100644 (file)
--- a/Windows/FooEditEngine/FooTextBox.cs
+++ b/Windows/FooEditEngine/FooTextBox.cs
@@ -604,7 +604,7 @@ namespace FooEditEngine.Windows
         {
             get
             {
-                return this.LineNumber;
+                return this.LineNumberColor;
             }
             set
             {

diff --git a/Windows/FooEditEngine/Properties/AssemblyInfo.cs b/Windows/FooEditEngine/Properties/AssemblyInfo.cs
index 663531a..cbd6857 100644 (file)
--- a/Windows/FooEditEngine/Properties/AssemblyInfo.cs
+++ b/Windows/FooEditEngine/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を 
 // 既定値にすることができます:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.34.0.0")]
-[assembly: AssemblyFileVersion("1.34.0.0")]
+[assembly: AssemblyVersion("1.34.1.0")]
+[assembly: AssemblyFileVersion("1.34.1.0")]