re-motion · MichaelKetting · May 29, 2017 · May 17, 2017 · May 17, 2017 · May 17, 2017
diff --git a/.gitignore b/.gitignore
@@ -124,6 +124,12 @@ publish/
 ## TODO: If you have NuGet Package Restore enabled, uncomment the next line
 packages/
 
+# DotNet Core
+project.lock.json
+
+# Visual Stduio 2015
+.vs/
+
 # Windows Azure Build Output
 csx
 *.build.csdef

diff --git a/.nuget/packages.config b/.nuget/packages.config
@@ -3,7 +3,7 @@
   <package id="DependDB.BuildProcessor" version="1.7.3.0" />
   <package id="DependDB.BuildProcessor.NuGetPreProcessor" version="1.7.3.0" />
   <package id="MSBuild.Extension.Pack" version="1.5.0" />
-  <package id="NuGet.CommandLine" version="3.5.0" />
+  <package id="NuGet.CommandLine" version="2.8.6" />
   <package id="NuGet.for.MSBuild" version="1.4.3" targetFramework="net45" />
   <package id="NUnit.Runners" version="2.6.3" />
   <package id="Remotion.BuildTools.MSBuildTasks" version="1.0.6180.28602" />

diff --git a/Build.cmd b/Build.cmd
@@ -1,8 +1,8 @@
 @echo off
 pushd %~dp0
-set msbuild="C:\Program Files (x86)\MSBuild\12.0\Bin\MSBuild.exe"
-set log-dir=build\BuildOutput\log
-set nuget-bin=build\BuildOutput\temp\nuget-bin
+set msbuild="C:\Windows\Microsoft.NET\Framework\v4.0.30319\msbuild.exe"
+set log-dir=Build\BuildOutput\log
+set nuget-bin=Build\BuildOutput\temp\nuget-bin
 set nuget=%nuget-bin%\nuget.exe
 set nuget-download=powershell.exe -NoProfile -Command "& {(New-Object System.Net.WebClient).DownloadFile('https://www.nuget.org/nuget.exe','%nuget%')}"
 set solutionFile=Relinq-EagerFetching.sln

diff --git a/Build/Build.csproj b/Build/Build.csproj
@@ -51,6 +51,7 @@
     <None Include="..\.BuildProject">
       <Link>.BuildProject</Link>
     </None>
+    <None Include="Customizations\PatchNuGetOutput.targets" />
     <None Include="Customizations\Local\Configuration.targets" />
     <None Include="Customizations\Projects.props">
       <SubType>Designer</SubType>

