Skip to content

Commit 3f4dc28

Browse files
craigfowlercraigfowler
committed
Merge tag 'v1.0.1'
Single-issue release to strong-name the assembly
2 parents f5db404 + 6b3a684 commit 3f4dc28

7 files changed

Lines changed: 25 additions & 21 deletions

File tree

‎CSF.Validation.Tests/CSF.Validation.Tests.csproj‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<OutputType>Library</OutputType>
1010
<RootNamespace>CSF.Validation.Tests</RootNamespace>
1111
<AssemblyName>CSF.Validation.Tests</AssemblyName>
12-
<ReleaseVersion>1.0.0</ReleaseVersion>
12+
<ReleaseVersion>1.0.1</ReleaseVersion>
1313
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1414
</PropertyGroup>
1515
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,16 +36,14 @@
3636
<Reference Include="System" />
3737
<Reference Include="nunit.framework">
3838
<HintPath>..\packages\NUnit.3.6.1\lib\net45\nunit.framework.dll</HintPath>
39+
<Package>nunit</Package>
3940
</Reference>
4041
<Reference Include="Castle.Core">
4142
<HintPath>..\packages\Castle.Core.4.0.0\lib\net45\Castle.Core.dll</HintPath>
4243
</Reference>
4344
<Reference Include="Moq">
4445
<HintPath>..\packages\Moq.4.7.8\lib\net45\Moq.dll</HintPath>
4546
</Reference>
46-
<Reference Include="CSF.Reflection">
47-
<HintPath>..\packages\CSF.Reflection.1.0.1\lib\net45\CSF.Reflection.dll</HintPath>
48-
</Reference>
4947
<Reference Include="Ploeh.AutoFixture">
5048
<HintPath>..\packages\AutoFixture.3.50.2\lib\net40\Ploeh.AutoFixture.dll</HintPath>
5149
</Reference>
@@ -55,6 +53,12 @@
5553
<Reference Include="Ploeh.AutoFixture.AutoMoq">
5654
<HintPath>..\packages\AutoFixture.AutoMoq.3.50.2\lib\net40\Ploeh.AutoFixture.AutoMoq.dll</HintPath>
5755
</Reference>
56+
<Reference Include="CSF.Reflection">
57+
<HintPath>..\packages\CSF.Reflection.1.0.2\lib\net45\CSF.Reflection.dll</HintPath>
58+
</Reference>
59+
<Reference Include="CSF.Utils">
60+
<HintPath>..\packages\CSF.Utils.6.1.0\lib\net45\CSF.Utils.dll</HintPath>
61+
</Reference>
5862
</ItemGroup>
5963
<ItemGroup>
6064
<ProjectReference Include="..\CSF.Validation\CSF.Validation.csproj">

‎CSF.Validation.Tests/packages.config‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
<package id="AutoFixture.AutoMoq" version="3.50.2" targetFramework="net45" />
55
<package id="AutoFixture.NUnit3" version="3.50.2" targetFramework="net45" />
66
<package id="Castle.Core" version="4.0.0" targetFramework="net45" />
7-
<package id="CSF.Reflection" version="1.0.1" targetFramework="net45" />
7+
<package id="CSF.Reflection" version="1.0.2" targetFramework="net45" />
8+
<package id="CSF.Utils" version="6.1.0" targetFramework="net45" />
89
<package id="Moq" version="4.7.8" targetFramework="net45" />
910
<package id="NUnit" version="3.6.1" targetFramework="net45" />
1011
<package id="NUnit.ConsoleRunner" version="3.6.1" targetFramework="net45" />

