Updated to the most recent version, release this on master.

[release]
dapplo · May 23, 2018 · 16306df · 16306df
1 parent b73deda
commit 16306df
Show file tree

Hide file tree

Showing 11 changed files with 39 additions and 35 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -11,7 +11,7 @@ branches:
   - /feature.*/
 environment:
   NuGetApiKey:
-    secure: xkDQ385+smLqdzhESsXBJvnUjK4FZ4Djjrqi9tFR29dwESIvPYOrQAqgri5Nf/fA
+    secure: FkbOZI29wVSKdzHuFOq9tY8cq05Sy6vFKwvqYnUhDVamagkTUrjNJElPPoACP8Ov
   CoverallsRepoToken:
     secure: LTJUAbG51ZPCn02tphWKlD6lVpm6DOgW9LUYAoR0g6QpVKFRMSCMMgjZxWPXcaLs
 build_script:

diff --git a/src/Dapplo.Owin.Tests/Dapplo.Owin.Tests.csproj b/src/Dapplo.Owin.Tests/Dapplo.Owin.Tests.csproj
@@ -51,14 +51,14 @@
     <Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
       <HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
     </Reference>
-    <Reference Include="Dapplo.Addons, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll</HintPath>
+    <Reference Include="Dapplo.Addons, Version=1.0.44.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll</HintPath>
     </Reference>
-    <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
+    <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.44.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
     </Reference>
-    <Reference Include="Dapplo.Addons.Config, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dapplo.Addons.Config.1.0.38-beta\lib\net45\Dapplo.Addons.Config.dll</HintPath>
+    <Reference Include="Dapplo.Addons.Config, Version=1.0.44.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Dapplo.Addons.Config.1.0.44\lib\net45\Dapplo.Addons.Config.dll</HintPath>
     </Reference>
     <Reference Include="Dapplo.HttpExtensions, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Dapplo.HttpExtensions.0.8.35\lib\net46\Dapplo.HttpExtensions.dll</HintPath>