diff --git a/Build/Customizations/DisableDependDB.targets b/Build/Customizations/DisableDependDB.targets
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Target Name="ProcessForDependDBInternal">
+    <Message Text="DependDB has been disabled." Importance="High"/>
+  </Target>
+</Project>
diff --git a/Build/Customizations/PatchNuGetOutput.targets b/Build/Customizations/PatchNuGetOutput.targets
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <PropertyGroup>
+    <!-- The dependency list must only be updated based on the list in Core.nuspec.
+    -->
+    <DotNetCore_Dependencies>
+      <group xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
+        <dependency id="Remotion.Linq" version="[2.1.1, )" />
+      </group>
+      <group targetFramework=".NETStandard1.0" xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
+        <dependency id="Remotion.Linq" version="[2.1.1, )" />
+        <dependency id="System.Collections" version="[4.0.11, )" />
+        <dependency id="System.Linq" version="[4.1.0, )" />
+        <dependency id="System.Linq.Expressions" version="[4.1.0, )" />
+        <dependency id="System.ObjectModel" version="[4.0.12, )" />
+        <dependency id="System.Reflection" version="[4.1.0, )" />
+        <dependency id="System.Runtime" version="[4.1.0, )" />
+      </group>
+    </DotNetCore_Dependencies>
+  </PropertyGroup>
+
+  <Target Name="DotNetCore_PatchNuGetPackages" AfterTargets="CreateNuGetPackagesWithDebugSymbols">
+    <Message Text="Patching NuGet packages, ConfigurationID=$(ConfigurationID)" Importance="High"/>
+
+    <Error Text="The property 'ConfigurationID' is not set." Condition="'$(ConfigurationID)' == ''" />
+
+    <MakeDir Directories="$(_nuGetTempDirectory)"/>
+
+    <!-- Extract the NUPKG-files, remove the SRC-files, re-zip the NUPKG-files -->
+
+    <ItemGroup>
+      <_nuGetFiles Remove="@(_nuGetFiles)" />
+      <_nuGetFiles Include="$(NuGetWithDebugSymbolsOutputDirectory)Remotion.Linq.EagerFetching.*.nupkg">
+        <ExtractionPath>$(TempDirectory)nuget\$([System.Guid]::NewGuid())\</ExtractionPath>
+      </_nuGetFiles>
+      <_nuGetFiles Include="$(NuGetWithSymbolServerSupportDirectory)Remotion.Linq.EagerFetching.*.nupkg" Exclude="$(NuGetWithSymbolServerSupportDirectory)Remotion.Linq.EagerFetching.*symbols.nupkg">
+        <ExtractionPath>$(TempDirectory)nuget\$([System.Guid]::NewGuid())\</ExtractionPath>
+      </_nuGetFiles>
+      <_nuGetFiles Include="$(NuGetWithSymbolServerSupportDirectory)Remotion.Linq.EagerFetching.*.symbols.nupkg">
+        <ExtractionPath>$(TempDirectory)nuget\$([System.Guid]::NewGuid())\</ExtractionPath>
+      </_nuGetFiles>
+    </ItemGroup>
+
+    <MSBuild.ExtensionPack.Compression.Zip
+        TaskAction="Extract"
+        ExtractPath="%(_nuGetFiles.ExtractionPath)" 
+        ZipFileName="%(_nuGetFiles.Identity)" />
+
+    <MSBuild.ExtensionPack.FileSystem.File
+        TaskAction="Replace" 
+        RegexPattern="xmlns=&quot;http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd&quot;"
+        Replacement="xmlns=&quot;http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd&quot;"
+        Files="%(_nuGetFiles.ExtractionPath)\Remotion.Linq.EagerFetching.nuspec"/>
+
+    <MSBuild.ExtensionPack.FileSystem.File
+        TaskAction="Replace" 
+        RegexPattern="xmlns=&quot;http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd&quot;"
+        Replacement="xmlns=&quot;http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd&quot;"
+        Files="%(_nuGetFiles.ExtractionPath)\Remotion.Linq.EagerFetching.nuspec"/>
+
+    <ItemGroup>
+      <_namespaces Remove="@(_namespaces)" />
+      <_namespaces Include="NuSpec">
+        <Prefix>nuspec</Prefix>
+        <Uri>http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd</Uri>
+      </_namespaces>
+    </ItemGroup>
+
+    <MSBuild.ExtensionPack.Xml.XmlFile
+        TaskAction="UpdateElement"
+        File="%(_nuGetFiles.ExtractionPath)\Remotion.Linq.EagerFetching.nuspec"
+        XPath="/nuspec:package/nuspec:metadata/nuspec:dependencies"
+        InnerXml="$(DotNetCore_Dependencies)"
+        Namespaces="@(_namespaces)"/>
+
+    <MSBuild.ExtensionPack.Compression.Zip
+        TaskAction="Create"
+        CompressPath="%(_nuGetFiles.ExtractionPath)" 
+        RemoveRoot="%(_nuGetFiles.ExtractionPath)"
+        ZipFileName="%(_nuGetFiles.Identity)" />
+
+    <Message Text="Done patching NuGet packages, ConfigurationID=$(ConfigurationID)" Importance="High"/>
+  </Target>
+</Project>
diff --git a/Build/Customizations/Projects.props b/Build/Customizations/Projects.props
@@ -10,9 +10,16 @@
       <ExcludeFromDocumentation>True</ExcludeFromDocumentation>
     </ReleaseProjectFiles>
 
+    <ReleaseProjectFiles Include="$(SolutionDirectory)Core.Net_4_5\Core.Net_4_5.csproj">
+      <ExcludeFromDocumentation>False</ExcludeFromDocumentation>
+      <CreateDocumentationFile>True</CreateDocumentationFile>
+    </ReleaseProjectFiles>
+
     <ReleaseProjectFiles Include="$(SolutionDirectory)Core\Core.csproj">
       <CreateNuGetPackageWithSymbolServerSupport>True</CreateNuGetPackageWithSymbolServerSupport>
