Skip to content
This repository was archived by the owner on Apr 18, 2020. It is now read-only.

Commit 00b078a

Browse files
osoykanosoykan
authored
Merge pull request #38 from osoykan/dev
dev to master
2 parents 15f693c + 6d63aa2 commit 00b078a

File tree

10 files changed

+39
-31
lines changed

10 files changed

+39
-31
lines changed

‎appveyor.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ pull_requests:
55
do_not_increment_build_number: true
66

77
build_script:
8-
- ps: .\build.ps1 -experimental
8+
- ps: .\build.ps1
99

1010
test: off

‎build.cake‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,15 @@ var nugetApiKey = EnvironmentVariable("nugetApiKey");
2424

2525
var testProjects = new List<Tuple<string, string[]>>
2626
{
27-
new Tuple<string, string[]>("Autofac.Extras.IocManager.Tests", new[] { "net452", "netcoreapp1.0" }),
28-
new Tuple<string, string[]>("Autofac.Extras.IocManager.DynamicProxy.Tests", new[] { "netcoreapp1.0" }),
29-
new Tuple<string, string[]>("Autofac.Extras.IocManager.MsDependencyInjection.Tests", new[] { "netcoreapp2.0" }),
30-
27+
new Tuple<string, string[]>("Autofac.Extras.IocManager.Tests", new[] { "net452", "netcoreapp2.0" }),
28+
new Tuple<string, string[]>("Autofac.Extras.IocManager.DynamicProxy.Tests", new[] { "netcoreapp2.0" }),
29+
new Tuple<string, string[]>("Autofac.Extras.IocManager.MsDependencyInjection.Tests", new[] { "netcoreapp2.0" })
3130
};
3231

3332

3433
var nupkgPath = "nupkg";
3534
var nupkgRegex = $"**/{projectName}*.nupkg";
36-
var nugetPath = toolpath + "/NuGet.CommandLine/tools/nuget.exe";
35+
var nugetPath = toolpath + "/nuget.exe";
3736
var nugetQueryUrl = "https://www.nuget.org/api/v2/";
3837
var nugetPushUrl = "https://www.nuget.org/api/v2/package";
3938
var NUGET_PUSH_SETTINGS = new NuGetPushSettings

‎build.ps1‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,16 @@ Param(
3131
[string[]]$ScriptArgs
3232
)
3333

34-
$CakeVersion = "0.21.1"
35-
$DotNetChannel = "preview";
34+
$CakeVersion = "0.22.2"
35+
$DotNetChannel = "LTS";
3636
$DotNetVersion = "2.0.0";
3737
$DotNetInstallerUri = "https://dot.net/v1/dotnet-install.ps1";
3838
$NugetUrl = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe"
3939

40+
# Temporarily skip verification and opt-in to new in-proc NuGet
41+
$ENV:CAKE_SETTINGS_SKIPVERIFICATION='true'
42+
$ENV:CAKE_NUGET_USEINPROCESSCLIENT='true'
43+
4044
# Make sure tools folder exists
4145
$PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent
4246
$ToolPath = Join-Path $PSScriptRoot "tools"
@@ -82,10 +86,11 @@ if($FoundDotNetCliVersion -ne $DotNetVersion) {
8286

8387
Remove-PathVariable "$InstallPath"
8488
$env:PATH = "$InstallPath;$env:PATH"
85-
$env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
86-
$env:DOTNET_CLI_TELEMETRY_OPTOUT=1
8789
}
8890

