Skip to content

Commit dde9c11

Browse files
hikalkanhikalkan
committed
Downgraded to .NET 4.5.2. Resolved #37. Also, fixed user creation and added block ui while busy.
1 parent ec66936 commit dde9c11

File tree

36 files changed

+860
-447
lines changed

36 files changed

+860
-447
lines changed

‎src/AbpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>AbpCompanyName.AbpProjectName</RootNamespace>
1111
<AssemblyName>AbpCompanyName.AbpProjectName.Application</AssemblyName>
12-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
1515
<RestorePackages>true</RestorePackages>

‎src/AbpCompanyName.AbpProjectName.Application/Users/UserAppService.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public async Task CreateUser(CreateUserInput input)
5454
user.Password = new PasswordHasher().HashPassword(input.Password);
5555
user.IsEmailConfirmed = true;
5656

57-
await UserManager.CreateAsync(user);
57+
CheckErrors(await UserManager.CreateAsync(user));
5858
}
5959
}
6060
}

‎src/AbpCompanyName.AbpProjectName.Application/app.config‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<runtime>
44
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
55
<dependentAssembly>
6-
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
7-
<bindingRedirect oldVersion="0.0.0.0-1.1.36.0" newVersion="1.1.36.0" />
6+
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
7+
<bindingRedirect oldVersion="0.0.0.0-1.1.36.0" newVersion="1.1.36.0"/>
88
</dependentAssembly>
99
<dependentAssembly>
10-
<assemblyIdentity name="Castle.Core" publicKeyToken="407dd0808d44fbdc" culture="neutral" />
11-
<bindingRedirect oldVersion="0.0.0.0-3.3.0.0" newVersion="3.3.0.0" />
10+
<assemblyIdentity name="Castle.Core" publicKeyToken="407dd0808d44fbdc" culture="neutral"/>
11+
<bindingRedirect oldVersion="0.0.0.0-3.3.0.0" newVersion="3.3.0.0"/>
1212
</dependentAssembly>
1313
<dependentAssembly>
14-
<assemblyIdentity name="AutoMapper" publicKeyToken="be96cd2c38ef1005" culture="neutral" />
15-
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
14+
<assemblyIdentity name="AutoMapper" publicKeyToken="be96cd2c38ef1005" culture="neutral"/>
15+
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0"/>
1616
</dependentAssembly>
1717
<dependentAssembly>
18-
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
19-
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
18+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
19+
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0"/>
2020
</dependentAssembly>
2121
</assemblyBinding>
2222
</runtime>
23-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>
23+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/></startup></configuration>

‎src/AbpCompanyName.AbpProjectName.Application/packages.config‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="0.9.0.0" targetFramework="net461" />
4-
<package id="Abp.AutoMapper" version="0.9.0.0" targetFramework="net461" />
5-
<package id="Abp.Zero" version="0.9.0.0" targetFramework="net461" />
6-
<package id="AutoMapper" version="4.1.1" targetFramework="net451" />
7-
<package id="Castle.Core" version="3.3.3" targetFramework="net451" />
8-
<package id="Castle.LoggingFacility" version="3.3.0" targetFramework="net451" />
9-
<package id="Castle.Windsor" version="3.3.0" targetFramework="net451" />
10-
<package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net451" />
11-
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net461" />
12-
<package id="Nito.AsyncEx" version="3.0.1" targetFramework="net451" />
13-
<package id="System.Collections.Immutable" version="1.1.36" targetFramework="net461" />
3+
<package id="Abp" version="0.9.0.0" targetFramework="net452" />
4+
<package id="Abp.AutoMapper" version="0.9.0.0" targetFramework="net452" />
5+
<package id="Abp.Zero" version="0.9.0.0" targetFramework="net452" />
6+
<package id="AutoMapper" version="4.1.1" targetFramework="net452" />
7+
<package id="Castle.Core" version="3.3.3" targetFramework="net452" />
8+
<package id="Castle.LoggingFacility" version="3.3.0" targetFramework="net452" />
9+
<package id="Castle.Windsor" version="3.3.0" targetFramework="net452" />
10+
<package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net452" />
11+
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net452" />
12+
<package id="Nito.AsyncEx" version="3.0.1" targetFramework="net452" />
13+
<package id="System.Collections.Immutable" version="1.1.36" targetFramework="net452" />
1414
</packages>

