trying to fix shit after a force push

nastark519 · Nov 23, 2017 · 381f471 · 381f471
1 parent 5eab3eb
commit 381f471
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/HW5/HW5/HW5.csproj b/HW5/HW5/HW5.csproj
@@ -190,13 +190,13 @@
     <Content Include="Web.Release.config">
       <DependentUpon>Web.config</DependentUpon>
     </Content>
-    <Content Include="Views\Web.config" />
     <Content Include="Views\_ViewStart.cshtml" />
     <Content Include="Views\Shared\Error.cshtml" />
     <Content Include="Views\Shared\_Layout.cshtml" />
     <Content Include="Views\Home\Page1.cshtml" />
     <Content Include="Views\Home\Page2.cshtml" />
     <Content Include="Views\Home\Index.cshtml" />
+    <Content Include="Views\Web.config" />
   </ItemGroup>
   <ItemGroup />
   <ItemGroup>

diff --git a/HW5/HW5/Views/Web.config b/HW5/HW5/Views/Web.config
@@ -8,10 +8,12 @@
     </sectionGroup>
   </configSections>
 
-    <connectionStrings>
-      <add name="DMVContext" connectionString="Data Source=(LocalDB)\MSSQLLocalDB;AttachDbFilename=C:\Users\nstar\Desktop\CS\460\homework460\HW5\HW5\App_Data\DMVDatabase1.mdf;Integrated Security=True" providerName="System.Data.SqlClient"/>
-    </connectionStrings>
-
+<!-- didn't know which Web.config to put this in.
+  <connectionStrings>
+    <add name="DMVContext" connectionString="Data Source=(LocalDB)\MSSQLLocalDB;AttachDbFilename=C:\Users\nstar\Desktop\CS\460\homework460\HW5\HW5\App_Data\DMVDatabase1.mdf;Integrated Security=True" providerName="System.Data.SqlClient"/>
+  </connectionStrings>
+  -->
+
 
   <system.web.webPages.razor>
     <host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
@@ -45,4 +47,4 @@
       </assemblies>
     </compilation>
   </system.web>
-</configuration>
+</configuration>
diff --git a/HW5/HW5/Web.config b/HW5/HW5/Web.config
@@ -8,6 +8,11 @@
     <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
     <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
   </configSections>
+
+  <connectionStrings>
+    <add name="DMVContext" connectionString="Data Source=(LocalDB)\MSSQLLocalDB;AttachDbFilename=C:\Users\nstar\Desktop\CS\460\homework460\HW5\HW5\App_Data\DMVDatabase1.mdf;Integrated Security=True" providerName="System.Data.SqlClient"/>
+  </connectionStrings>
+
   <appSettings>
     <add key="webpages:Version" value="3.0.0.0" />
     <add key="webpages:Enabled" value="false" />