Skip to content

Commit 523cd1d

Browse files
author
Erik Ovegård
committed
Merge remote-tracking branch 'upstream/master' into feature/CLSCompliant
Conflicts: UnitsNet/Properties/AssemblyInfo.cs
2 parents 97cc890 + 99ea5fb commit 523cd1d

File tree

204 files changed

+1662
-2780
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

204 files changed

+1662
-2780
lines changed

‎.gitattributes‎

Lines changed: 60 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,63 @@
1-
# Auto detect text files and perform LF normalization
2-
# http://davidlaing.com/2012/09/19/customise-your-gitattributes-to-become-a-git-ninja/
3-
* text=auto
4-
5-
# Custom for Visual Studio
6-
*.cs diff=csharp
7-
*.sln merge=union
8-
*.ps1 diff
9-
*.csproj merge=union
10-
*.vbproj merge=union
11-
*.fsproj merge=union
12-
*.dbproj merge=union
13-
14-
# Standard to msysgit
15-
*.doc diff=astextplain
16-
*.DOC diff=astextplain
17-
*.docx diff=astextplain
18-
*.DOCX diff=astextplain
19-
*.dot diff=astextplain
20-
*.DOT diff=astextplain
21-
*.pdf diff=astextplain
22-
*.PDF diff=astextplain
23-
*.rtf diff=astextplain
24-
*.RTF diff=astextplain
1+
# Inspired by https://github.com/Danimoth/gitattributes/
2+
# Set default line ending behavior in git repo. Overrides .gitconfig autocrlf configuration.
3+
4+
# Set the default behavior, in case people don't have core.autocrlf set
5+
* text=auto
6+
7+
# Documents
8+
*.doc diff=astextplain
9+
*.DOC diff=astextplain
10+
*.docx diff=astextplain
11+
*.DOCX diff=astextplain
12+
*.dot diff=astextplain
13+
*.DOT diff=astextplain
14+
*.pdf diff=astextplain
15+
*.PDF diff=astextplain
16+
*.rtf diff=astextplain
17+
*.RTF diff=astextplain
18+
*.md text
19+
*.adoc text
20+
*.csv text
21+
*.tab text
22+
*.tsv text
23+
*.sql text
24+
*.textile text
25+
*.mustache text
26+
27+
# Graphics
28+
*.png binary
29+
*.jpg binary
30+
*.jpeg binary
31+
*.gif binary
32+
*.tif binary
33+
*.tiff binary
34+
*.ico binary
35+
*.svg text
36+
*.eps binary
37+
38+
# Visual Studio and .NET
39+
*.sln text eol=crlf merge=union
40+
*.csproj text eol=crlf merge=union
41+
*.vbproj text eol=crlf merge=union
42+
*.fsproj text eol=crlf merge=union
43+
*.dbproj text eol=crlf merge=union
44+
*.cs text diff=csharp
45+
*.config text eol=crlf
46+
47+
# Web
48+
*.xml text
49+
*.json text
50+
*.htm text
51+
*.html text
52+
*.js text
53+
*.ts text
54+
*.cshtml text
55+
56+
# Windows
57+
*.bat text
58+
59+
# PowerShell script files
60+
*.ps1 text
2561

2662
# Whitespace options
2763
* whitespace=trailing-space,space-before-tab,tab-in-indent,tabwidth=4

‎Build/UnitsNet.Serialization.JsonNet.nuspec‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2+
23
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
34
<metadata>
45
<id>UnitsNet.Serialization.JsonNet</id>
@@ -17,12 +18,13 @@
1718
<language>en-US</language>
1819
<tags>unit units measurement json Json.NET Newtonsoft serialize deserialize serialization deserialization</tags>
1920
<dependencies>
20-
<dependency id="Newtonsoft.Json" version="7.0.1"/>
21-
<dependency id="UnitsNet" version="3.17.0"/>
21+
<dependency id="Newtonsoft.Json" version="7.0.1" />
22+
<dependency id="UnitsNet" version="3.17.0" />
2223
</dependencies>
2324
</metadata>
2425
<files>
2526
<file src="Artifacts\Bin\Src\AnyCPU_Release\**\UnitsNet.Serialization.JsonNet.dll" target="lib" />
26-
<file src="UnitsNet.Serialization.JsonNet\**\*.cs" exclude="UnitsNet.Serialization.JsonNet\**\obj\**\*.cs" target="src" />
27+
<file src="UnitsNet.Serialization.JsonNet\**\*.cs" exclude="UnitsNet.Serialization.JsonNet\**\obj\**\*.cs"
28+
target="src" />
2729
</files>
28-
</package>
30+
</package>

