Merge pull request #9 from Particular/netstandard

Target .NET Standard and misc cleanup

Author: SeanFeldman

.gitattributes

@@ -55,31 +55,16 @@
 *.fs text
 *.fsx text
 *.hs text
-
+*.targets text
 *.psm1 text
 *.ps1 text
+*.md text
+*.DotSettings text
 *.txt text eol=crlf
 *.bat text eol=crlf
 
 # Custom for Visual Studio
-*.csproj merge=union
-*.vbproj merge=union
-*.fsproj merge=union
-*.dbproj merge=union 
-*.sln text eol=crlf merge=union
 *.suo 	-text -diff
 *.snk 	-text -diff
 *.cub 	-text -diff
 *.wixlib	-text -diff
-
-
-*.approved.* binary
-
-*.ncrunchproject
-*.ncrunchsolution
-_NCrunch_NServiceBus/*
-logs
-src/Chocolatey/Build/*
-installer/[F|f]iles
-installer/[C|c]ustom[A|a]ctions
-installer/ServiceControl-cache

.gitignore

@@ -12,9 +12,12 @@ results
 CommonAssemblyInfo.cs
 lib/sqlite/System.Data.SQLite.dll
 *.orig
+*.zip
 Samples/DataBus/storage
 packages
 PrecompiledWeb
+tempstorage
+.learningtransport
 core-only
 Release
 Artifacts
@@ -27,6 +30,10 @@ logs
 run-git.cmd
 src/Chocolatey/Build/*
 
+installer/[F|f]iles
+installer/[C|c]ustom[A|a]ctions
+installer/ServiceControl-cache
+
 # Created by https://www.gitignore.io
 
 ### VisualStudio ###
@@ -36,8 +43,15 @@ src/Chocolatey/Build/*
 # User-specific files
 *.suo
 *.user
+*.json.lock
+*.nuget.targets
+*.lock.json
 *.userosscache
 *.sln.docstates
+.vs/
+
+# mac temp file ignore
+.DS_Store
 
 # Build results
 [Dd]ebug/
@@ -70,3 +84,12 @@ _NCrunch_*
 _ReSharper*/
 *.[Rr]e[Ss]harper
 *.DotSettings.user
+
+src/scaffolding.config
+
+# Approval tests temp file
+*.received.*
+
+# JetBrains Rider
+.idea/
+*.sln.iml

LICENSE

@@ -1,10 +1,10 @@
-By accessing NServiceBus Ltd. code here, you are agreeing to the following licensing terms.
-If you do not agree to these terms, do not access the NServiceBus Ltd. code.
+By accessing NServiceBus code here, you are agreeing to the following licensing terms.
+If you do not agree to these terms, do not access the NServiceBus code.
 
-Your license to the NServiceBus Ltd. source and/or binaries is governed by the Reciprocal Public License 1.5 (RPL1.5) license as described here: 
+Your license to the NServiceBus source and/or binaries is governed by the Reciprocal Public License 1.5 (RPL1.5) license as described here: 
 
 http://www.opensource.org/licenses/rpl1.5.txt
 
-If you do not wish to release the source of software you build using NServiceBus Ltd., you may use NServiceBus Ltd. source and/or binaries under the License Agreement described here:
+If you do not wish to release the source of software you build using NServiceBus, you may use NServiceBus source and/or binaries under the License Agreement described here:
 
-http://particular.net/LicenseAgreement
+http://particular.net/LicenseAgreement

Octopus/DeploymentProcess.json

@@ -0,0 +1,8 @@
+<Project>
+
+  <PropertyGroup>
+    <LangVersion>latest</LangVersion>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+
+</Project>

Octopus/Project.json

@@ -3,20 +3,29 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26430.13
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceControl.Contracts", "ServiceControl.Contracts\ServiceControl.Contracts.csproj", "{C87266FD-71B4-420C-8345-06A7E960C609}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceControl.Contracts", "ServiceControl.Contracts\ServiceControl.Contracts.csproj", "{1FDA6B9B-2A5D-4F0C-B59F-333BF2F5AFE5}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{80F3A7DD-26CB-4826-B394-90386FA24D47}"
+	ProjectSection(SolutionItems) = preProject
+		Directory.Build.props = Directory.Build.props
+		..\GitVersion.yml = ..\GitVersion.yml
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{C87266FD-71B4-420C-8345-06A7E960C609}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C87266FD-71B4-420C-8345-06A7E960C609}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C87266FD-71B4-420C-8345-06A7E960C609}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C87266FD-71B4-420C-8345-06A7E960C609}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1FDA6B9B-2A5D-4F0C-B59F-333BF2F5AFE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1FDA6B9B-2A5D-4F0C-B59F-333BF2F5AFE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1FDA6B9B-2A5D-4F0C-B59F-333BF2F5AFE5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1FDA6B9B-2A5D-4F0C-B59F-333BF2F5AFE5}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {B4CF1EDE-7E21-4E6D-AD80-A3184C12CA48}
+	EndGlobalSection
 EndGlobal