‎CSF.Validation.sln‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,13 @@ Global
2525
GlobalSection(MonoDevelopProperties) = preSolution
2626
Policies = $0
2727
$0.TextStylePolicy = $1
28-
$1.FileWidth = 120
2928
$1.TabWidth = 2
3029
$1.IndentWidth = 2
3130
$1.NoTabsAfterNonTabs = True
32-
$1.inheritsSet = VisualStudio
33-
$1.inheritsScope = text/plain
3431
$1.scope = text/plain
32+
$1.TabsToSpaces = True
3533
$0.StandardHeader = $2
3634
$2.Text = @\n${FileName}\n \nAuthor:\n ${AuthorName} <${AuthorEmail}>\n\nCopyright (c) ${Year} ${CopyrightHolder}\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the "Software"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in\nall copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\nTHE SOFTWARE.
37-
$2.IncludeInNewFiles = True
3835
$0.DotNetNamingPolicy = $3
3936
$3.DirectoryNamespaceAssociation = PrefixedHierarchical
4037
$3.ResourceNamePolicy = FileName
@@ -166,6 +163,6 @@ Global
166163
$25.NamingStyle = PascalCase
167164
$25.IncludeInstanceMembers = True
168165
$25.IncludeStaticEntities = True
169-
version = 1.0.0
166+
version = 1.0.1
170167
EndGlobalSection
171168
EndGlobal

‎CSF.Validation/CSF.Validation.csproj‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<RootNamespace>CSF.Validation</RootNamespace>
1111
<AssemblyName>CSF.Validation</AssemblyName>
1212
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
13-
<ReleaseVersion>1.0.0</ReleaseVersion>
13+
<ReleaseVersion>1.0.1</ReleaseVersion>
1414
<SignAssembly>true</SignAssembly>
1515
<AssemblyOriginatorKeyFile>..\CSF-Software-OSS.snk</AssemblyOriginatorKeyFile>
1616
</PropertyGroup>
@@ -37,11 +37,13 @@
3737
</PropertyGroup>
3838
<ItemGroup>
3939
<Reference Include="System" />
40-
<Reference Include="CSF.Utils">
41-
<HintPath>..\packages\CSF.Utils.6.0.0\lib\net45\CSF.Utils.dll</HintPath>
42-
</Reference>
4340
<Reference Include="CSF.Reflection">
44-
<HintPath>..\packages\CSF.Reflection.1.0.1\lib\net45\CSF.Reflection.dll</HintPath>
41+
<HintPath>..\packages\CSF.Reflection.1.0.2\lib\net45\CSF.Reflection.dll</HintPath>
42+
<Private>False</Private>
43+
</Reference>
44+
<Reference Include="CSF.Utils">
45+
<HintPath>..\packages\CSF.Utils.6.1.0\lib\net45\CSF.Utils.dll</HintPath>
46+
<Private>False</Private>
4547
</Reference>
4648
</ItemGroup>
4749
<ItemGroup>

‎CSF.Validation/CSF.Validation.nuspec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package>
33
<metadata>
44
<id>CSF.Validation</id>
5-
<version>1.0.0</version>
5+
<version>1.0.1</version>
66
<title>CSF.Validation</title>
77
<authors>CSF Software Ltd</authors>
88
<licenseUrl>https://opensource.org/licenses/MIT</licenseUrl>
@@ -11,8 +11,8 @@
1111
<description>A framework for business rule validation</description>
1212
<copyright>Copyright 2017</copyright>
1313
<dependencies>
14-
<dependency id="CSF.Utils" version="[6.0.0,7.0.0)" />
15-
<dependency id="CSF.Reflection" version="[1.0.1,2.0.0)" />
14+
<dependency id="CSF.Utils" version="[6.1.0,7.0.0)" />
15+
<dependency id="CSF.Reflection" version="[1.0.2,2.0.0)" />
1616
</dependencies>
1717
</metadata>
1818
<files>

‎CSF.Validation/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,5 @@
3939
[assembly: AssemblyConfiguration("Release")]
4040
#endif
4141

42-
[assembly: AssemblyVersion("1.0.0")]
42+
[assembly: AssemblyVersion("1.0.1")]
4343

‎CSF.Validation/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="CSF.Reflection" version="1.0.1" targetFramework="net45" />
4-
<package id="CSF.Utils" version="6.0.0" targetFramework="net45" />
3+
<package id="CSF.Reflection" version="1.0.2" targetFramework="net45" />
4+
<package id="CSF.Utils" version="6.1.0" targetFramework="net45" />
55
</packages>

0 commit comments

Comments
 (0)