Some code re-organization.

diff --git a/.gitignore b/.gitignore
index 87d995a..dac1f3b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -22,10 +22,10 @@
 /bindings/Java/native/obj
 /bindings/Java/wrapper/bin
 /bindings/Java/wrapper/out
-/bindings/Microsoft.NET/MHashDotNet384.Example/obj
-/bindings/Microsoft.NET/MHashDotNet384.Wrapper/obj
-/bindings/Microsoft.NET/bin
-/bindings/Microsoft.NET/ipch
+/bindings/Microsoft.NET/example/bin
+/bindings/Microsoft.NET/example/obj
+/bindings/Microsoft.NET/wrapper/bin
+/bindings/Microsoft.NET/wrapper/obj
 /bindings/Python/native/bin
 /bindings/Python/native/obj
 /ipch

diff --git a/bindings/Microsoft.NET/MHashDotNet384.Example/MHashDotNet384.Example.csproj b/bindings/Microsoft.NET/example/MHashDotNet384_Example.csproj
similarity index 97%
rename from bindings/Microsoft.NET/MHashDotNet384.Example/MHashDotNet384.Example.csproj
rename to bindings/Microsoft.NET/example/MHashDotNet384_Example.csproj
index 6b07d87..7fbbcae 100644 (file)
--- a/bindings/Microsoft.NET/MHashDotNet384.Example/MHashDotNet384.Example.csproj
+++ b/bindings/Microsoft.NET/example/MHashDotNet384_Example.csproj
@@ -7,8 +7,8 @@
     <ProjectGuid>{E11B4C39-0C15-4127-AF18-4EC9EFE79C6C}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>MHashDotNet384.Example</RootNamespace>
-    <AssemblyName>MHashDotNet384.Example</AssemblyName>
+    <RootNamespace>MHashDotNet384_Example</RootNamespace>
+    <AssemblyName>MHashDotNet384</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -151,7 +151,7 @@
     <AppDesigner Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\MHashDotNet384.Wrapper\MHashDotNet384.Wrapper.vcxproj">
+    <ProjectReference Include="..\wrapper\MHashDotNet384_Wrapper.vcxproj">
       <Project>{4a7224b3-8b4d-49be-b215-79bd5ad5989a}</Project>
       <Name>MHashDotNet384.Wrapper</Name>
     </ProjectReference>

