Update project structure

usausa · Jan 28, 2019 · 955c911 · 955c911
1 parent 6dfbf39
commit 955c911
Show file tree

Hide file tree

Showing 20 changed files with 36 additions and 93 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -0,0 +1,19 @@
+<Project>
+
+  <PropertyGroup>
+    <Deterministic>true</Deterministic>
+    <LangVersion>latest</LangVersion>
+    <NullableContextOptions>True</NullableContextOptions>
+    <Version>1.7.6</Version>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
+    <DebugType>full</DebugType>
+    <DebugSymbols>true</DebugSymbols>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)' == 'Release'">
+    <DebugType>pdbonly</DebugType>
+  </PropertyGroup>
+
+</Project>
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -0,0 +1,2 @@
+<Project>
+</Project>
diff --git a/Example.FormsApp/Example.FormsApp/Example.FormsApp.Android/Example.FormsApp.Android.csproj b/Example.FormsApp/Example.FormsApp/Example.FormsApp.Android/Example.FormsApp.Android.csproj
@@ -29,7 +29,6 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AndroidLinkMode>None</AndroidLinkMode>
-    <LangVersion>latest</LangVersion>
     <CodeAnalysisRuleSet>..\..\..\Smart.Resolver.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -41,7 +40,6 @@
     <WarningLevel>4</WarningLevel>
     <AndroidManagedSymbols>true</AndroidManagedSymbols>
     <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
-    <LangVersion>latest</LangVersion>
     <CodeAnalysisRuleSet>..\..\..\Smart.Resolver.ruleset</CodeAnalysisRuleSet>
     <AotAssemblies>true</AotAssemblies>
     <EnableLLVM>true</EnableLLVM>

diff --git a/Example.FormsApp/Example.FormsApp/Example.FormsApp.UWP/Example.FormsApp.UWP.csproj b/Example.FormsApp/Example.FormsApp/Example.FormsApp.UWP/Example.FormsApp.UWP.csproj
@@ -30,7 +30,6 @@
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>true</Prefer32Bit>
-    <LangVersion>latest</LangVersion>
     <CodeAnalysisRuleSet>..\..\..\Smart.Resolver.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
@@ -44,7 +43,6 @@
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>true</Prefer32Bit>
     <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
-    <LangVersion>latest</LangVersion>
     <CodeAnalysisRuleSet>..\..\..\Smart.Resolver.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">

diff --git a/Example.FormsApp/Example.FormsApp/Example.FormsApp.iOS/Example.FormsApp.iOS.csproj b/Example.FormsApp/Example.FormsApp/Example.FormsApp.iOS/Example.FormsApp.iOS.csproj
@@ -27,7 +27,6 @@
     <MtouchArch>x86_64</MtouchArch>
     <MtouchLink>None</MtouchLink>
     <MtouchDebug>true</MtouchDebug>
-    <LangVersion>latest</LangVersion>
     <CodeAnalysisRuleSet>..\..\..\Smart.Resolver.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
@@ -39,7 +38,6 @@
     <MtouchLink>None</MtouchLink>
     <MtouchArch>x86_64</MtouchArch>
     <ConsolePause>false</ConsolePause>
-    <LangVersion>latest</LangVersion>
     <CodeAnalysisRuleSet>..\..\..\Smart.Resolver.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
@@ -55,7 +53,6 @@
     <CodesignKey>iPhone Developer</CodesignKey>
     <MtouchDebug>true</MtouchDebug>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
-    <LangVersion>latest</LangVersion>
     <CodeAnalysisRuleSet>..\..\..\Smart.Resolver.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
@@ -68,7 +65,6 @@
     <ConsolePause>false</ConsolePause>
     <CodesignKey>iPhone Developer</CodesignKey>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
-    <LangVersion>latest</LangVersion>
     <CodeAnalysisRuleSet>..\..\..\Smart.Resolver.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Ad-Hoc|iPhone' ">
@@ -83,7 +79,6 @@
     <CodesignProvision>Automatic:AdHoc</CodesignProvision>
     <CodesignKey>iPhone Distribution</CodesignKey>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
-    <LangVersion>latest</LangVersion>
     <CodeAnalysisRuleSet>..\..\..\Smart.Resolver.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'AppStore|iPhone' ">
@@ -97,7 +92,6 @@
     <CodesignProvision>Automatic:AppStore</CodesignProvision>
     <CodesignKey>iPhone Distribution</CodesignKey>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
-    <LangVersion>latest</LangVersion>
     <CodeAnalysisRuleSet>..\..\..\Smart.Resolver.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>

diff --git a/Example.FormsApp/Example.FormsApp/Example.FormsApp/Example.FormsApp.csproj b/Example.FormsApp/Example.FormsApp/Example.FormsApp/Example.FormsApp.csproj
@@ -2,15 +2,9 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <LangVersion>latest</LangVersion>
     <CodeAnalysisRuleSet>..\..\..\Smart.Resolver.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DebugType>full</DebugType>
-    <DebugSymbols>true</DebugSymbols>
-  </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="2.6.1" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" />

diff --git a/Example.WebApplication/Example.WebApplication/Example.WebApplication.csproj b/Example.WebApplication/Example.WebApplication/Example.WebApplication.csproj
@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-    <LangVersion>latest</LangVersion>
     <CodeAnalysisRuleSet>..\..\Smart.Resolver.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
 

diff --git a/Sandbox/FuncBenchmark/FuncBenchmark/FuncBenchmark.csproj b/Sandbox/FuncBenchmark/FuncBenchmark/FuncBenchmark.csproj
@@ -3,7 +3,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-    <LangVersion>latest</LangVersion>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
   </PropertyGroup>
 

