Merge pull request #38 from osoykan/dev

dev to master
osoykan-archive · Oct 1, 2017 · 00b078a · 00b078a
2 parents 15f693c + 6d63aa2
commit 00b078a
Show file tree

Hide file tree

Showing 10 changed files with 39 additions and 31 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -5,6 +5,6 @@ pull_requests:
   do_not_increment_build_number: true
 
 build_script:
-- ps: .\build.ps1 -experimental
+- ps: .\build.ps1
 
 test: off
diff --git a/build.cake b/build.cake
@@ -24,16 +24,15 @@ var nugetApiKey = EnvironmentVariable("nugetApiKey");
 
 var testProjects = new List<Tuple<string, string[]>>
                 {
-                    new Tuple<string, string[]>("Autofac.Extras.IocManager.Tests", new[] { "net452", "netcoreapp1.0" }),
-                    new Tuple<string, string[]>("Autofac.Extras.IocManager.DynamicProxy.Tests", new[] { "netcoreapp1.0" }),
-                    new Tuple<string, string[]>("Autofac.Extras.IocManager.MsDependencyInjection.Tests", new[] { "netcoreapp2.0" }),
-
+                    new Tuple<string, string[]>("Autofac.Extras.IocManager.Tests", new[] { "net452", "netcoreapp2.0" }),
+                    new Tuple<string, string[]>("Autofac.Extras.IocManager.DynamicProxy.Tests", new[] { "netcoreapp2.0" }),
+                    new Tuple<string, string[]>("Autofac.Extras.IocManager.MsDependencyInjection.Tests", new[] { "netcoreapp2.0" })
                 };
 
 
 var nupkgPath = "nupkg";
 var nupkgRegex = $"**/{projectName}*.nupkg";
-var nugetPath = toolpath + "/NuGet.CommandLine/tools/nuget.exe";
+var nugetPath = toolpath + "/nuget.exe";
 var nugetQueryUrl = "https://www.nuget.org/api/v2/";
 var nugetPushUrl = "https://www.nuget.org/api/v2/package";
 var NUGET_PUSH_SETTINGS = new NuGetPushSettings

diff --git a/build.ps1 b/build.ps1
@@ -31,12 +31,16 @@ Param(
     [string[]]$ScriptArgs
 )
 
-$CakeVersion = "0.21.1"
-$DotNetChannel = "preview";
+$CakeVersion = "0.22.2"
+$DotNetChannel = "LTS";
 $DotNetVersion = "2.0.0";
 $DotNetInstallerUri = "https://dot.net/v1/dotnet-install.ps1";
 $NugetUrl = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe"
 
+# Temporarily skip verification and opt-in to new in-proc NuGet
+$ENV:CAKE_SETTINGS_SKIPVERIFICATION='true'
+$ENV:CAKE_NUGET_USEINPROCESSCLIENT='true'
+
 # Make sure tools folder exists
 $PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent
 $ToolPath = Join-Path $PSScriptRoot "tools"
@@ -82,10 +86,11 @@ if($FoundDotNetCliVersion -ne $DotNetVersion) {
 
     Remove-PathVariable "$InstallPath"
     $env:PATH = "$InstallPath;$env:PATH"
-    $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
-    $env:DOTNET_CLI_TELEMETRY_OPTOUT=1
 }
 
+$env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
+$env:DOTNET_CLI_TELEMETRY_OPTOUT=1
+
 ###########################################################################
 # INSTALL NUGET
 ###########################################################################