diff --git a/bindings/Microsoft.NET/MHashDotNet384.sln b/bindings/Microsoft.NET/example/MHashDotNet384_Example.sln
similarity index 89%
rename from bindings/Microsoft.NET/MHashDotNet384.sln
rename to bindings/Microsoft.NET/example/MHashDotNet384_Example.sln
index 3133b46..d6b8d4f 100644 (file)
--- a/bindings/Microsoft.NET/MHashDotNet384.sln
+++ b/bindings/Microsoft.NET/example/MHashDotNet384_Example.sln
@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.24720.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MHashDotNet384.Wrapper", "MHashDotNet384.Wrapper\MHashDotNet384.Wrapper.vcxproj", "{4A7224B3-8B4D-49BE-B215-79BD5AD5989A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MHashDotNet384_Wrapper", "..\wrapper\MHashDotNet384_Wrapper.vcxproj", "{4A7224B3-8B4D-49BE-B215-79BD5AD5989A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MHashDotNet384.Example", "MHashDotNet384.Example\MHashDotNet384.Example.csproj", "{E11B4C39-0C15-4127-AF18-4EC9EFE79C6C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MHashDotNet384_Example", "MHashDotNet384_Example.csproj", "{E11B4C39-0C15-4127-AF18-4EC9EFE79C6C}"
 EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/bindings/Microsoft.NET/MHashDotNet384.Example/Properties/AssemblyInfo.cs b/bindings/Microsoft.NET/example/Properties/AssemblyInfo.cs
similarity index 100%
rename from bindings/Microsoft.NET/MHashDotNet384.Example/Properties/AssemblyInfo.cs
rename to bindings/Microsoft.NET/example/Properties/AssemblyInfo.cs

diff --git a/bindings/Microsoft.NET/MHashDotNet384.Example/Properties/Resources.Designer.cs b/bindings/Microsoft.NET/example/Properties/Resources.Designer.cs
similarity index 100%
rename from bindings/Microsoft.NET/MHashDotNet384.Example/Properties/Resources.Designer.cs
rename to bindings/Microsoft.NET/example/Properties/Resources.Designer.cs

diff --git a/bindings/Microsoft.NET/MHashDotNet384.Example/Properties/Resources.resx b/bindings/Microsoft.NET/example/Properties/Resources.resx
similarity index 100%
rename from bindings/Microsoft.NET/MHashDotNet384.Example/Properties/Resources.resx
rename to bindings/Microsoft.NET/example/Properties/Resources.resx

diff --git a/bindings/Microsoft.NET/MHashDotNet384.Example/Properties/Settings.Designer.cs b/bindings/Microsoft.NET/example/Properties/Settings.Designer.cs
similarity index 100%
rename from bindings/Microsoft.NET/MHashDotNet384.Example/Properties/Settings.Designer.cs
rename to bindings/Microsoft.NET/example/Properties/Settings.Designer.cs

diff --git a/bindings/Microsoft.NET/MHashDotNet384.Example/Properties/Settings.settings b/bindings/Microsoft.NET/example/Properties/Settings.settings
similarity index 100%
rename from bindings/Microsoft.NET/MHashDotNet384.Example/Properties/Settings.settings
rename to bindings/Microsoft.NET/example/Properties/Settings.settings

diff --git a/bindings/Microsoft.NET/MHashDotNet384.Example/app.config b/bindings/Microsoft.NET/example/app.config
similarity index 100%
rename from bindings/Microsoft.NET/MHashDotNet384.Example/app.config
rename to bindings/Microsoft.NET/example/app.config

diff --git a/bindings/Microsoft.NET/MHashDotNet384.Example/app.ico b/bindings/Microsoft.NET/example/app.ico
similarity index 100%
rename from bindings/Microsoft.NET/MHashDotNet384.Example/app.ico
rename to bindings/Microsoft.NET/example/app.ico

diff --git a/bindings/Microsoft.NET/MHashDotNet384.Example/exe.ico b/bindings/Microsoft.NET/example/exe.ico
similarity index 100%
rename from bindings/Microsoft.NET/MHashDotNet384.Example/exe.ico
rename to bindings/Microsoft.NET/example/exe.ico

diff --git a/bindings/Microsoft.NET/MHashDotNet384.Example/res/exe.ico b/bindings/Microsoft.NET/example/res/exe.ico
similarity index 100%
rename from bindings/Microsoft.NET/MHashDotNet384.Example/res/exe.ico
rename to bindings/Microsoft.NET/example/res/exe.ico

diff --git a/bindings/Microsoft.NET/MHashDotNet384.Example/src/App.xaml b/bindings/Microsoft.NET/example/src/App.xaml
similarity index 100%
rename from bindings/Microsoft.NET/MHashDotNet384.Example/src/App.xaml
rename to bindings/Microsoft.NET/example/src/App.xaml

diff --git a/bindings/Microsoft.NET/MHashDotNet384.Example/src/App.xaml.cs b/bindings/Microsoft.NET/example/src/App.xaml.cs
similarity index 100%
rename from bindings/Microsoft.NET/MHashDotNet384.Example/src/App.xaml.cs
rename to bindings/Microsoft.NET/example/src/App.xaml.cs

diff --git a/bindings/Microsoft.NET/MHashDotNet384.Example/src/MainWindow.xaml b/bindings/Microsoft.NET/example/src/MainWindow.xaml
similarity index 100%
rename from bindings/Microsoft.NET/MHashDotNet384.Example/src/MainWindow.xaml
rename to bindings/Microsoft.NET/example/src/MainWindow.xaml

diff --git a/bindings/Microsoft.NET/MHashDotNet384.Example/src/MainWindow.xaml.cs b/bindings/Microsoft.NET/example/src/MainWindow.xaml.cs
similarity index 100%
rename from bindings/Microsoft.NET/MHashDotNet384.Example/src/MainWindow.xaml.cs
rename to bindings/Microsoft.NET/example/src/MainWindow.xaml.cs

diff --git a/bindings/Microsoft.NET/wrapper/MHashDotNet384_Wrapper.sln b/bindings/Microsoft.NET/wrapper/MHashDotNet384_Wrapper.sln
new file mode 100644 (file)
index 0000000..d127374
--- /dev/null
+++ b/bindings/Microsoft.NET/wrapper/MHashDotNet384_Wrapper.sln
@@ -0,0 +1,36 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.24720.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MHashDotNet384_Wrapper", "MHashDotNet384_Wrapper.vcxproj", "{4A7224B3-8B4D-49BE-B215-79BD5AD5989A}"
+EndProject
+Global
+       GlobalSection(SolutionConfigurationPlatforms) = preSolution
+               Debug|x64 = Debug|x64
+               Debug|x86 = Debug|x86
+               Release|x64 = Release|x64
+               Release|x86 = Release|x86
+       EndGlobalSection
+       GlobalSection(ProjectConfigurationPlatforms) = postSolution
+               {4A7224B3-8B4D-49BE-B215-79BD5AD5989A}.Debug|x64.ActiveCfg = Debug|x64
+               {4A7224B3-8B4D-49BE-B215-79BD5AD5989A}.Debug|x64.Build.0 = Debug|x64
+               {4A7224B3-8B4D-49BE-B215-79BD5AD5989A}.Debug|x86.ActiveCfg = Debug|Win32
+               {4A7224B3-8B4D-49BE-B215-79BD5AD5989A}.Debug|x86.Build.0 = Debug|Win32
+               {4A7224B3-8B4D-49BE-B215-79BD5AD5989A}.Release|x64.ActiveCfg = Release|x64
+               {4A7224B3-8B4D-49BE-B215-79BD5AD5989A}.Release|x64.Build.0 = Release|x64
+               {4A7224B3-8B4D-49BE-B215-79BD5AD5989A}.Release|x86.ActiveCfg = Release|Win32
+               {4A7224B3-8B4D-49BE-B215-79BD5AD5989A}.Release|x86.Build.0 = Release|Win32
+               {E11B4C39-0C15-4127-AF18-4EC9EFE79C6C}.Debug|x64.ActiveCfg = Debug|x64
+               {E11B4C39-0C15-4127-AF18-4EC9EFE79C6C}.Debug|x64.Build.0 = Debug|x64
+               {E11B4C39-0C15-4127-AF18-4EC9EFE79C6C}.Debug|x86.ActiveCfg = Debug|x86
+               {E11B4C39-0C15-4127-AF18-4EC9EFE79C6C}.Debug|x86.Build.0 = Debug|x86
+               {E11B4C39-0C15-4127-AF18-4EC9EFE79C6C}.Release|x64.ActiveCfg = Release|x64
+               {E11B4C39-0C15-4127-AF18-4EC9EFE79C6C}.Release|x64.Build.0 = Release|x64
+               {E11B4C39-0C15-4127-AF18-4EC9EFE79C6C}.Release|x86.ActiveCfg = Release|x86
+               {E11B4C39-0C15-4127-AF18-4EC9EFE79C6C}.Release|x86.Build.0 = Release|x86
+       EndGlobalSection
+       GlobalSection(SolutionProperties) = preSolution
+               HideSolutionNode = FALSE
+       EndGlobalSection
+EndGlobal

diff --git a/bindings/Microsoft.NET/MHashDotNet384.Wrapper/MHashDotNet384.Wrapper.vcxproj b/bindings/Microsoft.NET/wrapper/MHashDotNet384_Wrapper.vcxproj
similarity index 94%
rename from bindings/Microsoft.NET/MHashDotNet384.Wrapper/MHashDotNet384.Wrapper.vcxproj
rename to bindings/Microsoft.NET/wrapper/MHashDotNet384_Wrapper.vcxproj
index 979c104..b381ae0 100644 (file)
--- a/bindings/Microsoft.NET/MHashDotNet384.Wrapper/MHashDotNet384.Wrapper.vcxproj
+++ b/bindings/Microsoft.NET/wrapper/MHashDotNet384_Wrapper.vcxproj
@@ -22,8 +22,8 @@
     <ProjectGuid>{4A7224B3-8B4D-49BE-B215-79BD5AD5989A}</ProjectGuid>
     <TargetFrameworkVersion>v3.0</TargetFrameworkVersion>
     <Keyword>ManagedCProj</Keyword>
-    <RootNamespace>MHashDotNet384</RootNamespace>
-    <ProjectName>MHashDotNet384.Wrapper</ProjectName>
+    <RootNamespace>MHashDotNet384_Wrapper</RootNamespace>
+    <ProjectName>MHashDotNet384_Wrapper</ProjectName>
     <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -105,7 +105,7 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <AdditionalIncludeDirectories>$(SolutionDir)\..\..\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)\..\..\..\include</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <AdditionalDependencies />
@@ -120,7 +120,7 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <AdditionalIncludeDirectories>$(SolutionDir)\..\..\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)\..\..\..\include</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <AdditionalDependencies />
@@ -134,7 +134,7 @@
       <WarningLevel>Level3</WarningLevel>
       <PreprocessorDefinitions>WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <AdditionalIncludeDirectories>$(SolutionDir)\..\..\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)\..\..\..\include</AdditionalIncludeDirectories>
       <Optimization>Full</Optimization>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <IntrinsicFunctions>true</IntrinsicFunctions>
