Skip to content

Commit f92bd12

Browse files
darrenkoppdarrenkopp
committed
support net standard 1.4 in build
add support for building the new .net core stuff from command line and add utilities for publishing
1 parent 0597f39 commit f92bd12

11 files changed

+32
-22
lines changed

Diff for: ‎.gitignore

+4-1
Original file line numberDiff line numberDiff line change
@@ -105,4 +105,7 @@ Generated_Code #added for RIA/Silverlight projects
105105
# Visual Studio version. Backup files are not needed, because we have git ;-)
106106
_UpgradeReport_Files/
107107
Backup*/
108-
UpgradeLog*.XML
108+
UpgradeLog*.XML
109+
110+
# new vs stuff
111+
.vs

Diff for: ‎MurmurHash-net-core/MurmurHash-net-core.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<PropertyGroup>
88
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
99
<Version>1.0.0</Version>
10+
<AssemblyName>MurmurHash</AssemblyName>
1011
</PropertyGroup>
1112

1213
<ItemGroup>

Diff for: ‎MurmurHash-net35/MurmurHash-net35.csproj

+3
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,9 @@
7171
</Compile>
7272
<Compile Include="Properties\AssemblyInfo.cs" />
7373
</ItemGroup>
74+
<PropertyGroup>
75+
<FrameworkPathOverride>C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client</FrameworkPathOverride>
76+
</PropertyGroup>
7477
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
7578
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
7679
Other similar extension points exist, see Microsoft.Common.targets.

