Skip to content

Commit d76bcc6

Browse files
henkmollemahenkmollema
committed
Update to RC2 final
1 parent 3074747 commit d76bcc6

File tree

6 files changed

+67
-66
lines changed

6 files changed

+67
-66
lines changed

‎CryptoHelper.sln

+17-15
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,42 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 14
4-
VisualStudioVersion = 14.0.23107.0
4+
VisualStudioVersion = 14.0.25123.0
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C03C9E2A-0572-45A4-9D08-2B4FB8DB008F}"
7-
EndProject
86
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{AED8A2C4-4D9F-42D7-A0D0-0832128A0072}"
97
ProjectSection(SolutionItems) = preProject
108
global.json = global.json
119
NuGet.Config = NuGet.Config
1210
EndProjectSection
1311
EndProject
14-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "CryptoHelper", "src\CryptoHelper\CryptoHelper.xproj", "{EBEDFD6C-2272-48EF-B9D0-83615BD171D8}"
12+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{AE91DAF8-4A94-4A25-BA27-87F603FBCD4B}"
13+
EndProject
14+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "CryptoHelper", "src\CryptoHelper\CryptoHelper.xproj", "{05BFEEDB-1E36-4A70-BADA-07D68CEF8862}"
15+
EndProject
16+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{D7466811-2D0F-4015-9480-E97D32BD1EEA}"
1517
EndProject
16-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "CryptoHelper.Tests", "test\CryptoHelper.Tests\CryptoHelper.Tests.xproj", "{B34E927D-326A-4D30-A0F5-78EFDE5E3DC6}"
18+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "CryptoHelper.Tests", "test\CryptoHelper.Tests\CryptoHelper.Tests.xproj", "{F4D8F18C-6809-4CE4-BBBA-1801B2710987}"
1719
EndProject
1820
Global
1921
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2022
Debug|Any CPU = Debug|Any CPU
2123
Release|Any CPU = Release|Any CPU
2224
EndGlobalSection
2325
GlobalSection(ProjectConfigurationPlatforms) = postSolution
24-
{EBEDFD6C-2272-48EF-B9D0-83615BD171D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
25-
{EBEDFD6C-2272-48EF-B9D0-83615BD171D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
26-
{EBEDFD6C-2272-48EF-B9D0-83615BD171D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
27-
{EBEDFD6C-2272-48EF-B9D0-83615BD171D8}.Release|Any CPU.Build.0 = Release|Any CPU
28-
{B34E927D-326A-4D30-A0F5-78EFDE5E3DC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
29-
{B34E927D-326A-4D30-A0F5-78EFDE5E3DC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
30-
{B34E927D-326A-4D30-A0F5-78EFDE5E3DC6}.Release|Any CPU.ActiveCfg = Release|Any CPU
31-
{B34E927D-326A-4D30-A0F5-78EFDE5E3DC6}.Release|Any CPU.Build.0 = Release|Any CPU
26+
{05BFEEDB-1E36-4A70-BADA-07D68CEF8862}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
27+
{05BFEEDB-1E36-4A70-BADA-07D68CEF8862}.Debug|Any CPU.Build.0 = Debug|Any CPU
28+
{05BFEEDB-1E36-4A70-BADA-07D68CEF8862}.Release|Any CPU.ActiveCfg = Release|Any CPU
29+
{05BFEEDB-1E36-4A70-BADA-07D68CEF8862}.Release|Any CPU.Build.0 = Release|Any CPU
30+
{F4D8F18C-6809-4CE4-BBBA-1801B2710987}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
31+
{F4D8F18C-6809-4CE4-BBBA-1801B2710987}.Debug|Any CPU.Build.0 = Debug|Any CPU
32+
{F4D8F18C-6809-4CE4-BBBA-1801B2710987}.Release|Any CPU.ActiveCfg = Release|Any CPU
33+
{F4D8F18C-6809-4CE4-BBBA-1801B2710987}.Release|Any CPU.Build.0 = Release|Any CPU
3234
EndGlobalSection
3335
GlobalSection(SolutionProperties) = preSolution
3436
HideSolutionNode = FALSE
3537
EndGlobalSection
3638
GlobalSection(NestedProjects) = preSolution
37-
{EBEDFD6C-2272-48EF-B9D0-83615BD171D8} = {C03C9E2A-0572-45A4-9D08-2B4FB8DB008F}
38-
{B34E927D-326A-4D30-A0F5-78EFDE5E3DC6} = {C03C9E2A-0572-45A4-9D08-2B4FB8DB008F}
39+
{05BFEEDB-1E36-4A70-BADA-07D68CEF8862} = {AE91DAF8-4A94-4A25-BA27-87F603FBCD4B}
40+
{F4D8F18C-6809-4CE4-BBBA-1801B2710987} = {D7466811-2D0F-4015-9480-E97D32BD1EEA}
3941
EndGlobalSection
4042
EndGlobal

‎NuGet.Config

-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
<configuration>
33
<packageSources>
44
<clear />
5-
<add key="xunit" value="https://www.myget.org/F/xunit/api/v3/index.json" />
6-
<add key="AspNetCiDev" value="https://www.myget.org/F/aspnetcidev/api/v3/index.json" />
75
<add key="NuGet" value="https://api.nuget.org/v3/index.json" />
86
</packageSources>
97
</configuration>

‎src/CryptoHelper/CryptoHelper.xproj

+8-13
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,19 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="14.0.25123" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
4-
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
4+
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0.25123</VisualStudioVersion>
55
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
66
</PropertyGroup>
7-
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
7+
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
88
<PropertyGroup Label="Globals">
9-
<ProjectGuid>ebedfd6c-2272-48ef-b9d0-83615bd171d8</ProjectGuid>
9+
<ProjectGuid>05bfeedb-1e36-4a70-bada-07d68cef8862</ProjectGuid>
1010
<RootNamespace>CryptoHelper</RootNamespace>
11-
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
12-
<OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
11+
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
12+
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
1313
</PropertyGroup>
14+
1415
<PropertyGroup>
1516
<SchemaVersion>2.0</SchemaVersion>
1617
</PropertyGroup>
17-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
18-
<ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
19-
</PropertyGroup>
20-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
21-
<ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
22-
</PropertyGroup>
23-
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
18+
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
2419
</Project>

‎src/CryptoHelper/project.json

+20-17
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
11
{
2-
"version": "1.0.0-rc2-build04",
2+
"version": "1.0.0-rc2-*",
33
"authors": [ "Henk Mollema" ],
4-
"owners": [ "Henk Mollema" ],
5-
"description": "Cryptography helper methods for hashing passwords on .NET Core using a PBKDF2 implementation.",
6-
"projectUrl": "https://github.com/henkmollema/CryptoHelper",
7-
"licenseUrl": "https://github.com/henkmollema/CryptoHelper/blob/master/LICENSE",
8-
"tags": [ "c#", "hashing", "salting", "crypto", "core", "PBKDF2", "Rfc2898DeriveBytes" ],
94
"copyright": "Copyright 2016 Henk Mollema",
10-
"repository": {
11-
"type": "git",
12-
"url": "git://github.com/henkmollema/CryptoHelper"
5+
"description": "Cryptography helper methods for hashing passwords on .NET Core using a PBKDF2 implementation.",
6+
"packOptions": {
7+
"repository": {
8+
"type": "git",
9+
"url": "git://github.com/henkmollema/CryptoHelper"
10+
},
11+
"tags": [ "hashing", "crypto", "core", "PBKDF2", "Rfc2898DeriveBytes" ],
12+
"owners": [ "Henk Mollema" ],
13+
"projectUrl": "https://github.com/henkmollema/CryptoHelper",
14+
"licenseUrl": "https://github.com/henkmollema/CryptoHelper/blob/master/LICENSE"
1315
},
14-
15-
"compilationOptions": {
16-
"xmlDoc": true
16+
17+
"buildOptions": {
18+
"xmlDoc": true
1719
},
1820

1921
"frameworks": {
@@ -23,21 +25,22 @@
2325

2426
"net451": {
2527
"dependencies": {
26-
"Microsoft.AspNetCore.Cryptography.KeyDerivation": "1.0.0-*"
28+
"Microsoft.AspNetCore.Cryptography.KeyDerivation": "1.0.0-rc2-final"
2729
},
28-
"compilationOptions": {
30+
"buildOptions": {
2931
"define": [ "COREFX" ]
3032
}
3133
},
3234

3335
"netstandard1.3": {
3436
"dependencies": {
35-
"Microsoft.AspNetCore.Cryptography.KeyDerivation": "1.0.0-*"
37+
"Microsoft.AspNetCore.Cryptography.KeyDerivation": "1.0.0-rc2-final"
3638
},
3739
"imports": [
38-
"dotnet5.4"
40+
"dotnet5.4",
41+
"portable-net451+win8"
3942
],
40-
"compilationOptions": {
43+
"buildOptions": {
4144
"define": [ "COREFX" ]
4245
}
4346
}

‎test/CryptoHelper.Tests/CryptoHelper.Tests.xproj

+8-9
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="14.0.25123" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
4-
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
4+
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0.25123</VisualStudioVersion>
55
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
66
</PropertyGroup>
7-
8-
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
7+
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
98
<PropertyGroup Label="Globals">
10-
<ProjectGuid>b34e927d-326a-4d30-a0f5-78efde5e3dc6</ProjectGuid>
9+
<ProjectGuid>f4d8f18c-6809-4ce4-bbba-1801b2710987</ProjectGuid>
1110
<RootNamespace>CryptoHelper.Tests</RootNamespace>
12-
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
13-
<OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
11+
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
12+
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
1413
</PropertyGroup>
1514

1615
<PropertyGroup>
1716
<SchemaVersion>2.0</SchemaVersion>
1817
</PropertyGroup>
19-
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
20-
</Project>
18+
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
19+
</Project>

‎test/CryptoHelper.Tests/project.json

+14-10
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,25 @@
11
{
22
"dependencies": {
3-
"CryptoHelper": "1.0.0-rc2-*",
4-
"dotnet-test-xunit": "1.0.0-dev-*",
5-
"Microsoft.AspNetCore.Testing": "1.0.0-*",
6-
"Microsoft.NETCore.Platforms": "1.0.1-*",
7-
"xunit": "2.1.0",
8-
"System.Runtime": "4.1.0-*"
3+
"CryptoHelper": "1.0.0-*",
4+
"dotnet-test-xunit": "1.0.0-rc2-build10015",
5+
"Microsoft.NETCore.Platforms": "1.0.1-rc2-24027",
6+
"xunit": "2.1.0"
97
},
108

119
"frameworks": {
12-
"netstandardapp1.5": {
10+
"netcoreapp1.0": {
11+
"dependencies": {
12+
"Microsoft.NETCore.App": {
13+
"version": "1.0.0-rc2-3002702",
14+
"type": "platform"
15+
}
16+
},
1317
"imports": [
1418
"dnxcore50",
1519
"portable-net451+win8"
1620
]
17-
}
21+
}
1822
},
19-
23+
2024
"testRunner": "xunit"
21-
}
25+
}

0 commit comments

Comments
 (0)