Merge pull request #150 from Particular/release-8.0

Release 8.0
Particular · May 10, 2018 · 191e4f1 · 191e4f1
2 parents 934b0ac + ce47555
commit 191e4f1
Show file tree

Hide file tree

Showing 72 changed files with 353 additions and 3,146 deletions.
diff --git a/GitVersion.yml b/GitVersion.yml
@@ -1,7 +1,7 @@
 assembly-versioning-scheme: Major
-next-version: 7.0
+next-version: 8.0
 branches:
   develop:
-    tag: alpha
-  releases?[/-]:
+    tag: beta
+  release:
     tag: rc
diff --git a/LICENSE b/LICENSE
@@ -0,0 +1,10 @@
+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 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, you may use NServiceBus source and/or binaries under the License Agreement described here:
+
+http://particular.net/LicenseAgreement
diff --git a/Octopus/DeploymentProcess.json b/Octopus/DeploymentProcess.json
diff --git a/Octopus/Project.json b/Octopus/Project.json
diff --git a/packaging/nuget/nservicebus.host.nuspec b/packaging/nuget/nservicebus.host.nuspec
diff --git a/packaging/nuget/nservicebus.host32.nuspec b/packaging/nuget/nservicebus.host32.nuspec
diff --git a/packaging/nuget/nservicebus.hosting.profiles.nuspec b/packaging/nuget/nservicebus.hosting.profiles.nuspec
diff --git a/src/.nuget/packages.config b/src/.nuget/packages.config
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -0,0 +1,8 @@
+<Project>
+
+  <PropertyGroup>
+    <LangVersion>latest</LangVersion>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+
+</Project>
diff --git a/...rviceBus.Hosting.Profiles/FodyWeavers.xml → src/FodyWeavers.xml b/...rviceBus.Hosting.Profiles/FodyWeavers.xml → src/FodyWeavers.xml
diff --git a/src/MergeDependencies.targets b/src/MergeDependencies.targets
@@ -0,0 +1,25 @@
+<Project>
+
+  <PropertyGroup>
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="ILRepack" Version="2.0.13" PrivateAssets="All" />
+  </ItemGroup>
+
+  <Target Name="MergeDependencies" AfterTargets="CopyFilesToOutputDirectory" Condition="'$(Configuration)' == 'Release'">
+    <PropertyGroup>
+      <TempFolder>$(ProjectDir)$(OutputPath)temp</TempFolder>
+    </PropertyGroup>
+    <MakeDir Directories="$(TempFolder)" />
+    <Exec Command="&quot;$(ILRepack)&quot; /out:&quot;$(TempFolder)\$(AssemblyName).exe&quot; &quot;$(ProjectDir)$(OutputPath)$(AssemblyName).exe&quot; &quot;$(ProjectDir)$(OutputPath)log4net.dll&quot; &quot;$(ProjectDir)$(OutputPath)Microsoft.Practices.ServiceLocation.dll&quot; &quot;$(ProjectDir)$(OutputPath)Topshelf.dll&quot; /targetplatform:v4 /internalize /keyfile:$(AssemblyOriginatorKeyFile)" />
+    <ItemGroup>
+      <TempFiles Include="$(TempFolder)\*.*" />
+    </ItemGroup>
+    <Copy SourceFiles="@(TempFiles)" DestinationFolder="$(OutputPath)" OverwriteReadOnlyFiles="true" />
+    <Delete Files="@(TempFiles)" />
+    <RemoveDir Directories="$(TempFolder)" />
+  </Target>
+
+</Project>