@@ -126,4 +131,4 @@ $Arguments = @{
 # Start Cake
 Write-Host "Running build script..."
 Invoke-Expression "& `"$CakePath`" `"build.cake`" $Arguments $ScriptArgs"
-exit $LASTEXITCODE
+exit $LASTEXITCODE
diff --git a/common.props b/common.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <VersionPrefix>3.1.3</VersionPrefix>
+    <VersionPrefix>3.2.0</VersionPrefix>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <PackageIconUrl>https://raw.githubusercontent.com/osoykan/Stove/master/stove.png</PackageIconUrl>
@@ -14,4 +14,8 @@
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <Authors>Oguzhan Soykan</Authors>
   </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="SourceLink.Create.CommandLine" Version="2.4.0" PrivateAssets="All" />
+  </ItemGroup>
 </Project>
diff --git a/src/Autofac.Extras.IocManager.DynamicProxy/Autofac.Extras.IocManager.DynamicProxy.csproj b/src/Autofac.Extras.IocManager.DynamicProxy/Autofac.Extras.IocManager.DynamicProxy.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <AssemblyName>Autofac.Extras.IocManager.DynamicProxy</AssemblyName>
-    <TargetFrameworks>net452;netstandard1.6</TargetFrameworks>
+    <TargetFrameworks>net452;netstandard2.0</TargetFrameworks>
     <PackageId>Autofac.Extras.IocManager.DynamicProxy</PackageId>
     <PackageTags>Autofac;DynamicProxy;Resolve;Composition Root</PackageTags>
     <Description>DynamicProxy integration for Autofac.Extras.IocManager</Description>
@@ -15,8 +15,8 @@
       <PackagePath>lib/net452/</PackagePath>
       <Pack>true</Pack>
     </None>
-    <None Include="bin\Release\netstandard1.6\Autofac.Extras.IocManager.DynamicProxy.pdb">
-      <PackagePath>lib/netstandard1.6/</PackagePath>
+    <None Include="bin\Release\netstandard2.0\Autofac.Extras.IocManager.DynamicProxy.pdb">
+      <PackagePath>lib/netstandard2.0/</PackagePath>
       <Pack>true</Pack>
     </None>
   </ItemGroup>
@@ -28,7 +28,7 @@
   <ItemGroup>
     <PackageReference Include="Autofac" Version="4.6.1" />
     <PackageReference Include="Autofac.Extras.DynamicProxy" Version="4.2.1" />
-    <PackageReference Include="Castle.Core" Version="4.1.1" />
+    <PackageReference Include="Castle.Core" Version="4.2.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Autofac.Extras.IocManager/Autofac.Extras.IocManager.csproj b/src/Autofac.Extras.IocManager/Autofac.Extras.IocManager.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <AssemblyName>Autofac.Extras.IocManager</AssemblyName>
-    <TargetFrameworks>net452;netstandard1.6</TargetFrameworks>
+    <TargetFrameworks>net452;netstandard2.0</TargetFrameworks>
     <PackageId>Autofac.Extras.IocManager</PackageId>
     <PackageTags>Autofac;Resolve;Composition Root;Service Locator</PackageTags>
     <Description>Provides abstractions to Autofac's registration and resolvings.</Description>
@@ -15,8 +15,8 @@
       <PackagePath>lib/net452/</PackagePath>
       <Pack>true</Pack>
     </None>
-    <None Include="bin\Release\netstandard1.6\Autofac.Extras.IocManager.pdb">
-      <PackagePath>lib/netstandard1.6/</PackagePath>
+    <None Include="bin\Release\netstandard2.0\Autofac.Extras.IocManager.pdb">
+      <PackagePath>lib/netstandard2.0/</PackagePath>
       <Pack>true</Pack>
     </None>
   </ItemGroup>

diff --git a/....Extras.IocManager.DynamicProxy.Tests/Autofac.Extras.IocManager.DynamicProxy.Tests.csproj b/....Extras.IocManager.DynamicProxy.Tests/Autofac.Extras.IocManager.DynamicProxy.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net452;netcoreapp1.0</TargetFrameworks>
+    <TargetFrameworks>net452;netcoreapp2.0</TargetFrameworks>
     <AssemblyName>Autofac.Extras.IocManager.DynamicProxy.Tests</AssemblyName>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
@@ -15,8 +15,8 @@
     <PackageReference Include="FakeItEasy" Version="4.0.0" />
     <PackageReference Include="NSubstitute" Version="2.0.3" />
     <PackageReference Include="Shouldly" Version="3.0.0-beta0003" />
-    <PackageReference Include="xunit" Version="2.3.0-beta4-build3742" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0-preview-20170810-02" />
+    <PackageReference Include="xunit" Version="2.3.0-beta5-build3769" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0-preview-20170923-02" />
   </ItemGroup>
 
 </Project>
diff --git a/....MsDependencyInjection.Tests/Autofac.Extras.IocManager.MsDependencyInjection.Tests.csproj b/....MsDependencyInjection.Tests/Autofac.Extras.IocManager.MsDependencyInjection.Tests.csproj
@@ -6,16 +6,16 @@
 
   <ItemGroup>
     <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.2.0" />
-    <PackageReference Include="FluentAssertions" Version="5.0.0-beta0001" />
+    <PackageReference Include="FluentAssertions" Version="5.0.0-beta0002" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.0.0" />
-    <PackageReference Include="xunit" Version="2.3.0-beta4-build3742" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta4-build3742" />
+    <PackageReference Include="xunit" Version="2.3.0-beta5-build3769" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta5-build3769" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\Autofac.Extras.IocManager\Autofac.Extras.IocManager.csproj" />
     <ProjectReference Include="..\Autofac.Extras.IocManager.TestBase\Autofac.Extras.IocManager.TestBase.csproj" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0-preview-20170810-02" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0-preview-20170923-02" />
   </ItemGroup>
 
 </Project>
diff --git a/test/Autofac.Extras.IocManager.TestBase/Autofac.Extras.IocManager.TestBase.csproj b/test/Autofac.Extras.IocManager.TestBase/Autofac.Extras.IocManager.TestBase.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net452;netcoreapp1.0</TargetFrameworks>
+    <TargetFrameworks>net452;netcoreapp2.0</TargetFrameworks>
     <AssemblyName>Autofac.Extras.IocManager.TestBase</AssemblyName>
   </PropertyGroup>
 

diff --git a/test/Autofac.Extras.IocManager.Tests/Autofac.Extras.IocManager.Tests.csproj b/test/Autofac.Extras.IocManager.Tests/Autofac.Extras.IocManager.Tests.csproj
@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net452;netcoreapp1.0</TargetFrameworks>
+    <TargetFrameworks>net452;netcoreapp2.0</TargetFrameworks>
     <AssemblyName>Autofac.Extras.IocManager.Tests</AssemblyName>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="FakeItEasy" Version="4.0.0" />
     <PackageReference Include="NSubstitute" Version="2.0.3" />
     <PackageReference Include="Shouldly" Version="3.0.0-beta0003" />
-    <PackageReference Include="xunit" Version="2.3.0-beta4-build3742" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta4-build3742" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0-preview-20170810-02" />
+    <PackageReference Include="xunit" Version="2.3.0-beta5-build3769" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta5-build3769" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0-preview-20170923-02" />
   </ItemGroup>
 
   <ItemGroup>