Added Common.Logging NuGet package so it restores during build

Moved packages folder to the root folder of repository Ignoring .vs folfer
Bounz · Sep 11, 2017 · 8f62d26 · 8f62d26
1 parent 6156c50
commit 8f62d26
Show file tree

Hide file tree

Showing 9 changed files with 405 additions and 347 deletions.
diff --git a/.gitignore b/.gitignore
@@ -17,4 +17,4 @@ Thumbs.db
 packages/
 !packages/repositories.config
 
-HomeGenie_Windows/\.vs/
+\.vs/
diff --git a/BaseFiles/Windows/Windows.csproj b/BaseFiles/Windows/Windows.csproj
@@ -42,6 +42,7 @@
     <Compile Include="dummy.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="lame.exe">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -75,4 +76,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
diff --git a/BaseFiles/Windows/app.config b/BaseFiles/Windows/app.config
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Common.Logging.Core" publicKeyToken="af08829b84f0328e" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Common.Logging" publicKeyToken="af08829b84f0328e" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
diff --git a/HomeGenie/HomeGenie.csproj b/HomeGenie/HomeGenie.csproj
diff --git a/HomeGenie/app.config b/HomeGenie/app.config
@@ -1,16 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup useLegacyV2RuntimeActivationPolicy="true">
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
     </startup>
    <runtime>
-        <legacyUnhandledExceptionPolicy enabled="1"/>
+        <legacyUnhandledExceptionPolicy enabled="1" />
         <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-            <probing privatePath="lib;lib/shared;lib/mig;lib/ape;bin;"/>
+            <probing privatePath="lib;lib/shared;lib/mig;lib/ape;bin;" />
             <dependentAssembly>
                 <assemblyIdentity name="NLog" publicKeyToken="5120e14c03d0593c" culture="neutral" />
                 <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.1.0.0" />
             </dependentAssembly>
+            <dependentAssembly>
+                <assemblyIdentity name="Common.Logging.Core" publicKeyToken="af08829b84f0328e" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
+            </dependentAssembly>
+            <dependentAssembly>
+                <assemblyIdentity name="Common.Logging" publicKeyToken="af08829b84f0328e" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
+            </dependentAssembly>
         </assemblyBinding>
    </runtime>
 </configuration>
diff --git a/HomeGenie/packages.config b/HomeGenie/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Common.Logging" version="3.1.0" targetFramework="net45" />
+  <package id="Common.Logging.Core" version="3.1.0" targetFramework="net45" />
+</packages>
diff --git a/HomeGenie_Windows/HomeGenieService/App.config b/HomeGenie_Windows/HomeGenieService/App.config
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <system.serviceModel>
     <services>
@@ -7,22 +7,35 @@
       <service name="HomeGenie.WCF.ManagerService" behaviorConfiguration="ManagerServiceBehavior">
         <host>
           <baseAddresses>
-            <add baseAddress="net.tcp://localhost:8073/HomeGenie/service"/>
+            <add baseAddress="net.tcp://localhost:8073/HomeGenie/service" />
           </baseAddresses>
         </host>
         <!-- this endpoint is exposed at the base address provided  -->
-        <endpoint address="" binding="netTcpBinding" contract="HomeGenie.WCF.IManager"/>
+        <endpoint address="" binding="netTcpBinding" contract="HomeGenie.WCF.IManager" />
         <!-- the mex endpoint is exposed at /HomeGenie/service/mex -->
-        <endpoint address="mex" binding="mexTcpBinding" contract="IMetadataExchange"/>
+        <endpoint address="mex" binding="mexTcpBinding" contract="IMetadataExchange" />
       </service>
     </services>
     <behaviors>
       <serviceBehaviors>
         <behavior name="ManagerServiceBehavior">
-          <serviceMetadata httpGetEnabled="false"/>
-          <serviceDebug includeExceptionDetailInFaults="False"/>
+          <serviceMetadata httpGetEnabled="false" />
+          <serviceDebug includeExceptionDetailInFaults="False" />
         </behavior>
       </serviceBehaviors>
     </behaviors>
   </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" /></startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Common.Logging.Core" publicKeyToken="af08829b84f0328e" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Common.Logging" publicKeyToken="af08829b84f0328e" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
diff --git a/HomeGenie_Windows/HomeGenie_VS10.sln.DotSettings b/HomeGenie_Windows/HomeGenie_VS10.sln.DotSettings
@@ -42,4 +42,9 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/WebNaming/UserRules/=ASP_005FTAG_005FPREFIX/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=NAMESPACE_005FALIAS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FRESOURCE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String></wpf:ResourceDictionary>
+	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FRESOURCE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EJavaScript_002ECodeStyle_002ESettingsUpgrade_002EJsParsFormattingSettingsUpgrader/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EJavaScript_002ECodeStyle_002ESettingsUpgrade_002EJsWrapperSettingsUpgrader/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
diff --git a/nuget.config b/nuget.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <config>
+    <add key="repositoryPath" value="packages" />
+  </config>
+</configuration>