@@ -160,7 +160,7 @@
       <WarningLevel>Level3</WarningLevel>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <AdditionalIncludeDirectories>$(SolutionDir)\..\..\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)\..\..\..\include</AdditionalIncludeDirectories>
       <Optimization>Full</Optimization>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <IntrinsicFunctions>true</IntrinsicFunctions>

diff --git a/bindings/Microsoft.NET/MHashDotNet384.Wrapper/MHashDotNet384.Wrapper.vcxproj.filters b/bindings/Microsoft.NET/wrapper/MHashDotNet384_Wrapper.vcxproj.filters
similarity index 100%
rename from bindings/Microsoft.NET/MHashDotNet384.Wrapper/MHashDotNet384.Wrapper.vcxproj.filters
rename to bindings/Microsoft.NET/wrapper/MHashDotNet384_Wrapper.vcxproj.filters

diff --git a/bindings/Microsoft.NET/MHashDotNet384.Wrapper/res/app.aps b/bindings/Microsoft.NET/wrapper/res/app.aps
similarity index 100%
rename from bindings/Microsoft.NET/MHashDotNet384.Wrapper/res/app.aps
rename to bindings/Microsoft.NET/wrapper/res/app.aps

diff --git a/bindings/Microsoft.NET/MHashDotNet384.Wrapper/res/app.ico b/bindings/Microsoft.NET/wrapper/res/app.ico
similarity index 100%
rename from bindings/Microsoft.NET/MHashDotNet384.Wrapper/res/app.ico
rename to bindings/Microsoft.NET/wrapper/res/app.ico

