-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #17 from NBull92/dev
Updated Prism and dot Net Framework + Bugs
- Loading branch information
Showing
82 changed files
with
606 additions
and
574 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
Src/Business/ImprezGarage.Infrastructure.Services/Properties/Resources.Designer.cs
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
2 changes: 1 addition & 1 deletion
2
Src/Business/ImprezGarage.Infrastructure.Services/Properties/Settings.Designer.cs
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
15 changes: 15 additions & 0 deletions
15
Src/Business/ImprezGarage.Infrastructure.Services/app.config
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <configuration> | ||
| <runtime> | ||
| <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> | ||
| <dependentAssembly> | ||
| <assemblyIdentity name="Prism" publicKeyToken="40ee6c3a2184dc59" culture="neutral"/> | ||
| <bindingRedirect oldVersion="0.0.0.0-7.2.0.1422" newVersion="7.2.0.1422"/> | ||
| </dependentAssembly> | ||
| <dependentAssembly> | ||
| <assemblyIdentity name="CommonServiceLocator" publicKeyToken="489b6accfaf20ef0" culture="neutral"/> | ||
| <bindingRedirect oldVersion="0.0.0.0-2.0.4.0" newVersion="2.0.4.0"/> | ||
| </dependentAssembly> | ||
| </assemblyBinding> | ||
| </runtime> | ||
| <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,32 +1,32 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <configuration> | ||
| <configSections> | ||
| <!-- 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=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" /> | ||
| <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/> | ||
| </configSections> | ||
| <entityFramework> | ||
| <defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework"> | ||
| <parameters> | ||
| <parameter value="mssqllocaldb" /> | ||
| <parameter value="mssqllocaldb"/> | ||
| </parameters> | ||
| </defaultConnectionFactory> | ||
| <providers> | ||
| <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" /> | ||
| <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer"/> | ||
| </providers> | ||
| </entityFramework> | ||
| <connectionStrings> | ||
| <add name="ImprezGarageEntities" connectionString="metadata=res://*/Model.ImprezGarageDatabase.csdl|res://*/Model.ImprezGarageDatabase.ssdl|res://*/Model.ImprezGarageDatabase.msl;provider=System.Data.SqlClient;provider connection string="data source=(localdb)\ProjectsV13;initial catalog=ImprezGarage.Database;integrated security=True;MultipleActiveResultSets=True;App=EntityFramework"" providerName="System.Data.EntityClient" /> | ||
| <add name="ImprezGarageEntities" connectionString="metadata=res://*/Model.ImprezGarageDatabase.csdl|res://*/Model.ImprezGarageDatabase.ssdl|res://*/Model.ImprezGarageDatabase.msl;provider=System.Data.SqlClient;provider connection string="data source=(localdb)\ProjectsV13;initial catalog=ImprezGarage.Database;integrated security=True;MultipleActiveResultSets=True;App=EntityFramework"" providerName="System.Data.EntityClient"/> | ||
| </connectionStrings> | ||
| <runtime> | ||
| <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> | ||
| <dependentAssembly> | ||
| <assemblyIdentity name="Prism" publicKeyToken="40ee6c3a2184dc59" culture="neutral" /> | ||
| <bindingRedirect oldVersion="0.0.0.0-7.0.0.396" newVersion="7.0.0.396" /> | ||
| <assemblyIdentity name="Prism" publicKeyToken="40ee6c3a2184dc59" culture="neutral"/> | ||
| <bindingRedirect oldVersion="0.0.0.0-7.2.0.1422" newVersion="7.2.0.1422"/> | ||
| </dependentAssembly> | ||
| <dependentAssembly> | ||
| <assemblyIdentity name="CommonServiceLocator" publicKeyToken="489b6accfaf20ef0" culture="neutral" /> | ||
| <bindingRedirect oldVersion="0.0.0.0-2.0.3.0" newVersion="2.0.3.0" /> | ||
| <assemblyIdentity name="CommonServiceLocator" publicKeyToken="489b6accfaf20ef0" culture="neutral"/> | ||
| <bindingRedirect oldVersion="0.0.0.0-2.0.4.0" newVersion="2.0.4.0"/> | ||
| </dependentAssembly> | ||
| </assemblyBinding> | ||
| </runtime> | ||
| </configuration> | ||
| <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 3 additions & 2 deletions
5
Src/Business/ImprezGarage.Infrastructure/Properties/Resources.Designer.cs
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
14 changes: 5 additions & 9 deletions
14
Src/Business/ImprezGarage.Infrastructure/Properties/Settings.Designer.cs
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,16 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <packages> | ||
| <package id="CommonServiceLocator" version="2.0.3" targetFramework="net461" /> | ||
| <package id="ControlzEx" version="3.0.2.4" targetFramework="net461" /> | ||
| <package id="CommonServiceLocator" version="2.0.4" targetFramework="net472" /> | ||
| <package id="ControlzEx" version="3.0.2.4" targetFramework="net461" requireReinstallation="true" /> | ||
| <package id="EntityFramework" version="6.2.0" targetFramework="net461" /> | ||
| <package id="MahApps.Metro" version="1.6.5" targetFramework="net461" /> | ||
| <package id="Prism.Core" version="7.0.0.396" targetFramework="net461" /> | ||
| <package id="Prism.Unity" version="6.3.0" targetFramework="net461" /> | ||
| <package id="Prism.Wpf" version="6.3.0" targetFramework="net461" /> | ||
| <package id="Unity" version="5.6.1" targetFramework="net461" /> | ||
| <package id="MahApps.Metro" version="1.6.5" targetFramework="net461" requireReinstallation="true" /> | ||
| <package id="Prism.Core" version="7.2.0.1422" targetFramework="net461" /> | ||
| <package id="Prism.Unity" version="7.2.0.1422" targetFramework="net461" /> | ||
| <package id="Prism.Wpf" version="7.2.0.1422" targetFramework="net461" /> | ||
| <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net461" /> | ||
| <package id="System.Threading.Tasks.Extensions" version="4.5.2" targetFramework="net461" /> | ||
| <package id="System.ValueTuple" version="4.5.0" targetFramework="net461" requireReinstallation="true" /> | ||
| <package id="Unity" version="5.6.1" targetFramework="net461" requireReinstallation="true" /> | ||
| <package id="Unity.Abstractions" version="5.11.1" targetFramework="net461" requireReinstallation="true" /> | ||
| <package id="Unity.Container" version="5.11.1" targetFramework="net461" requireReinstallation="true" /> | ||
| </packages> |
Oops, something went wrong.