Skip to content

Commit c11c981

Browse files
ismcagdasismcagdas
authored
Merge pull request #88 from Woodag/master
Resolve some warning and some trifles
2 parents 405246e + 1a0a757 commit c11c981

File tree

12 files changed

+1662
-343
lines changed

12 files changed

+1662
-343
lines changed

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

Lines changed: 237 additions & 26 deletions
Large diffs are not rendered by default.

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

Lines changed: 233 additions & 22 deletions
Large diffs are not rendered by default.

‎src/AbpCompanyName.AbpProjectName.EntityFramework/App.config

Lines changed: 240 additions & 31 deletions
Large diffs are not rendered by default.

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

Lines changed: 257 additions & 50 deletions
Large diffs are not rendered by default.

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

Lines changed: 243 additions & 32 deletions
Large diffs are not rendered by default.

‎src/AbpCompanyName.AbpProjectName.WebMpa/AbpCompanyName.AbpProjectName.WebMpa.csproj

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props" Condition="Exists('..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" />
34
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TypeScript\Microsoft.TypeScript.Default.props" Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TypeScript\Microsoft.TypeScript.Default.props')" />
45
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
56
<PropertyGroup>
@@ -24,7 +25,7 @@
2425
<RestorePackages>true</RestorePackages>
2526
<UseGlobalApplicationHostFile />
2627
<TargetFrameworkProfile />
27-
<TypeScriptToolsVersion>2.2</TypeScriptToolsVersion>
28+
<TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
2829
<NuGetPackageImportStamp>
2930
</NuGetPackageImportStamp>
3031
<Use64BitIISExpress />
@@ -41,6 +42,19 @@
4142
<DefineConstants>DEBUG;TRACE</DefineConstants>
4243
<ErrorReport>prompt</ErrorReport>
4344
<WarningLevel>4</WarningLevel>
45+
<TypeScriptTarget>ES5</TypeScriptTarget>
46+
<TypeScriptJSXEmit>None</TypeScriptJSXEmit>
47+
<TypeScriptModuleKind />
48+
<TypeScriptCompileOnSaveEnabled>True</TypeScriptCompileOnSaveEnabled>
49+
<TypeScriptNoImplicitAny>False</TypeScriptNoImplicitAny>
50+
<TypeScriptRemoveComments>False</TypeScriptRemoveComments>
51+
<TypeScriptOutFile />
52+
<TypeScriptOutDir />
53+
<TypeScriptGeneratesDeclarations>False</TypeScriptGeneratesDeclarations>
54+
<TypeScriptNoEmitOnError>True</TypeScriptNoEmitOnError>
55+
<TypeScriptSourceMap>True</TypeScriptSourceMap>
56+
<TypeScriptMapRoot />
57+
<TypeScriptSourceRoot />
4458
</PropertyGroup>
4559
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
4660
<DebugType>pdbonly</DebugType>
@@ -110,6 +124,9 @@
110124
<HintPath>..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
111125
<Private>True</Private>
112126
</Reference>
127+
<Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
128+
<HintPath>..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
129+
</Reference>
113130
<Reference Include="Microsoft.CSharp" />
114131
<Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
115132
<HintPath>..\packages\Microsoft.Extensions.Caching.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
@@ -579,7 +596,9 @@
579596
</ItemGroup>
580597
<ItemGroup>
581598
<Content Include="Views\web.config" />
582-
<Content Include="packages.config" />
599+
<Content Include="packages.config">
600+
<SubType>Designer</SubType>
601+
</Content>
583602
<Content Include="Views\About\Index.cshtml" />
584603
<Content Include="Views\Shared\_TopBar.cshtml" />
585604
<Content Include="Views\Layout\_LanguageSelection.cshtml" />
@@ -668,6 +687,7 @@
668687
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
669688
<Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
670689
<Error Condition="!Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets'))" />
690+
<Error Condition="!Exists('..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
671691
</Target>
672692
<Target Name="RemoveNetFxForceConflicts" AfterTargets="ResolveAssemblyReferences">
673693
<ItemGroup>

‎src/AbpCompanyName.AbpProjectName.WebMpa/App_Start/AbpProjectNameWebModule.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class AbpProjectNameWebModule : AbpModule
2121
public override void PreInitialize()
2222
{
2323
//Add/remove languages for your application
24-
Configuration.Localization.Languages.Add(new LanguageInfo("en", "English", "famfamfam-flag-england", true));
24+
Configuration.Localization.Languages.Add(new LanguageInfo("en", "English", "famfamfam-flag-gb", true));
2525
Configuration.Localization.Languages.Add(new LanguageInfo("tr", "Türkçe", "famfamfam-flag-tr"));
2626
Configuration.Localization.Languages.Add(new LanguageInfo("zh-CN", "简体中文", "famfamfam-flag-cn"));
2727
Configuration.Localization.Languages.Add(new LanguageInfo("ja", "日本語", "famfamfam-flag-jp"));

‎src/AbpCompanyName.AbpProjectName.WebMpa/Web.config

Lines changed: 35 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,27 @@
44
http://go.microsoft.com/fwlink/?LinkId=301880
55
-->
66
<configuration>
7-
<configSections>
8-
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
7+
<configSections>
8+
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
99

10-
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
11-
</configSections>
12-
<entityFramework>
13-
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework" />
14-
<providers>
15-
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
16-
</providers>
17-
</entityFramework>
18-
<appSettings>
19-
<add key="webpages:Version" value="3.0.0.0" />
20-
<add key="webpages:Enabled" value="false" />
21-
<add key="ClientValidationEnabled" value="true" />
22-
<add key="UnobtrusiveJavaScriptEnabled" value="true" />
23-
</appSettings>
24-
<connectionStrings>
25-
<add name="Default" connectionString="Server=localhost; Database=AbpProjectName; Trusted_Connection=True;" providerName="System.Data.SqlClient" />
26-
</connectionStrings>
27-
<!--
10+
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
11+
</configSections>
12+
<entityFramework>
13+
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework" />
14+
<providers>
15+
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
16+
</providers>
17+
</entityFramework>
18+
<appSettings>
19+
<add key="webpages:Version" value="3.0.0.0" />
20+
<add key="webpages:Enabled" value="false" />
21+
<add key="ClientValidationEnabled" value="true" />
22+
<add key="UnobtrusiveJavaScriptEnabled" value="true" />
23+
</appSettings>
24+
<connectionStrings>
25+
<add name="Default" connectionString="Server=localhost; Database=AbpProjectName; Trusted_Connection=True;" providerName="System.Data.SqlClient" />
26+
</connectionStrings>
27+
<!--
2828
For a description of web.config changes see http://go.microsoft.com/fwlink/?LinkId=235367.
2929
3030
The following attributes can be set on the <httpRuntime> tag.
@@ -390,17 +390,24 @@
390390
<system.webServer>
391391
<modules runAllManagedModulesForAllRequests="true" />
392392

393-
<staticContent>
394-
<remove fileExtension=".woff" />
395-
<remove fileExtension=".woff2" />
396-
<mimeMap fileExtension=".woff" mimeType="application/font-woff" />
397-
<mimeMap fileExtension=".woff2" mimeType="application/font-woff" />
398-
</staticContent>
399-
393+
<staticContent>
394+
<remove fileExtension=".woff" />
395+
<remove fileExtension=".woff2" />
396+
<mimeMap fileExtension=".woff" mimeType="application/font-woff" />
397+
<mimeMap fileExtension=".woff2" mimeType="application/font-woff" />
398+
</staticContent>
399+
400400
<handlers>
401401
<remove name="ExtensionlessUrlHandler-Integrated-4.0" />
402402
<remove name="OPTIONSVerbHandler" />
403403
<remove name="TRACEVerbHandler" />
404404
<add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
405-
</handlers></system.webServer>
405+
</handlers>
406+
</system.webServer>
407+
<system.codedom>
408+
<compilers>
409+
<compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:1659;1699;1701" />
410+
<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+" />
411+
</compilers>
412+
</system.codedom>
406413
</configuration>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net452" />
3838
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net452" />
3939
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net452" />
40+
<package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="2.0.1" targetFramework="net461" />
4041
<package id="Microsoft.Extensions.Caching.Abstractions" version="2.2.0" targetFramework="net461" />
4142
<package id="Microsoft.Extensions.Caching.Memory" version="2.2.0" targetFramework="net461" />
4243
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.2.0" targetFramework="net461" />

‎src/AbpCompanyName.AbpProjectName.WebSpaAngular/AbpCompanyName.AbpProjectName.WebSpaAngular.csproj

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<RestorePackages>true</RestorePackages>
2525
<UseGlobalApplicationHostFile />
2626
<TargetFrameworkProfile />
27-
<TypeScriptToolsVersion>2.2</TypeScriptToolsVersion>
27+
<TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
2828
<NuGetPackageImportStamp>
2929
</NuGetPackageImportStamp>
3030
<Use64BitIISExpress />
@@ -41,6 +41,19 @@
4141
<DefineConstants>DEBUG;TRACE</DefineConstants>
4242
<ErrorReport>prompt</ErrorReport>
4343
<WarningLevel>4</WarningLevel>
44+
<TypeScriptTarget>ES5</TypeScriptTarget>
45+
<TypeScriptJSXEmit>None</TypeScriptJSXEmit>
46+
<TypeScriptModuleKind />
47+
<TypeScriptCompileOnSaveEnabled>True</TypeScriptCompileOnSaveEnabled>
48+
<TypeScriptNoImplicitAny>False</TypeScriptNoImplicitAny>
49+
<TypeScriptRemoveComments>False</TypeScriptRemoveComments>
50+
<TypeScriptOutFile />
51+
<TypeScriptOutDir />
52+
<TypeScriptGeneratesDeclarations>False</TypeScriptGeneratesDeclarations>
53+
<TypeScriptNoEmitOnError>True</TypeScriptNoEmitOnError>
54+
<TypeScriptSourceMap>True</TypeScriptSourceMap>
55+
<TypeScriptMapRoot />
56+
<TypeScriptSourceRoot />
4457
</PropertyGroup>
4558
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
4659
<DebugType>pdbonly</DebugType>

‎src/AbpCompanyName.AbpProjectName.WebSpaAngular/App_Start/AbpProjectNameWebModule.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class AbpProjectNameWebModule : AbpModule
2121
public override void PreInitialize()
2222
{
2323
//Add/remove languages for your application
24-
Configuration.Localization.Languages.Add(new LanguageInfo("en", "English", "famfamfam-flag-england", true));
24+
Configuration.Localization.Languages.Add(new LanguageInfo("en", "English", "famfamfam-flag-gb", true));
2525
Configuration.Localization.Languages.Add(new LanguageInfo("tr", "Türkçe", "famfamfam-flag-tr"));
2626
Configuration.Localization.Languages.Add(new LanguageInfo("zh-CN", "简体中文", "famfamfam-flag-cn"));
2727
Configuration.Localization.Languages.Add(new LanguageInfo("ja", "日本語", "famfamfam-flag-jp"));

0 commit comments

Comments
 (0)