91+
$env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
92+
$env:DOTNET_CLI_TELEMETRY_OPTOUT=1
93+
8994
###########################################################################
9095
# INSTALL NUGET
9196
###########################################################################
@@ -126,4 +131,4 @@ $Arguments = @{
126131
# Start Cake
127132
Write-Host "Running build script..."
128133
Invoke-Expression "& `"$CakePath`" `"build.cake`" $Arguments $ScriptArgs"
129-
exit $LASTEXITCODE
134+
exit $LASTEXITCODE

‎common.props‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<VersionPrefix>3.1.3</VersionPrefix>
3+
<VersionPrefix>3.2.0</VersionPrefix>
44
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
55
<NoWarn>$(NoWarn);CS1591</NoWarn>
66
<PackageIconUrl>https://raw.githubusercontent.com/osoykan/Stove/master/stove.png</PackageIconUrl>
@@ -14,4 +14,8 @@
1414
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
1515
<Authors>Oguzhan Soykan</Authors>
1616
</PropertyGroup>
17+
18+
<ItemGroup>
19+
<PackageReference Include="SourceLink.Create.CommandLine" Version="2.4.0" PrivateAssets="All" />
20+
</ItemGroup>
1721
</Project>

‎src/Autofac.Extras.IocManager.DynamicProxy/Autofac.Extras.IocManager.DynamicProxy.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<PropertyGroup>
66
<AssemblyName>Autofac.Extras.IocManager.DynamicProxy</AssemblyName>
7-
<TargetFrameworks>net452;netstandard1.6</TargetFrameworks>
7+
<TargetFrameworks>net452;netstandard2.0</TargetFrameworks>
88
<PackageId>Autofac.Extras.IocManager.DynamicProxy</PackageId>
99
<PackageTags>Autofac;DynamicProxy;Resolve;Composition Root</PackageTags>
1010
<Description>DynamicProxy integration for Autofac.Extras.IocManager</Description>
@@ -15,8 +15,8 @@
1515
<PackagePath>lib/net452/</PackagePath>
1616
<Pack>true</Pack>
1717
</None>
18-
<None Include="bin\Release\netstandard1.6\Autofac.Extras.IocManager.DynamicProxy.pdb">
19-
<PackagePath>lib/netstandard1.6/</PackagePath>
18+
<None Include="bin\Release\netstandard2.0\Autofac.Extras.IocManager.DynamicProxy.pdb">
19+
<PackagePath>lib/netstandard2.0/</PackagePath>
2020
<Pack>true</Pack>
2121
</None>
2222
</ItemGroup>
@@ -28,7 +28,7 @@
2828
<ItemGroup>
2929
<PackageReference Include="Autofac" Version="4.6.1" />
3030
<PackageReference Include="Autofac.Extras.DynamicProxy" Version="4.2.1" />
31-
<PackageReference Include="Castle.Core" Version="4.1.1" />
31+
<PackageReference Include="Castle.Core" Version="4.2.0" />
3232
</ItemGroup>
3333

3434
</Project>

‎src/Autofac.Extras.IocManager/Autofac.Extras.IocManager.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<PropertyGroup>
66
<AssemblyName>Autofac.Extras.IocManager</AssemblyName>
7-
<TargetFrameworks>net452;netstandard1.6</TargetFrameworks>
7+
<TargetFrameworks>net452;netstandard2.0</TargetFrameworks>
88
<PackageId>Autofac.Extras.IocManager</PackageId>
99
<PackageTags>Autofac;Resolve;Composition Root;Service Locator</PackageTags>
1010
<Description>Provides abstractions to Autofac's registration and resolvings.</Description>
@@ -15,8 +15,8 @@
1515
<PackagePath>lib/net452/</PackagePath>
1616
<Pack>true</Pack>
1717
</None>
18-
<None Include="bin\Release\netstandard1.6\Autofac.Extras.IocManager.pdb">
19-
<PackagePath>lib/netstandard1.6/</PackagePath>
18+
<None Include="bin\Release\netstandard2.0\Autofac.Extras.IocManager.pdb">
19+
<PackagePath>lib/netstandard2.0/</PackagePath>
2020
<Pack>true</Pack>
2121
</None>
2222
</ItemGroup>

‎test/Autofac.Extras.IocManager.DynamicProxy.Tests/Autofac.Extras.IocManager.DynamicProxy.Tests.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net452;netcoreapp1.0</TargetFrameworks>
4+
<TargetFrameworks>net452;netcoreapp2.0</TargetFrameworks>
55
<AssemblyName>Autofac.Extras.IocManager.DynamicProxy.Tests</AssemblyName>
66
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
77
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
@@ -15,8 +15,8 @@
1515
<PackageReference Include="FakeItEasy" Version="4.0.0" />
1616
<PackageReference Include="NSubstitute" Version="2.0.3" />
1717
<PackageReference Include="Shouldly" Version="3.0.0-beta0003" />
18-
<PackageReference Include="xunit" Version="2.3.0-beta4-build3742" />
19-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0-preview-20170810-02" />
18+
<PackageReference Include="xunit" Version="2.3.0-beta5-build3769" />
19+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0-preview-20170923-02" />
2020
</ItemGroup>
2121

2222
</Project>

‎test/Autofac.Extras.IocManager.MsDependencyInjection.Tests/Autofac.Extras.IocManager.MsDependencyInjection.Tests.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66

77
<ItemGroup>
88
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.2.0" />
9-
<PackageReference Include="FluentAssertions" Version="5.0.0-beta0001" />
9+
<PackageReference Include="FluentAssertions" Version="5.0.0-beta0002" />
1010
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.0.0" />
11-
<PackageReference Include="xunit" Version="2.3.0-beta4-build3742" />
12-
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta4-build3742" />
11+
<PackageReference Include="xunit" Version="2.3.0-beta5-build3769" />
12+
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta5-build3769" />
1313
</ItemGroup>
1414

1515
<ItemGroup>
1616
<ProjectReference Include="..\..\src\Autofac.Extras.IocManager\Autofac.Extras.IocManager.csproj" />
1717
<ProjectReference Include="..\Autofac.Extras.IocManager.TestBase\Autofac.Extras.IocManager.TestBase.csproj" />
18-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0-preview-20170810-02" />
18+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0-preview-20170923-02" />
1919
</ItemGroup>
2020

2121
</Project>

‎test/Autofac.Extras.IocManager.TestBase/Autofac.Extras.IocManager.TestBase.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net452;netcoreapp1.0</TargetFrameworks>
4+
<TargetFrameworks>net452;netcoreapp2.0</TargetFrameworks>
55
<AssemblyName>Autofac.Extras.IocManager.TestBase</AssemblyName>
66
</PropertyGroup>
77

‎test/Autofac.Extras.IocManager.Tests/Autofac.Extras.IocManager.Tests.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net452;netcoreapp1.0</TargetFrameworks>
4+
<TargetFrameworks>net452;netcoreapp2.0</TargetFrameworks>
55
<AssemblyName>Autofac.Extras.IocManager.Tests</AssemblyName>
66
</PropertyGroup>
77

88
<ItemGroup>
99
<PackageReference Include="FakeItEasy" Version="4.0.0" />
1010
<PackageReference Include="NSubstitute" Version="2.0.3" />
1111
<PackageReference Include="Shouldly" Version="3.0.0-beta0003" />
12-
<PackageReference Include="xunit" Version="2.3.0-beta4-build3742" />
13-
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta4-build3742" />
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0-preview-20170810-02" />
12+
<PackageReference Include="xunit" Version="2.3.0-beta5-build3769" />
13+
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta5-build3769" />
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0-preview-20170923-02" />
1515
</ItemGroup>
1616

1717
<ItemGroup>

0 commit comments

Comments
 (0)