Merge branch 'develop'

SynapseProject · Feb 19, 2018 · 2d51306 · 2d51306
2 parents 107a4dc + 3992167
commit 2d51306
Show file tree

Hide file tree

Showing 15 changed files with 42 additions and 22 deletions.
diff --git a/Syanpse.Services.ActiveDirectoryApi/Properties/AssemblyInfo.cs b/Syanpse.Services.ActiveDirectoryApi/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion( "1.0.0.0" )]
-[assembly: AssemblyFileVersion( "1.0.18038.0" )]
+[assembly: AssemblyFileVersion( "1.0.18050.0" )]
diff --git a/Syanpse.Services.ActiveDirectoryApi/Synapse.Services.ActiveDirectoryApi.csproj b/Syanpse.Services.ActiveDirectoryApi/Synapse.Services.ActiveDirectoryApi.csproj
@@ -38,11 +38,11 @@
       <HintPath>..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Synapse.Core, Version=0.1.0.0, Culture=neutral, PublicKeyToken=a6de1cc56b73f982, processorArchitecture=MSIL">
-      <HintPath>..\packages\Synapse.Core.Signed.0.1.17305.0-beta\lib\net45\Synapse.Core.dll</HintPath>
+    <Reference Include="Synapse.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=a6de1cc56b73f982, processorArchitecture=MSIL">
+      <HintPath>..\packages\Synapse.Core.Signed.1.0.18048\lib\net45\Synapse.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Synapse.Server.Extensibility, Version=0.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Synapse.Server.Extensibility.0.1.17218.0-beta\lib\net45\Synapse.Server.Extensibility.dll</HintPath>
+    <Reference Include="Synapse.Server.Extensibility, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Synapse.Server.Extensibility.1.0.18048\lib\net45\Synapse.Server.Extensibility.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -78,6 +78,7 @@
     <Compile Include="Utilities.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="packages.config">
       <SubType>Designer</SubType>
     </None>

diff --git a/Syanpse.Services.ActiveDirectoryApi/app.config b/Syanpse.Services.ActiveDirectoryApi/app.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Synapse.Core" publicKeyToken="a6de1cc56b73f982" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.0.0" newVersion="1.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
diff --git a/Syanpse.Services.ActiveDirectoryApi/packages.config b/Syanpse.Services.ActiveDirectoryApi/packages.config
@@ -4,7 +4,7 @@
   <package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net452" />
   <package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net452" />
   <package id="Newtonsoft.Json" version="6.0.4" targetFramework="net452" />
-  <package id="Synapse.Core.Signed" version="0.1.17305.0-beta" targetFramework="net452" />
-  <package id="Synapse.Server.Extensibility" version="0.1.17218.0-beta" targetFramework="net452" />
+  <package id="Synapse.Core.Signed" version="1.0.18048" targetFramework="net452" />
+  <package id="Synapse.Server.Extensibility" version="1.0.18048" targetFramework="net452" />
   <package id="YamlDotNet.Signed" version="4.0.0" targetFramework="net452" />
 </packages>
diff --git a/Synapse.ActiveDirectory.Core/Properties/AssemblyInfo.cs b/Synapse.ActiveDirectory.Core/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion( "1.0.0.0" )]
-[assembly: AssemblyFileVersion( "1.0.18038.0" )]
+[assembly: AssemblyFileVersion( "1.0.18050.0" )]
diff --git a/Synapse.ActiveDirectory.DaclRoleManager/Synapse.ActiveDirectory.DaclRoleManager.csproj b/Synapse.ActiveDirectory.DaclRoleManager/Synapse.ActiveDirectory.DaclRoleManager.csproj
@@ -30,8 +30,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Synapse.Core, Version=0.1.0.0, Culture=neutral, PublicKeyToken=a6de1cc56b73f982, processorArchitecture=MSIL">
-      <HintPath>..\packages\Synapse.Core.Signed.0.1.17305.0-beta\lib\net45\Synapse.Core.dll</HintPath>
+    <Reference Include="Synapse.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=a6de1cc56b73f982, processorArchitecture=MSIL">
+      <HintPath>..\packages\Synapse.Core.Signed.1.0.18048\lib\net45\Synapse.Core.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/Synapse.ActiveDirectory.DaclRoleManager/packages.config b/Synapse.ActiveDirectory.DaclRoleManager/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Synapse.Core.Signed" version="0.1.17305.0-beta" targetFramework="net452" />
+  <package id="Synapse.Core.Signed" version="1.0.18048" targetFramework="net452" />
   <package id="YamlDotNet.Signed" version="4.0.0" targetFramework="net452" />
 </packages>
