Skip to content

Commit 71f60fe

Browse files
authored
Merge pull request #137 from aspnetboilerplate/run-issues
Fixed multiple packages references
2 parents 48344db + 37d26f2 commit 71f60fe

File tree

14 files changed

+15839
-14555
lines changed

14 files changed

+15839
-14555
lines changed

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,5 +199,5 @@ FakesAssemblies/
199199
/src/AbpCompanyName.AbpProjectName.WebMpa/Logs
200200
/src/AbpCompanyName.AbpProjectName.WebSpaAngular/Logs
201201
/src/AbpCompanyName.AbpProjectName.WebSpaDurandal/Logs
202-
/src/AbpCompanyName.AbpProjectName.WebSpaAngular/App_Data/Logs/Logs.txt
203-
/src/AbpCompanyName.AbpProjectName.WebMpa/App_Data/Logs/Logs.txt
202+
/src/AbpCompanyName.AbpProjectName.WebSpaAngular/App_Data/Logs/
203+
/src/AbpCompanyName.AbpProjectName.WebMpa/App_Data/Logs/

src/AbpCompanyName.AbpProjectName.Application/app.config

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,10 +174,6 @@
174174
<assemblyIdentity name="System.Globalization.Extensions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
175175
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
176176
</dependentAssembly>
177-
<dependentAssembly>
178-
<assemblyIdentity name="System.ComponentModel.Annotations" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
179-
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
180-
</dependentAssembly>
181177
<dependentAssembly>
182178
<assemblyIdentity name="System.Xml.XDocument" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
183179
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />

src/AbpCompanyName.AbpProjectName.Core/app.config

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,10 +174,6 @@
174174
<assemblyIdentity name="System.Globalization.Extensions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
175175
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
176176
</dependentAssembly>
177-
<dependentAssembly>
178-
<assemblyIdentity name="System.ComponentModel.Annotations" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
179-
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
180-
</dependentAssembly>
181177
<dependentAssembly>
182178
<assemblyIdentity name="System.Xml.XDocument" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
183179
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />

src/AbpCompanyName.AbpProjectName.EntityFramework/AbpCompanyName.AbpProjectName.EntityFramework.csproj

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,10 @@
235235
<Compile Include="Migrations\201803261403237_Upgraded_To_Abp_v3_5.Designer.cs">
236236
<DependentUpon>201803261403237_Upgraded_To_Abp_v3_5.cs</DependentUpon>
237237
</Compile>
238+
<Compile Include="Migrations\201807270535111_Updated_ABP.cs" />
239+
<Compile Include="Migrations\201807270535111_Updated_ABP.Designer.cs">
240+
<DependentUpon>201807270535111_Updated_ABP.cs</DependentUpon>
241+
</Compile>
238242
<Compile Include="Migrations\AbpZeroDbMigrator.cs" />
239243
<Compile Include="Migrations\Configuration.cs" />
240244
<Compile Include="AbpProjectNameDataModule.cs" />
@@ -270,6 +274,9 @@
270274
<EmbeddedResource Include="Migrations\201803261403237_Upgraded_To_Abp_v3_5.resx">
271275
<DependentUpon>201803261403237_Upgraded_To_Abp_v3_5.cs</DependentUpon>
272276
</EmbeddedResource>
277+
<EmbeddedResource Include="Migrations\201807270535111_Updated_ABP.resx">
278+
<DependentUpon>201807270535111_Updated_ABP.cs</DependentUpon>
279+
</EmbeddedResource>
273280
</ItemGroup>
274281
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
275282
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />

src/AbpCompanyName.AbpProjectName.EntityFramework/App.config

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -183,10 +183,6 @@
183183
<assemblyIdentity name="System.Globalization.Extensions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
184184
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
185185
</dependentAssembly>
186-
<dependentAssembly>
187-
<assemblyIdentity name="System.ComponentModel.Annotations" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
188-
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
189-
</dependentAssembly>
190186
<dependentAssembly>
191187
<assemblyIdentity name="System.Xml.XDocument" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
192188
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />

src/AbpCompanyName.AbpProjectName.EntityFramework/Migrations/201807270535111_Updated_ABP.Designer.cs

Lines changed: 29 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)