‎Build/UnitsNet.nuspec‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2+
23
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
34
<metadata>
45
<id>UnitsNet</id>
@@ -13,7 +14,7 @@
1314
<summary>Simplifies working with units of measurement.</summary>
1415
<iconUrl>https://raw.githubusercontent.com/anjdreas/UnitsNet/ce85185429be345d77eb2ce09c99d59cc9ab8aed/Docs/Images/logo-32.png</iconUrl>
1516
<releaseNotes>
16-
* Add VitaminA unit (@neutmute)
17+
* Add VitaminA unit (@neutmute)
1718
</releaseNotes>
1819
<copyright>Copyright © 2015 Andreas Gullberg Larsen</copyright>
1920
<language>en-US</language>
@@ -23,4 +24,4 @@
2324
<file src="Artifacts\Bin\Src\AnyCPU_Release\**\UnitsNet.dll" target="lib" />
2425
<file src="UnitsNet\**\*.cs" exclude="UnitsNet\**\obj\**\*.cs" target="src" />
2526
</files>
26-
</package>
27+
</package>

‎Build/build-src-debug.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
SET ROOT=%~dp0..
2-
%WinDir%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe %ROOT%\Build\src.msbuild /verbosity:normal /p:Configuration=Debug /p:Platform="AnyCPU" /target:CleanAndBuild /p:RestorePackages=false
2+
"C:\Program Files (x86)\MSBuild\14.0\Bin\MsBuild.exe" %ROOT%\Build\src.msbuild /verbosity:normal /p:Configuration=Debug /p:Platform="AnyCPU" /target:CleanAndBuild /p:RestorePackages=false

‎Build/build-src-release.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
@echo off
22
SET ROOT=%~dp0..
3-
%WinDir%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe %ROOT%\Build\src.msbuild /verbosity:normal /p:Configuration=Release /p:Platform="AnyCPU" /target:CleanAndBuild /p:RestorePackages=false
3+
"C:\Program Files (x86)\MSBuild\14.0\Bin\MsBuild.exe" %ROOT%\Build\src.msbuild /verbosity:normal /p:Configuration=Release /p:Platform="AnyCPU" /target:CleanAndBuild /p:RestorePackages=false

‎Build/build-tests.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
@echo off
22
SET ROOT=%~dp0..
3-
%WinDir%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe %ROOT%\Build\tests.msbuild /verbosity:normal /p:Configuration=Release /p:Platform="AnyCPU" /target:CleanAndBuild /p:RestorePackages=false
3+
"C:\Program Files (x86)\MSBuild\14.0\Bin\MsBuild.exe" %ROOT%\Build\tests.msbuild /verbosity:normal /p:Configuration=Release /p:Platform="AnyCPU" /target:CleanAndBuild /p:RestorePackages=false

‎Build/src.msbuild‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,25 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="CompileProjects" ToolsVersion="12.0">
2+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="CompileProjects" ToolsVersion="14.0">
33
<Import Project="paths.msbuild" />
4-
4+
55
<PropertyGroup>
66
<Platform>AnyCPU</Platform>
77
<Configuration>Release</Configuration>
8-
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">12.0</VisualStudioVersion>
8+
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
99
</PropertyGroup>
10-
10+
1111
<Target Name="CleanAndBuild" DependsOnTargets="Clean;CompileProjects" />
12-
12+
1313
<Target Name="Clean">
1414
<MSBuild Projects="@(AllProjects)" Targets="Clean" />
1515
<RemoveDir Directories="$(SrcBinPath)" />
16-
</Target>
16+
</Target>
1717