diff --git a/bindings/Microsoft.NET/MHashDotNet384.Wrapper/res/app.rc b/bindings/Microsoft.NET/wrapper/res/app.rc
similarity index 100%
rename from bindings/Microsoft.NET/MHashDotNet384.Wrapper/res/app.rc
rename to bindings/Microsoft.NET/wrapper/res/app.rc

diff --git a/bindings/Microsoft.NET/MHashDotNet384.Wrapper/src/AssemblyInfo.cpp b/bindings/Microsoft.NET/wrapper/src/AssemblyInfo.cpp
similarity index 100%
rename from bindings/Microsoft.NET/MHashDotNet384.Wrapper/src/AssemblyInfo.cpp
rename to bindings/Microsoft.NET/wrapper/src/AssemblyInfo.cpp

diff --git a/bindings/Microsoft.NET/MHashDotNet384.Wrapper/src/MHashDotNet384.cpp b/bindings/Microsoft.NET/wrapper/src/MHashDotNet384.cpp
similarity index 100%
rename from bindings/Microsoft.NET/MHashDotNet384.Wrapper/src/MHashDotNet384.cpp
rename to bindings/Microsoft.NET/wrapper/src/MHashDotNet384.cpp

diff --git a/bindings/Microsoft.NET/MHashDotNet384.Wrapper/src/MHashDotNet384.h b/bindings/Microsoft.NET/wrapper/src/MHashDotNet384.h
similarity index 100%
rename from bindings/Microsoft.NET/MHashDotNet384.Wrapper/src/MHashDotNet384.h
rename to bindings/Microsoft.NET/wrapper/src/MHashDotNet384.h