Diff for: ‎MurmurHash.sln

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 2012
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.26430.16
5+
MinimumVisualStudioVersion = 10.0.40219.1
46
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MurmurHash", "MurmurHash\MurmurHash.csproj", "{5E240B61-4CCD-4C2A-A0F2-F545C5E9939C}"
57
EndProject
68
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MurmurRunner-x86", "Runners\MurmurRunner-x86\MurmurRunner-x86.csproj", "{C0320E2F-CE1D-45BA-8D2D-219F9F5014AE}"
@@ -11,6 +13,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{793CFB32-4
1113
ProjectSection(SolutionItems) = preProject
1214
compile.proj = compile.proj
1315
default.proj = default.proj
16+
publish.cmd = publish.cmd
17+
publish.ps1 = publish.ps1
1418
README.md = README.md
1519
release.cmd = release.cmd
1620
EndProjectSection

Diff for: ‎Package-signed.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package >
33
<metadata>
44
<id>murmurhash-signed</id>
5-
<version>1.0.0</version>
5+
<version>1.0.1</version>
66
<authors>Darren Kopp</authors>
77
<owners>Darren Kopp, Ian Campbell</owners>
88
<licenseUrl>https://github.com/darrenkopp/murmurhash-net/blob/master/LICENSE.md</licenseUrl>

Diff for: ‎Package.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package >
33
<metadata>
44
<id>murmurhash</id>
5-
<version>1.0.0</version>
5+
<version>1.0.1</version>
66
<authors>Darren Kopp</authors>
77
<owners>Darren Kopp, Ian Campbell</owners>
88
<licenseUrl>https://github.com/darrenkopp/murmurhash-net/blob/master/LICENSE.md</licenseUrl>

Diff for: ‎compile.proj

+5-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</PropertyGroup>
1313

1414
<PropertyGroup>
15-
<NugetPackageVersion>1.0.0</NugetPackageVersion>
15+
<NugetPackageVersion>1.0.1</NugetPackageVersion>
1616
</PropertyGroup>
1717

1818
<Target Name="All">
@@ -21,7 +21,7 @@
2121

2222
<Target Name="Compile">
2323
<ItemGroup>
24-
<_TargetProjects Include="$(SourceDirectory)\MurmurHash\*.csproj;$(SourceDirectory)\MurmurHash-net4\*.csproj;$(SourceDirectory)\MurmurHash-net35\*.csproj" />
24+
<_TargetProjects Include="$(SourceDirectory)\MurmurHash\*.csproj;$(SourceDirectory)\MurmurHash-net4\*.csproj;$(SourceDirectory)\MurmurHash-net35\*.csproj;$(SourceDirectory)\MurmurHash-net-core\*.csproj" />
2525
</ItemGroup>
2626
<Message Text="$(SignAssembly)" />
2727
<MSBuild Projects="@(_TargetProjects)" Targets="Clean;Build" Properties="Configuration=$(Configuration);SignAssembly=$(SignAssembly);AssemblyOriginatorKeyFile=$(AssemblyOriginatorKeyFile)" />
@@ -32,16 +32,19 @@
3232
<Net35OutputFiles Include="$(SourceDirectory)\*-net35\**\$(Configuration)\MurmurHash.dll" />
3333
<Net40OutputFiles Include="$(SourceDirectory)\*-net4\**\$(Configuration)\MurmurHash.dll" />
3434
<Net45OutputFiles Include="$(SourceDirectory)\MurmurHash\**\$(Configuration)\MurmurHash.dll" />
35+
<NetCoreOutputFiles Include="$(SourceDirectory)\*-net-core\**\$(Configuration)\netstandard1.4\MurmurHash.dll" />
3536
</ItemGroup>
3637
<RemoveDir Condition=" Exists('$(BuildDirectory)') " Directories="$(BuildDirectory)" />
3738
<MakeDir Condition=" !Exists('$(BuildDirectory)') " Directories="$(BuildDirectory)" />
3839
<MakeDir Directories="$(BuildDirectory)\net35" />
3940
<MakeDir Directories="$(BuildDirectory)\net40" />
4041
<MakeDir Directories="$(BuildDirectory)\net45" />
42+
<MakeDir Directories="$(BuildDirectory)\netstandard1.4" />
4143

4244
<Copy SourceFiles="@(Net35OutputFiles)" DestinationFolder="$(BuildDirectory)\net35" />
4345
<Copy SourceFiles="@(Net40OutputFiles)" DestinationFolder="$(BuildDirectory)\net40" />
4446
<Copy SourceFiles="@(Net45OutputFiles)" DestinationFolder="$(BuildDirectory)\net45" />
47+
<Copy SourceFiles="@(NetCoreOutputFiles)" DestinationFolder="$(BuildDirectory)\netstandard1.4" />
4548
</Target>
4649

4750
<Target Name="CreateNuGetPackage">

Diff for: ‎default.proj

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="All" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
2+
<Project DefaultTargets="All" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<Configuration Condition=" $(Configuration) == '' ">Release</Configuration>
55
<SourceDirectory>$(MSBuildProjectDirectory)</SourceDirectory>
@@ -8,10 +8,6 @@
88
<NuGetDirectory>$(SourceDirectory)\.nuget</NuGetDirectory>
99
</PropertyGroup>
1010

11-
<PropertyGroup>
12-
<NugetPackageVersion>1.0.0</NugetPackageVersion>
13-
</PropertyGroup>
14-
1511
<Target Name="_BuildProjects">
1612
<MSBuild Projects="compile.proj" Targets="All" Properties="Configuration=$(Configuration);SignAssembly=false;SourceNuSpecFile=$(SourceDirectory)\Package.nuspec" />
1713
<MSBuild Projects="compile.proj" Targets="All" Properties="Configuration=$(Configuration);SignAssembly=true;SourceNuSpecFile=$(SourceDirectory)\Package-signed.nuspec" />

Diff for: ‎publish.cmd

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
powershell -ExecutionPolicy Unrestricted .\publish.ps1

Diff for: ‎publish.ps1

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
[string]$token = Read-Host -Prompt "what is the token";
2+
3+
$token = $token.Trim();
4+
5+
$packages = dir .\release\*.nupkg | %{ $_.Name };
6+
$packages | %{
7+
.\.nuget\NuGet.exe push .\release\$_ $token -source https://nuget.org;
8+
}

Diff for: ‎release.cmd

+2-11
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
1-
@echo off
2-
@SET Framework40Version=4.0
1+
32

4-
@if "%PathToMsBuild%"=="" (
5-
@for /F "tokens=1,2*" %%i in ('reg query "HKLM\SOFTWARE\Wow6432Node\Microsoft\MSBuild\ToolsVersions\%Framework40Version%" /v "MSBuildToolsPath"') DO (
6-
if "%%i" == "MSBuildToolsPath" (
7-
@SET "PathToMsBuild=%%k"
8-
)
9-
)
10-
)
11-
12-
%PathToMsBuild%\MSBuild.exe default.proj /nologo /v:n /m:4
3+
dotnet msbuild default.proj /nologo /v:n /m:4

0 commit comments

Comments
 (0)