1818
<Target Name="CompileProjects">
1919

2020
<MSBuild Projects="
2121
$(SrcPath)\UnitsNet.Net35.csproj;
22-
$(SrcPath)\UnitsNet.Net451.csproj;
2322
$(SrcPath)\UnitsNet.Portable40.csproj;
24-
$(SrcPath)\UnitsNet.Portable45.csproj;
2523
$(SerializationSrcPath)\UnitsNet.Serialization.JsonNet.Net35.csproj"
2624
Properties="Platform=$(Platform);Configuration=$(Configuration);VisualStudioVersion=$(VisualStudioVersion);AllowUnsafeBlocks=true;Retries=15;RetryDelayMilliseconds=5"
2725
Targets="Build">

‎Build/tests.msbuild‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="CleanAndBuild" ToolsVersion="12.0">
2+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="CleanAndBuild" ToolsVersion="14.0">
33
<Import Project="paths.msbuild" />
44

55
<PropertyGroup>
66
<Platform>AnyCPU</Platform>
77
<Configuration>Release</Configuration>
8-
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">12.0</VisualStudioVersion>
8+
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
99
</PropertyGroup>
1010

1111
<Target Name="CleanAndBuild" DependsOnTargets="Clean;CompileProjects" />
12-
12+
1313
<Target Name="Clean">
1414
<MSBuild Projects="@(AllProjects)" Targets="Clean" />
1515
<RemoveDir Directories="$(TestsBinPath)" />
16-
</Target>
16+
</Target>
1717

1818
<Target Name="CompileProjects">
1919

‎Tools/sfk.exe‎

1.54 MB
Binary file not shown.

‎UnitsNet.Serialization.JsonNet.Tests/Properties/AssemblyInfo.cs‎

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,31 @@
1-
using System.Reflection;
2-
using System.Runtime.CompilerServices;
1+
// Copyright(c) 2007 Andreas Gullberg Larsen
2+
// https://github.com/anjdreas/UnitsNet
3+
//
4+
// Permission is hereby granted, free of charge, to any person obtaining a copy
5+
// of this software and associated documentation files (the "Software"), to deal
6+
// in the Software without restriction, including without limitation the rights
7+
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8+
// copies of the Software, and to permit persons to whom the Software is
9+
// furnished to do so, subject to the following conditions:
10+
//
11+
// The above copyright notice and this permission notice shall be included in
12+
// all copies or substantial portions of the Software.
13+
//
14+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15+
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16+
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
17+
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18+
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
19+
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
20+
// THE SOFTWARE.
21+
22+
using System.Reflection;
323
using System.Runtime.InteropServices;
424

525
// General Information about an assembly is controlled through the following
626
// set of attributes. Change these attribute values to modify the information
727
// associated with an assembly.
28+
829
[assembly: AssemblyTitle("UnitsNet.Serialization.JsonNet.Tests")]
930
[assembly: AssemblyDescription("")]
1031
[assembly: AssemblyConfiguration("")]
@@ -17,9 +38,11 @@
1738
// Setting ComVisible to false makes the types in this assembly not visible
1839
// to COM components. If you need to access a type in this assembly from
1940
// COM, set the ComVisible attribute to true on that type.
41+
2042
[assembly: ComVisible(false)]
2143

2244
// The following GUID is for the ID of the typelib if this project is exposed to COM
45+
2346
[assembly: Guid("2a76fc53-e331-4cfa-83c0-93a212fd8f6e")]
2447

2548
// Version information for an assembly consists of the following four values:
@@ -32,5 +55,6 @@
3255
// You can specify all the values or you can default the Build and Revision Numbers
3356
// by using the '*' as shown below:
3457
// [assembly: AssemblyVersion("1.0.*")]
58+
3559
[assembly: AssemblyVersion("1.0.0.0")]
36-
[assembly: AssemblyFileVersion("1.0.0.0")]
60+
[assembly: AssemblyFileVersion("1.0.0.0")]

0 commit comments

Comments
 (0)