Skip to content

Commit cd1db34

Browse files
angularsenangularsen
committed
Merge branch 'release/2.0.0' into stable
2 parents f37bded + 258b12c commit cd1db34

File tree

110 files changed

+6102
-3806
lines changed

Some content is hidden

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

110 files changed

+6102
-3806
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,3 +108,4 @@ Backup*/
108108
UpgradeLog*.XML
109109

110110
Build
111+
Thumbs.db

‎README.md‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[![Build Status](http://anj.no:8500/app/rest/builds/buildType:(id:UnitsNet_Base)/statusIcon)](http://anj.no:8500/viewType.html?buildTypeId=btN&guest=1 "Build Status")
1+
[![Build Status](http://anj.no:8500/app/rest/builds/buildType:(id:UnitsNet_ReleaseBuilds)/statusIcon)](http://anj.no:8500/viewType.html?buildTypeId=UnitsNet_ReleaseBuilds&guest=1 "Build Status")
22
Units.NET
33
========
44
Everyone have written their share of trivial conversions - or less obvious ones where you need to Google that magic constant.
@@ -133,4 +133,23 @@ This project is still early and many units and conversions are not yet covered.
133133

134134
Before adding new units, please read the wiki on [Adding a New Unit](https://github.com/InitialForce/UnitsNet/wiki/Adding-a-New-Unit). Other than that, we could always use more/better tests and documentation.
135135

136+
The repo uses [git-flow](https://github.com/nvie/gitflow) branch structure.
137+
In practice this means:
138+
* [Fork the repo](https://help.github.com/articles/fork-a-repo) as normal
139+
* Checkout the default **develop** branch. There is no master branch.
140+
* Adding a new unit
141+
* Branch out from **develop** into **feature/MyNewUnit**
142+
* Fixing a bug in latest release
143+
* Branch out from **stable** into **hotfix/FixSomeBug**
144+
* [Create a pull request](https://help.github.com/articles/using-pull-requests) as normal.
145+
146+
Using [git-flow extensions](https://github.com/nvie/gitflow/wiki/Installation) is recommended, but not necessary.
147+
148+
Continuous Integration
149+
======================
150+
A [TeamCity build server](http://anj.no:8500/project.html?projectId=UnitsNet&tab=projectOverview&guest=1) performs the following:
151+
* Build and test pull requests. Notifies on success or error.
152+
* Build and publish nuget on commits to **stable** branch.
153+
154+
136155
[Contact me](https://github.com/anjdreas) if you have any questions.

‎Scripts/BumpVersion.ps1‎

Lines changed: 0 additions & 124 deletions
This file was deleted.

‎Scripts/SetTeamCityBuildParametersFromNuspec.ps1‎

2.05 KB
Binary file not shown.

‎Scripts/SetVersion.ps1‎

14.7 KB
Binary file not shown.

‎Scripts/build.cmd‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,4 @@
22
SET ROOT=".."
33
%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\MSBuild /t:Rebuild /p:Configuration=Release %ROOT%\Src\UnitsNet\UnitsNet.net35.csproj
44
%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\MSBuild /t:Rebuild /p:Configuration=Release %ROOT%\Src\UnitsNet\UnitsNet.pcl.csproj
5-
%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\MSBuild /t:Rebuild /p:Configuration=Release %ROOT%\Src\UnitsNet\UnitsNet.sl4.csproj
6-
%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\MSBuild /t:Rebuild /p:Configuration=Release %ROOT%\Src\UnitsNet\UnitsNet.netcore45.csproj
75
pause

‎Src/UnitsNet.sln‎

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 2013
4-
VisualStudioVersion = 12.0.21005.1
4+
VisualStudioVersion = 12.0.30110.0
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{4DC016EB-1ED1-4EAA-8537-E47278281BDC}"
77
EndProject
@@ -16,10 +16,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitsNet.pcl", "UnitsNet\Un
1616
EndProject
1717
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitsNet.net35", "UnitsNet\UnitsNet.net35.csproj", "{62E7F8AB-01ED-455A-8CE2-86F020D429B0}"
1818
EndProject
19-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitsNet.sl4", "UnitsNet\UnitsNet.sl4.csproj", "{5624386A-803F-4C86-AB18-9840DFF46DD5}"
20-
EndProject
21-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitsNet.netcore45", "UnitsNet\UnitsNet.netcore45.csproj", "{C1279AA1-A0E4-4066-AAFB-B48F011AFBA0}"
22-
EndProject
2319
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitsNet.Tests.net35", "..\Tests\UnitsNet.Tests.net35.csproj", "{6D74103A-9393-42E8-83A8-9E01F806E29D}"
2420
EndProject
2521
Global
@@ -54,32 +50,6 @@ Global
5450
{62E7F8AB-01ED-455A-8CE2-86F020D429B0}.Release|ARM.ActiveCfg = Release|Any CPU
5551
{62E7F8AB-01ED-455A-8CE2-86F020D429B0}.Release|x64.ActiveCfg = Release|Any CPU
5652
{62E7F8AB-01ED-455A-8CE2-86F020D429B0}.Release|x86.ActiveCfg = Release|Any CPU
57-
{5624386A-803F-4C86-AB18-9840DFF46DD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
58-
{5624386A-803F-4C86-AB18-9840DFF46DD5}.Debug|Any CPU.Build.0 = Debug|Any CPU
59-
{5624386A-803F-4C86-AB18-9840DFF46DD5}.Debug|ARM.ActiveCfg = Debug|Any CPU
60-
{5624386A-803F-4C86-AB18-9840DFF46DD5}.Debug|x64.ActiveCfg = Debug|Any CPU
61-
{5624386A-803F-4C86-AB18-9840DFF46DD5}.Debug|x86.ActiveCfg = Debug|Any CPU
62-
{5624386A-803F-4C86-AB18-9840DFF46DD5}.Release|Any CPU.ActiveCfg = Release|Any CPU
63-
{5624386A-803F-4C86-AB18-9840DFF46DD5}.Release|Any CPU.Build.0 = Release|Any CPU
64-
{5624386A-803F-4C86-AB18-9840DFF46DD5}.Release|ARM.ActiveCfg = Release|Any CPU
65-
{5624386A-803F-4C86-AB18-9840DFF46DD5}.Release|x64.ActiveCfg = Release|Any CPU
66-
{5624386A-803F-4C86-AB18-9840DFF46DD5}.Release|x86.ActiveCfg = Release|Any CPU
67-
{C1279AA1-A0E4-4066-AAFB-B48F011AFBA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
68-
{C1279AA1-A0E4-4066-AAFB-B48F011AFBA0}.Debug|Any CPU.Build.0 = Debug|Any CPU
69-
{C1279AA1-A0E4-4066-AAFB-B48F011AFBA0}.Debug|ARM.ActiveCfg = Debug|ARM
70-
{C1279AA1-A0E4-4066-AAFB-B48F011AFBA0}.Debug|ARM.Build.0 = Debug|ARM
71-
{C1279AA1-A0E4-4066-AAFB-B48F011AFBA0}.Debug|x64.ActiveCfg = Debug|x64
72-
{C1279AA1-A0E4-4066-AAFB-B48F011AFBA0}.Debug|x64.Build.0 = Debug|x64
73-
{C1279AA1-A0E4-4066-AAFB-B48F011AFBA0}.Debug|x86.ActiveCfg = Debug|x86
74-
{C1279AA1-A0E4-4066-AAFB-B48F011AFBA0}.Debug|x86.Build.0 = Debug|x86
75-
{C1279AA1-A0E4-4066-AAFB-B48F011AFBA0}.Release|Any CPU.ActiveCfg = Release|Any CPU
76-
{C1279AA1-A0E4-4066-AAFB-B48F011AFBA0}.Release|Any CPU.Build.0 = Release|Any CPU
77-
{C1279AA1-A0E4-4066-AAFB-B48F011AFBA0}.Release|ARM.ActiveCfg = Release|ARM
78-
{C1279AA1-A0E4-4066-AAFB-B48F011AFBA0}.Release|ARM.Build.0 = Release|ARM
79-
{C1279AA1-A0E4-4066-AAFB-B48F011AFBA0}.Release|x64.ActiveCfg = Release|x64
80-
{C1279AA1-A0E4-4066-AAFB-B48F011AFBA0}.Release|x64.Build.0 = Release|x64
81-
{C1279AA1-A0E4-4066-AAFB-B48F011AFBA0}.Release|x86.ActiveCfg = Release|x86
82-
{C1279AA1-A0E4-4066-AAFB-B48F011AFBA0}.Release|x86.Build.0 = Release|x86
8353
{6D74103A-9393-42E8-83A8-9E01F806E29D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
8454
{6D74103A-9393-42E8-83A8-9E01F806E29D}.Debug|Any CPU.Build.0 = Debug|Any CPU
8555
{6D74103A-9393-42E8-83A8-9E01F806E29D}.Debug|ARM.ActiveCfg = Debug|Any CPU

0 commit comments

Comments
 (0)