-      <CreateDocumentationFile>True</CreateDocumentationFile>
+      <!-- Disabled here and moved to Core.Net_4_5 to support generating two assemblies in the Core.csproj -->
+      <ExcludeFromDocumentation>True</ExcludeFromDocumentation>
+      <CreateDocumentationFile>False</CreateDocumentationFile>
     </ReleaseProjectFiles>
 
     <UnitTestProjectFiles Include="$(SolutionDirectory)UnitTests.Net_3_5\UnitTests.Net_3_5.csproj">
@@ -23,6 +30,10 @@
       <ExecutionRuntime>net-4.0</ExecutionRuntime>
     </UnitTestProjectFiles>
 
+    <UnitTestProjectFiles Include="$(SolutionDirectory)UnitTests.Net_4_5\UnitTests.Net_4_5.csproj">
+      <ExecutionRuntime>net-4.5</ExecutionRuntime>
+    </UnitTestProjectFiles>
+
     <UnitTestProjectFiles Include="$(SolutionDirectory)UnitTests\UnitTests.csproj"/>
 
   </ItemGroup>

diff --git a/Build/Customizations/releaseProcessScript.config b/Build/Customizations/releaseProcessScript.config
@@ -23,7 +23,7 @@
     <fileName>Build/Customizations/Version.props</fileName>
   </developStableMergeIgnoreList>
   <msBuildSettings>
-    <msBuildPath>C:\Program Files (x86)\MSBuild\12.0\Bin\MSBuild.exe</msBuildPath>
+    <msBuildPath>C:\Windows\Microsoft.NET\Framework\v4.0.30319\msbuild.exe</msBuildPath>
   </msBuildSettings>
   <prepareNextVersionMsBuildSteps>
     <step>
@@ -49,4 +49,4 @@
     <fileName>
     </fileName>
   </tagStableMergeIgnoreList>
-</settings>
+</settings>
diff --git a/Build/Remotion.build b/Build/Remotion.build
@@ -26,7 +26,8 @@
     <DependDBBuildProcessorToolPath Condition="'$(NuGetToolPath)' == ''">$(PackagesDirectory)DependDB.BuildProcessor.1.7.3.0\tools\</DependDBBuildProcessorToolPath>
     <DependDBNuGetPreProcessorToolPath Condition="'$(NuGetToolPath)' == ''">$(PackagesDirectory)DependDB.BuildProcessor.NuGetPreProcessor.1.7.3.0\tools\</DependDBNuGetPreProcessorToolPath>
     <NUnitToolPath Condition="'$(NUnitToolPath)' == ''">$(PackagesDirectory)NUnit.Runners.2.6.3\tools\</NUnitToolPath>
-    <NuGetToolPath Condition="'$(NuGetToolPath)' == ''">$(PackagesDirectory)NuGet.CommandLine.3.5.0\tools\</NuGetToolPath>
+    <!-- Cannot use NuGet v3.x at this point since it will default to project.json instead of the nuspec file. -->
+    <NuGetToolPath Condition="'$(NuGetToolPath)' == ''">$(PackagesDirectory)NuGet.CommandLine.2.8.6\tools\</NuGetToolPath>
     <NuGetForMSBuildPath Condition="'$(NuGetForMSBuildPath)' == ''">$(PackagesDirectory)NuGet.for.MSBuild.1.4.3\build\</NuGetForMSBuildPath>
     <RemotionBuildTasksPath Condition="'$(RemotionBuildTasksPath)' == ''">$(PackagesDirectory)Remotion.BuildTools.MSBuildTasks.1.0.6180.28602\tools\</RemotionBuildTasksPath>
     <RemotionBuildScriptPath Condition="'$(RemotionBuildScriptPath)' == ''">$(PackagesDirectory)Remotion.BuildScript.2.0.0-alpha017\BuildTargets\</RemotionBuildScriptPath>
@@ -175,4 +176,4 @@
 
   <Import Project="$(CustomizationsDirectory)*.targets" />
 