‎src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>AbpCompanyName.AbpProjectName</RootNamespace>
1111
<AssemblyName>AbpCompanyName.AbpProjectName.Core</AssemblyName>
12-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
1515
<RestorePackages>true</RestorePackages>
@@ -107,7 +107,9 @@
107107
<Compile Include="Users\UserStore.cs" />
108108
</ItemGroup>
109109
<ItemGroup>
110-
<None Include="app.config" />
110+
<None Include="app.config">
111+
<SubType>Designer</SubType>
112+
</None>
111113
<None Include="packages.config" />
112114
</ItemGroup>
113115
<ItemGroup>

‎src/AbpCompanyName.AbpProjectName.Core/Localization/Source/AbpProjectName-tr.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,5 +52,6 @@
5252
<text name="CreateNewUser" value="Yeni kullanıcı oluştur" />
5353
<text name="Yes" value="Evet" />
5454
<text name="No" value="Hayır" />
55+
<text name="Optional" value="Opsiyonel" />
5556
</texts>
5657
</localizationDictionary>

‎src/AbpCompanyName.AbpProjectName.Core/Localization/Source/AbpProjectName.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,5 +52,6 @@
5252
<text name="CreateNewUser" value="Create new user" />
5353
<text name="Yes" value="Yes" />
5454
<text name="No" value="No" />
55+
<text name="Optional" value="Optional" />
5556
</texts>
5657
</localizationDictionary>

‎src/AbpCompanyName.AbpProjectName.Core/app.config‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<runtime>
44
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
55
<dependentAssembly>
6-
<assemblyIdentity name="Castle.Core" publicKeyToken="407dd0808d44fbdc" culture="neutral" />
7-
<bindingRedirect oldVersion="0.0.0.0-3.3.0.0" newVersion="3.3.0.0" />
6+
<assemblyIdentity name="Castle.Core" publicKeyToken="407dd0808d44fbdc" culture="neutral"/>
7+
<bindingRedirect oldVersion="0.0.0.0-3.3.0.0" newVersion="3.3.0.0"/>
88
</dependentAssembly>
99
<dependentAssembly>
10-
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
11-
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
10+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
11+
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0"/>
1212
</dependentAssembly>
1313
<dependentAssembly>
14-
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
15-
<bindingRedirect oldVersion="0.0.0.0-1.1.36.0" newVersion="1.1.36.0" />
14+
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
15+
<bindingRedirect oldVersion="0.0.0.0-1.1.36.0" newVersion="1.1.36.0"/>
1616
</dependentAssembly>
1717
</assemblyBinding>
1818
</runtime>
19-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>
19+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/></startup></configuration>

‎src/AbpCompanyName.AbpProjectName.Core/packages.config‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="0.9.0.0" targetFramework="net461" />
4-
<package id="Abp.Zero" version="0.9.0.0" targetFramework="net461" />
5-
<package id="Castle.Core" version="3.3.3" targetFramework="net451" />
6-
<package id="Castle.LoggingFacility" version="3.3.0" targetFramework="net451" />
7-
<package id="Castle.Windsor" version="3.3.0" targetFramework="net451" />
8-
<package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net451" />
9-
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net461" />
10-
<package id="Nito.AsyncEx" version="3.0.1" targetFramework="net451" />
11-
<package id="System.Collections.Immutable" version="1.1.36" targetFramework="net461" />
3+
<package id="Abp" version="0.9.0.0" targetFramework="net452" />
4+
<package id="Abp.Zero" version="0.9.0.0" targetFramework="net452" />
5+
<package id="Castle.Core" version="3.3.3" targetFramework="net452" />
6+
<package id="Castle.LoggingFacility" version="3.3.0" targetFramework="net452" />
7+
<package id="Castle.Windsor" version="3.3.0" targetFramework="net452" />
8+
<package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net452" />
9+
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net452" />
10+
<package id="Nito.AsyncEx" version="3.0.1" targetFramework="net452" />
11+
<package id="System.Collections.Immutable" version="1.1.36" targetFramework="net452" />
1212
</packages>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>AbpCompanyName.AbpProjectName</RootNamespace>
1111
<AssemblyName>AbpCompanyName.AbpProjectName.EntityFramework</AssemblyName>
12-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
1515
<RestorePackages>true</RestorePackages>

0 commit comments

Comments
 (0)