diff --git a/src/Dapplo.Owin.Tests/OwinAutofacTests.cs b/src/Dapplo.Owin.Tests/OwinAutofacTests.cs
@@ -54,14 +54,16 @@ public OwinAutofacTests(ITestOutputHelper testOutputHelper)
         [Fact]
         public async Task TestStartupShutdownAsync()
         {
-            using (var bootstrapper = new ApplicationBootstrapper(ApplicationName))
+            var applicationConfig = ApplicationConfig.Create()
+                .WithApplicationName(ApplicationName)
+                // Normally one would add Dapplo.Owin and Dapplo.SignalR dlls somewhere in a components or addons directory.
+                // This would prevent to have a direct reference.
+                .WithAssemblyPatterns("Dapplo*");
+
+            using (var bootstrapper = new ApplicationBootstrapper(applicationConfig))
             {
                 bootstrapper.Configure();
 
-                // Normally one would add Dapplo.Owin and Dapplo.SignalR dlls somewhere in a components or addons directory.
-                // This would prevent to have a direct reference. Than use bootstrapper.AddScanDirectory to add this directory.
-                bootstrapper.FindAndLoadAssemblies("Dapplo*");
-
                 await bootstrapper.InitializeAsync();
 
                 // Force mapping of IIniSubSection to IIniSection

diff --git a/src/Dapplo.Owin.Tests/packages.config b/src/Dapplo.Owin.Tests/packages.config
@@ -4,9 +4,9 @@
   <package id="Autofac.Extras.AttributeMetadata" version="4.0.1" targetFramework="net46" />
   <package id="Autofac.Mef" version="4.0.0" targetFramework="net46" />
   <package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
-  <package id="Dapplo.Addons" version="1.0.38-beta" targetFramework="net46" />
-  <package id="Dapplo.Addons.Bootstrapper" version="1.0.38-beta" targetFramework="net46" />
-  <package id="Dapplo.Addons.Config" version="1.0.38-beta" targetFramework="net46" />
+  <package id="Dapplo.Addons" version="1.0.44" targetFramework="net46" />
+  <package id="Dapplo.Addons.Bootstrapper" version="1.0.44" targetFramework="net46" />
+  <package id="Dapplo.Addons.Config" version="1.0.44" targetFramework="net46" />
   <package id="Dapplo.HttpExtensions" version="0.8.35" targetFramework="net46" />
   <package id="Dapplo.Ini" version="0.5.28" targetFramework="net46" />
   <package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net46" />

diff --git a/src/Dapplo.Owin/Dapplo.Owin.csproj b/src/Dapplo.Owin/Dapplo.Owin.csproj
@@ -51,8 +51,8 @@
     <Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
       <HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
     </Reference>
-    <Reference Include="Dapplo.Addons, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll</HintPath>
+    <Reference Include="Dapplo.Addons, Version=1.0.44.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll</HintPath>
     </Reference>
     <Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll</HintPath>

diff --git a/src/Dapplo.Owin/packages.config b/src/Dapplo.Owin/packages.config
@@ -5,7 +5,7 @@
   <package id="Autofac.Mef" version="4.0.0" targetFramework="net451" />
   <package id="Autofac.Owin" version="4.2.0" targetFramework="net451" />
   <package id="CommonServiceLocator" version="2.0.3" targetFramework="net451" />
-  <package id="Dapplo.Addons" version="1.0.38-beta" targetFramework="net451" />
+  <package id="Dapplo.Addons" version="1.0.44" targetFramework="net451" />
   <package id="Dapplo.Ini" version="0.5.28" targetFramework="net451" />
   <package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net451" />
   <package id="Dapplo.Log" version="1.2.1" targetFramework="net451" />

diff --git a/src/Dapplo.SignalR.Tests/Dapplo.SignalR.Tests.csproj b/src/Dapplo.SignalR.Tests/Dapplo.SignalR.Tests.csproj
@@ -48,14 +48,14 @@
     <Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
       <HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
     </Reference>
-    <Reference Include="Dapplo.Addons, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll</HintPath>
+    <Reference Include="Dapplo.Addons, Version=1.0.44.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll</HintPath>
     </Reference>
-    <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.38-beta\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
+    <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.44.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.44\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
     </Reference>
-    <Reference Include="Dapplo.Addons.Config, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dapplo.Addons.Config.1.0.38-beta\lib\net45\Dapplo.Addons.Config.dll</HintPath>
+    <Reference Include="Dapplo.Addons.Config, Version=1.0.44.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Dapplo.Addons.Config.1.0.44\lib\net45\Dapplo.Addons.Config.dll</HintPath>
     </Reference>
     <Reference Include="Dapplo.HttpExtensions, Version=0.8.35.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Dapplo.HttpExtensions.0.8.35\lib\net46\Dapplo.HttpExtensions.dll</HintPath>

diff --git a/src/Dapplo.SignalR.Tests/SignalRTests.cs b/src/Dapplo.SignalR.Tests/SignalRTests.cs
@@ -57,15 +57,17 @@ public SignalRTests(ITestOutputHelper testOutputHelper)
         [Fact]
         public async Task TestStartupAsync()
         {
-            using (var bootstrapper = new ApplicationBootstrapper(ApplicationName))
+            var applicationConfig = ApplicationConfig.Create()
+                .WithApplicationName(ApplicationName)
+                // Normally one would add Dapplo.Owin and Dapplo.SignalR dlls somewhere in a components or addons directory.
+                // This would prevent to have a direct reference.
+                .WithAssemblyPatterns("Dapplo*");
+
+            using (var bootstrapper = new ApplicationBootstrapper(applicationConfig))
             {
 
                 bootstrapper.Configure();
 
-                // Normally one would add Dapplo.Owin and Dapplo.SignalR dlls somewhere in a components or addons directory.
-                // This would prevent to have a direct reference. Than use bootstrapper.AddScanDirectory to add this directory.
-                bootstrapper.FindAndLoadAssemblies("Dapplo*");
-
                 // Startup the bootstrapper
                 await bootstrapper.InitializeAsync();
 

diff --git a/src/Dapplo.SignalR.Tests/packages.config b/src/Dapplo.SignalR.Tests/packages.config
@@ -4,9 +4,9 @@
   <package id="Autofac.Extras.AttributeMetadata" version="4.0.1" targetFramework="net46" />
   <package id="Autofac.Mef" version="4.0.0" targetFramework="net46" />
   <package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
-  <package id="Dapplo.Addons" version="1.0.38-beta" targetFramework="net46" />
-  <package id="Dapplo.Addons.Bootstrapper" version="1.0.38-beta" targetFramework="net46" />
-  <package id="Dapplo.Addons.Config" version="1.0.38-beta" targetFramework="net46" />
+  <package id="Dapplo.Addons" version="1.0.44" targetFramework="net46" />
+  <package id="Dapplo.Addons.Bootstrapper" version="1.0.44" targetFramework="net46" />
+  <package id="Dapplo.Addons.Config" version="1.0.44" targetFramework="net46" />
   <package id="Dapplo.HttpExtensions" version="0.8.35" targetFramework="net46" />
   <package id="Dapplo.Ini" version="0.5.28" targetFramework="net46" />
   <package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net46" />

diff --git a/src/Dapplo.SignalR/Dapplo.SignalR.csproj b/src/Dapplo.SignalR/Dapplo.SignalR.csproj
@@ -51,8 +51,8 @@
     <Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
       <HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
     </Reference>
-    <Reference Include="Dapplo.Addons, Version=1.0.38.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dapplo.Addons.1.0.38-beta\lib\net45\Dapplo.Addons.dll</HintPath>
+    <Reference Include="Dapplo.Addons, Version=1.0.44.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Dapplo.Addons.1.0.44\lib\net45\Dapplo.Addons.dll</HintPath>
     </Reference>
     <Reference Include="Dapplo.Ini, Version=0.5.28.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Dapplo.Ini.0.5.28\lib\net45\Dapplo.Ini.dll</HintPath>

diff --git a/src/Dapplo.SignalR/packages.config b/src/Dapplo.SignalR/packages.config
@@ -5,7 +5,7 @@
   <package id="Autofac.Mef" version="4.0.0" targetFramework="net451" />
   <package id="Autofac.SignalR2" version="4.0.0" targetFramework="net451" />
   <package id="CommonServiceLocator" version="2.0.3" targetFramework="net451" />
-  <package id="Dapplo.Addons" version="1.0.38-beta" targetFramework="net451" />
+  <package id="Dapplo.Addons" version="1.0.44" targetFramework="net451" />
   <package id="Dapplo.Ini" version="0.5.28" targetFramework="net451" />
   <package id="Dapplo.InterfaceImpl" version="0.2.12" targetFramework="net451" />
   <package id="Dapplo.Log" version="1.2.1" targetFramework="net451" />