-</Project>
+</Project>
diff --git a/..._Packages/Remotion.JetBrains.Annotations.Sources.1.15.23.0/AssertionConditionAttribute.cs b/..._Packages/Remotion.JetBrains.Annotations.Sources.1.15.23.0/AssertionConditionAttribute.cs
@@ -0,0 +1,79 @@
+// NOTE: This file was originally generated via JetBrains ReSharper
+// and is part of the JetBrains.Annoations for ReSharper. 
+// It has since been modified for use in the re-motion framework development.
+//
+// Copyright (c) rubicon IT GmbH, www.rubicon.eu
+//
+// See the NOTICE file distributed with this work for additional information
+// regarding copyright ownership.  rubicon licenses this file to you under 
+// the Apache License, Version 2.0 (the "License"); you may not use this 
+// file except in compliance with the License.  You may obtain a copy of the 
+// License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software 
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT 
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the 
+// License for the specific language governing permissions and limitations
+// under the License.
+// 
+// Orignal license header by JetBrains:
+// 
+// Copyright 2007-2012 JetBrains s.r.o.
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+// http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// 
+
+using System;
+
+#pragma warning disable 1591
+// ReSharper disable UnusedMember.Global
+// ReSharper disable MemberCanBePrivate.Global
+// ReSharper disable UnusedAutoPropertyAccessor.Global
+// ReSharper disable IntroduceOptionalParameters.Global
+// ReSharper disable MemberCanBeProtected.Global
+// ReSharper disable InconsistentNaming
+// ReSharper disable once CheckNamespace
+
+namespace JetBrains.Annotations
+{
+  /// <summary>
+  /// Indicates the condition parameter of the assertion method. 
+  /// The method itself should be marked by <see cref="AssertionMethodAttribute"/> attribute.
+  /// The mandatory argument of the attribute is the assertion type.
+  /// </summary>
+  /// <seealso cref="AssertionConditionType"/>
+  [AttributeUsage (AttributeTargets.Parameter, AllowMultiple = false, Inherited = true)]
+  sealed partial class AssertionConditionAttribute : Attribute
+  {
+    private readonly AssertionConditionType myConditionType;
+
+    /// <summary>
+    /// Initializes new instance of AssertionConditionAttribute
+    /// </summary>
+    /// <param name="conditionType">Specifies condition type</param>
+    public AssertionConditionAttribute (AssertionConditionType conditionType)
+    {
+      myConditionType = conditionType;
+    }
+
+    /// <summary>
+    /// Gets condition type
+    /// </summary>
+    public AssertionConditionType ConditionType
+    {
+      get { return myConditionType; }
+    }
+  }
+}
diff --git a/...5/App_Packages/Remotion.JetBrains.Annotations.Sources.1.15.23.0/AssertionConditionType.cs b/...5/App_Packages/Remotion.JetBrains.Annotations.Sources.1.15.23.0/AssertionConditionType.cs
@@ -0,0 +1,77 @@
+// NOTE: This file was originally generated via JetBrains ReSharper
+// and is part of the JetBrains.Annoations for ReSharper. 
+// It has since been modified for use in the re-motion framework development.
+//
+// Copyright (c) rubicon IT GmbH, www.rubicon.eu
+//
+// See the NOTICE file distributed with this work for additional information
+// regarding copyright ownership.  rubicon licenses this file to you under 
+// the Apache License, Version 2.0 (the "License"); you may not use this 
+// file except in compliance with the License.  You may obtain a copy of the 
+// License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software 
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT 
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the 
+// License for the specific language governing permissions and limitations
+// under the License.
+// 
+// Orignal license header by JetBrains:
+// 
+// Copyright 2007-2012 JetBrains s.r.o.
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+// http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// 
+
+using System;
+
+#pragma warning disable 1591
+// ReSharper disable UnusedMember.Global
+// ReSharper disable MemberCanBePrivate.Global
+// ReSharper disable UnusedAutoPropertyAccessor.Global
+// ReSharper disable IntroduceOptionalParameters.Global
+// ReSharper disable MemberCanBeProtected.Global
+// ReSharper disable InconsistentNaming
+// ReSharper disable once CheckNamespace
+
+namespace JetBrains.Annotations
+{
+  /// <summary>
+  /// Specifies assertion type. If the assertion method argument satisifes the condition, then the execution continues. 
+  /// Otherwise, execution is assumed to be halted
+  /// </summary>
+  enum AssertionConditionType
+  {
+    /// <summary>
+    /// Indicates that the marked parameter should be evaluated to true
+    /// </summary>
+    IS_TRUE = 0,
+
+    /// <summary>
+    /// Indicates that the marked parameter should be evaluated to false
+    /// </summary>
+    IS_FALSE = 1,
+
+    /// <summary>
+    /// Indicates that the marked parameter should be evaluated to null value
+    /// </summary>
+    IS_NULL = 2,
+
+    /// <summary>
+    /// Indicates that the marked parameter should be evaluated to not null value
+    /// </summary>
+    IS_NOT_NULL = 3,
+  }
+}