diff --git a/Synapse.ActiveDirectory.Sandbox/App.config b/Synapse.ActiveDirectory.Sandbox/App.config
@@ -1,6 +1,14 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
     </startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Synapse.Core" publicKeyToken="a6de1cc56b73f982" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.0.0" newVersion="1.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
 </configuration>
diff --git a/Synapse.ActiveDirectory.Sandbox/Synapse.ActiveDirectory.Sandbox.csproj b/Synapse.ActiveDirectory.Sandbox/Synapse.ActiveDirectory.Sandbox.csproj
@@ -32,8 +32,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Synapse.Core, Version=0.1.0.0, Culture=neutral, PublicKeyToken=a6de1cc56b73f982, processorArchitecture=MSIL">
-      <HintPath>..\packages\Synapse.Core.Signed.0.1.17305.0-beta\lib\net45\Synapse.Core.dll</HintPath>
+    <Reference Include="Synapse.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=a6de1cc56b73f982, processorArchitecture=MSIL">
+      <HintPath>..\packages\Synapse.Core.Signed.1.0.18048\lib\net45\Synapse.Core.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/Synapse.ActiveDirectory.Sandbox/packages.config b/Synapse.ActiveDirectory.Sandbox/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Synapse.Core.Signed" version="0.1.17305.0-beta" targetFramework="net452" />
+  <package id="Synapse.Core.Signed" version="1.0.18048" targetFramework="net452" />
   <package id="YamlDotNet.Signed" version="4.0.0" targetFramework="net452" />
 </packages>
diff --git a/Synapse.ActiveDirectory.Tests/Synapse.ActiveDirectory.Tests.csproj b/Synapse.ActiveDirectory.Tests/Synapse.ActiveDirectory.Tests.csproj
@@ -47,8 +47,8 @@
     <Reference Include="nunit.framework, Version=3.7.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
       <HintPath>..\packages\NUnit.3.7.0\lib\net45\nunit.framework.dll</HintPath>
     </Reference>
-    <Reference Include="Synapse.Core, Version=0.1.0.0, Culture=neutral, PublicKeyToken=a6de1cc56b73f982, processorArchitecture=MSIL">
-      <HintPath>..\packages\Synapse.Core.Signed.0.1.17305.0-beta\lib\net45\Synapse.Core.dll</HintPath>
+    <Reference Include="Synapse.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=a6de1cc56b73f982, processorArchitecture=MSIL">
+      <HintPath>..\packages\Synapse.Core.Signed.1.0.18048\lib\net45\Synapse.Core.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/Synapse.ActiveDirectory.Tests/packages.config b/Synapse.ActiveDirectory.Tests/packages.config
@@ -3,6 +3,6 @@
   <package id="MSTest.TestAdapter" version="1.1.11" targetFramework="net452" />
   <package id="MSTest.TestFramework" version="1.1.11" targetFramework="net452" />
   <package id="NUnit" version="3.7.0" targetFramework="net452" />
-  <package id="Synapse.Core.Signed" version="0.1.17305.0-beta" targetFramework="net452" />
+  <package id="Synapse.Core.Signed" version="1.0.18048" targetFramework="net452" />
   <package id="YamlDotNet.Signed" version="4.0.0" targetFramework="net452" />
 </packages>
diff --git a/Synapse.Handlers.ActiveDirectory/Properties/AssemblyInfo.cs b/Synapse.Handlers.ActiveDirectory/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion( "1.0.0.0" )]
-[assembly: AssemblyFileVersion( "1.0.18038.0" )]
+[assembly: AssemblyFileVersion( "1.0.18050.0" )]
diff --git a/Synapse.Handlers.ActiveDirectory/Synapse.Handlers.ActiveDirectory.csproj b/Synapse.Handlers.ActiveDirectory/Synapse.Handlers.ActiveDirectory.csproj
@@ -34,8 +34,8 @@
       <HintPath>..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Synapse.Core, Version=0.1.0.0, Culture=neutral, PublicKeyToken=a6de1cc56b73f982, processorArchitecture=MSIL">
-      <HintPath>..\packages\Synapse.Core.Signed.0.1.17305.0-beta\lib\net45\Synapse.Core.dll</HintPath>
+    <Reference Include="Synapse.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=a6de1cc56b73f982, processorArchitecture=MSIL">
+      <HintPath>..\packages\Synapse.Core.Signed.1.0.18048\lib\net45\Synapse.Core.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/Synapse.Handlers.ActiveDirectory/packages.config b/Synapse.Handlers.ActiveDirectory/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Newtonsoft.Json" version="6.0.4" targetFramework="net452" />
-  <package id="Synapse.Core.Signed" version="0.1.17305.0-beta" targetFramework="net452" />
+  <package id="Synapse.Core.Signed" version="1.0.18048" targetFramework="net452" />
   <package id="YamlDotNet.Signed" version="4.0.0" targetFramework="net452" />
 </packages>