diff --git a/Sandbox/RequestKeyBenchmark/RequestKeyBenchmark/RequestKeyBenchmark.csproj b/Sandbox/RequestKeyBenchmark/RequestKeyBenchmark/RequestKeyBenchmark.csproj
@@ -3,7 +3,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-    <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Sandbox/TypedFactoryBenchmark/TypedFactoryBenchmark/TypedFactoryBenchmark.csproj b/Sandbox/TypedFactoryBenchmark/TypedFactoryBenchmark/TypedFactoryBenchmark.csproj
@@ -3,7 +3,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-    <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Smart.Resolver.AspNetCore/Smart.Resolver.AspNetCore.csproj b/Smart.Resolver.AspNetCore/Smart.Resolver.AspNetCore.csproj
@@ -2,19 +2,8 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <LangVersion>latest</LangVersion>
     <CodeAnalysisRuleSet>..\Smart.Resolver.ruleset</CodeAnalysisRuleSet>
     <RootNamespace>Smart</RootNamespace>
-    <Version>1.7.6</Version>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
-    <DebugType>full</DebugType>
-    <DebugSymbols>true</DebugSymbols>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)' == 'Release'">
-    <DebugType>pdbonly</DebugType>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Smart.Resolver.Benchmark/Smart.Resolver.Benchmark.csproj b/Smart.Resolver.Benchmark/Smart.Resolver.Benchmark.csproj
@@ -3,9 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-    <LangVersion>latest</LangVersion>
     <CodeAnalysisRuleSet>..\Smart.Resolver.ruleset</CodeAnalysisRuleSet>
-    <Version>1.7.6</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/...olver.Extensions.DependencyInjection/Smart.Resolver.Extensions.DependencyInjection.csproj b/...olver.Extensions.DependencyInjection/Smart.Resolver.Extensions.DependencyInjection.csproj
@@ -0,0 +1,7 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+  </PropertyGroup>
+
+</Project>
diff --git a/Smart.Resolver.Tests/Smart.Resolver.Tests.csproj b/Smart.Resolver.Tests/Smart.Resolver.Tests.csproj
@@ -2,10 +2,8 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-    <LangVersion>latest</LangVersion>
     <CodeAnalysisRuleSet>..\Smart.Resolver.ruleset</CodeAnalysisRuleSet>
     <RootNamespace>Smart</RootNamespace>
-    <Version>1.7.6</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Smart.Resolver.Xamarin/Smart.Resolver.Xamarin.csproj b/Smart.Resolver.Xamarin/Smart.Resolver.Xamarin.csproj
@@ -2,19 +2,8 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <LangVersion>latest</LangVersion>
     <CodeAnalysisRuleSet>..\Smart.Resolver.ruleset</CodeAnalysisRuleSet>
     <RootNamespace>Smart</RootNamespace>
-    <Version>1.7.6</Version>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
-    <DebugType>full</DebugType>
-    <DebugSymbols>true</DebugSymbols>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)' == 'Release'">
-    <DebugType>pdbonly</DebugType>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Smart.Resolver.sln b/Smart.Resolver.sln
@@ -15,6 +15,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		.gitattributes = .gitattributes
 		.gitignore = .gitignore
+		Directory.Build.props = Directory.Build.props
+		Directory.Build.targets = Directory.Build.targets
 		README.md = README.md
 		Smart.Resolver.AspNetCore.nuspec = Smart.Resolver.AspNetCore.nuspec
 		Smart.Resolver.nuspec = Smart.Resolver.nuspec
@@ -25,6 +27,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Smart.Resolver.Benchmark", "Smart.Resolver.Benchmark\Smart.Resolver.Benchmark.csproj", "{1D14E0F7-7C89-4B1C-B38B-D30FCD89DAB4}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Smart.Resolver.Extensions.DependencyInjection", "Smart.Resolver.Extensions.DependencyInjection\Smart.Resolver.Extensions.DependencyInjection.csproj", "{F13C481C-5ABC-4817-9351-409F55CEA8E8}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -51,6 +55,10 @@ Global
 		{1D14E0F7-7C89-4B1C-B38B-D30FCD89DAB4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1D14E0F7-7C89-4B1C-B38B-D30FCD89DAB4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1D14E0F7-7C89-4B1C-B38B-D30FCD89DAB4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F13C481C-5ABC-4817-9351-409F55CEA8E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F13C481C-5ABC-4817-9351-409F55CEA8E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F13C481C-5ABC-4817-9351-409F55CEA8E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F13C481C-5ABC-4817-9351-409F55CEA8E8}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/Smart.Resolver/Resolver/ResolverScopeStorage.cs b/Smart.Resolver/Resolver/ResolverScopeStorage.cs
diff --git a/Smart.Resolver/Resolver/ResolverScopeStorageAccessor.cs b/Smart.Resolver/Resolver/ResolverScopeStorageAccessor.cs
diff --git a/Smart.Resolver/Resolver/Scopes/ResolverScope.cs b/Smart.Resolver/Resolver/Scopes/ResolverScope.cs
diff --git a/Smart.Resolver/Smart.Resolver.csproj b/Smart.Resolver/Smart.Resolver.csproj
@@ -2,19 +2,8 @@
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
-    <LangVersion>latest</LangVersion>
     <CodeAnalysisRuleSet>..\Smart.Resolver.ruleset</CodeAnalysisRuleSet>
     <RootNamespace>Smart</RootNamespace>
-    <Version>1.7.6</Version>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
-    <DebugType>full</DebugType>
-    <DebugSymbols>true</DebugSymbols>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)' == 'Release'">
-    <DebugType>pdbonly</DebugType>
   </PropertyGroup>
 
   <ItemGroup>