Skip to content
This repository was archived by the owner on Sep 16, 2023. It is now read-only.

Commit 86f3f36

Browse files
craigfowlercraigfowler
committed
Merge branch 'release/1.0.2' into production
2 parents f7d12b0 + 7342452 commit 86f3f36

11 files changed

Lines changed: 16 additions & 12 deletions

File tree

‎CSF.FlexDi.BoDiCompatibility.IntegrationTests/CSF.FlexDi.BoDiCompatibility.IntegrationTests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<RootNamespace>BoDi.Tests</RootNamespace>
99
<AssemblyName>BoDi.Tests</AssemblyName>
1010
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
11-
<ReleaseVersion>1.0.1</ReleaseVersion>
11+
<ReleaseVersion>1.0.2</ReleaseVersion>
1212
</PropertyGroup>
1313
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1414
<DebugSymbols>true</DebugSymbols>

‎CSF.FlexDi.BoDiCompatibility.Tests/CSF.FlexDi.BoDiCompatibility.Tests.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<RootNamespace>CSF.FlexDi.BoDiCompatibility.Tests</RootNamespace>
99
<AssemblyName>CSF.FlexDi.BoDiCompatibility.Tests</AssemblyName>
1010
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
11-
<ReleaseVersion>1.0.1</ReleaseVersion>
11+
<ReleaseVersion>1.0.2</ReleaseVersion>
1212
</PropertyGroup>
1313
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1414
<DebugSymbols>true</DebugSymbols>
@@ -31,6 +31,7 @@
3131
<Reference Include="System" />
3232
<Reference Include="nunit.framework">
3333
<HintPath>..\packages\NUnit.3.9.0\lib\net45\nunit.framework.dll</HintPath>
34+
<Package>nunit</Package>
3435
</Reference>
3536
<Reference Include="Ploeh.AutoFixture">
3637
<HintPath>..\packages\AutoFixture.3.51.0\lib\net40\Ploeh.AutoFixture.dll</HintPath>

‎CSF.FlexDi.BoDiCompatibility/CSF.FlexDi.BoDiCompatibility.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<RootNamespace>BoDi</RootNamespace>
99
<AssemblyName>BoDi</AssemblyName>
1010
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
11-
<ReleaseVersion>1.0.1</ReleaseVersion>
11+
<ReleaseVersion>1.0.2</ReleaseVersion>
1212
<SignAssembly>true</SignAssembly>
1313
<AssemblyOriginatorKeyFile>..\CSF-Software-OSS.snk</AssemblyOriginatorKeyFile>
1414
</PropertyGroup>

‎CSF.FlexDi.BoDiCompatibility/CSF.FlexDi.BoDiCompatibility.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package>
33
<metadata>
44
<id>CSF.FlexDi.BoDiCompatibility</id>
5-
<version>1.0.1</version>
5+
<version>1.0.2</version>
66
<title>FlexDi BoDi compatibility</title>
77
<authors>CSF Software Ltd</authors>
88
<licenseUrl>http://www.apache.org/licenses/LICENSE-2.0.txt</licenseUrl>
@@ -11,7 +11,7 @@
1111
<description>A compatible drop-in replacement for the BoDi dependency injection/IoC container (v1.3.0) using FlexDi.</description>
1212
<copyright>Copyright 2018</copyright>
1313
<dependencies>
14-
<dependency id="CSF.FlexDi" version="1.0.1" />
14+
<dependency id="CSF.FlexDi" version="1.0.2" />
1515
</dependencies>
1616
</metadata>
1717
<files>

‎CSF.FlexDi.BoDiCompatibility/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
// The form "{Major}.{Minor}.*" will automatically update the build and revision,
3838
// and "{Major}.{Minor}.{Build}.*" will update just the revision.
3939

40-
[assembly: AssemblyVersion("1.0.1.0")]
40+
[assembly: AssemblyVersion("1.0.2")]
4141

4242
// The following attributes are used to specify the signing key for the assembly,
4343
// if desired. See the Mono documentation for more information about signing.

‎CSF.FlexDi.Tests/CSF.FlexDi.Tests.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<RootNamespace>CSF.FlexDi.Tests</RootNamespace>
99
<AssemblyName>CSF.FlexDi.Tests</AssemblyName>
1010
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
11-
<ReleaseVersion>1.0.1</ReleaseVersion>
11+
<ReleaseVersion>1.0.2</ReleaseVersion>
1212
</PropertyGroup>
1313
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1414
<DebugSymbols>true</DebugSymbols>
@@ -29,6 +29,7 @@
2929
<Reference Include="System" />
3030
<Reference Include="nunit.framework">
3131
<HintPath>..\packages\NUnit.3.9.0\lib\net45\nunit.framework.dll</HintPath>
32+
<Package>nunit</Package>
3233
</Reference>
3334
<Reference Include="Castle.Core">
3435
<HintPath>..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll</HintPath>

‎CSF.FlexDi.sln‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ Global
5555
Policies = $0
5656
$0.StandardHeader = $1
5757
$1.Text = @\n ${FileName}\n\n Copyright ${Year} ${CopyrightHolder}\n\n Licensed under the Apache License, Version 2.0 (the "License");\n you may not use this file except in compliance with the License.\n You may obtain a copy of the License at\n\n http://www.apache.org/licenses/LICENSE-2.0\n\n Unless required by applicable law or agreed to in writing, software\n distributed under the License is distributed on an "AS IS" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n See the License for the specific language governing permissions and\n limitations under the License.\n\n For further copyright info, including a complete author/contributor\n list, please refer to the file NOTICE.txt
58-
$1.IncludeInNewFiles = True
59-
version = 1.0.1
58+
version = 1.0.2
6059
EndGlobalSection
6160
EndGlobal

‎CSF.FlexDi/CSF.FlexDi.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<RootNamespace>CSF.FlexDi</RootNamespace>
99
<AssemblyName>CSF.FlexDi</AssemblyName>
1010
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
11-
<ReleaseVersion>1.0.1</ReleaseVersion>
11+
<ReleaseVersion>1.0.2</ReleaseVersion>
1212
<SignAssembly>true</SignAssembly>
1313
<AssemblyOriginatorKeyFile>..\CSF-Software-OSS.snk</AssemblyOriginatorKeyFile>
1414
</PropertyGroup>

‎CSF.FlexDi/CSF.FlexDi.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package>
33
<metadata>
44
<id>CSF.FlexDi</id>
5-
<version>1.0.1</version>
5+
<version>1.0.2</version>
66
<title>FlexDi - lightweight &amp; extensible DI container</title>
77
<authors>CSF Software Ltd</authors>
88
<licenseUrl>http://www.apache.org/licenses/LICENSE-2.0.txt</licenseUrl>

‎CSF.FlexDi/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
// The form "{Major}.{Minor}.*" will automatically update the build and revision,
3838
// and "{Major}.{Minor}.{Build}.*" will update just the revision.
3939

40-
[assembly: AssemblyVersion("1.0.1.0")]
40+
[assembly: AssemblyVersion("1.0.2")]
4141

4242
// The following attributes are used to specify the signing key for the assembly,
4343
// if desired. See the Mono documentation for more information about signing.

0 commit comments

Comments
 (0)