Merge branch 'feature/RMLNQ-131-Update-BuildScript' into develop

re-motion · Oct 19, 2020 · 79a4d44 · 79a4d44
2 parents 4a41e37 + e9077cd
commit 79a4d44
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/.nuget/packages.config b/.nuget/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="DependDB.BuildProcessor" version="1.7.3.0" />
-  <package id="DependDB.BuildProcessor.NuGetPreProcessor" version="1.7.3.0" />
+  <package id="DependDB.BuildProcessor" version="1.8.1" />
+  <package id="DependDB.BuildProcessor.NuGetPreProcessor" version="1.8.1" />
   <package id="MSBuild.Extension.Pack" version="1.5.0" />
   <package id="NuGet.CommandLine" version="2.8.6" />
   <package id="NuGet.for.MSBuild" version="1.4.3" targetFramework="net45" />

diff --git a/Build/Build.csproj b/Build/Build.csproj
@@ -32,7 +32,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Remotion.BuildScript, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Remotion.BuildScript.2.0.0-alpha017\lib\net45\Remotion.BuildScript.dll</HintPath>
+      <HintPath>..\packages\Remotion.BuildScript.2.0.0-alpha018\lib\net45\Remotion.BuildScript.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Remotion.ReleaseProcessScript, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">

diff --git a/Build/Remotion.build b/Build/Remotion.build
@@ -23,14 +23,14 @@
     <PackagesDirectory Condition="'$(PackagesDirectory)' == ''">$(MSBuildProjectDirectory)\..\packages\</PackagesDirectory>
     <MSBuildExtensionPackPath Condition="'$(MSBuildExtensionPackPath)' == ''">$(PackagesDirectory)MSBuild.Extension.Pack.1.5.0\tools\net40\</MSBuildExtensionPackPath>
     <ExtensionTasksPath>$(MSBuildExtensionPackPath)</ExtensionTasksPath>
-    <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>
+    <DependDBBuildProcessorToolPath Condition="'$(NuGetToolPath)' == ''">$(PackagesDirectory)DependDB.BuildProcessor.1.8.1\tools\</DependDBBuildProcessorToolPath>
+    <DependDBNuGetPreProcessorToolPath Condition="'$(NuGetToolPath)' == ''">$(PackagesDirectory)DependDB.BuildProcessor.NuGetPreProcessor.1.8.1\tools\</DependDBNuGetPreProcessorToolPath>
     <NUnitToolPath Condition="'$(NUnitToolPath)' == ''">$(PackagesDirectory)NUnit.Runners.2.6.3\tools\</NUnitToolPath>
     <!-- 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>
+    <RemotionBuildScriptPath Condition="'$(RemotionBuildScriptPath)' == ''">$(PackagesDirectory)Remotion.BuildScript.2.0.0-alpha018\BuildTargets\</RemotionBuildScriptPath>
   </PropertyGroup>
 
   <Import Project="$(RemotionBuildScriptPath)*.targets" />

diff --git a/Build/packages.config b/Build/packages.config
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="DependDB.BuildProcessor" version="1.7.3.0" targetFramework="net45" developmentDependency="true" />
-  <package id="DependDB.BuildProcessor.NuGetPreProcessor" version="1.7.3.0" targetFramework="net45" developmentDependency="true" />
+  <package id="DependDB.BuildProcessor" version="1.8.1" targetFramework="net45" developmentDependency="true" />
+  <package id="DependDB.BuildProcessor.NuGetPreProcessor" version="1.8.1" targetFramework="net45" developmentDependency="true" />
   <package id="MSBuild.Extension.Pack" version="1.5.0" targetFramework="net45" developmentDependency="true" />
   <package id="NuGet.CommandLine" version="2.8.6" targetFramework="net45" developmentDependency="true" />
   <package id="NuGet.for.MSBuild" version="1.4.3" targetFramework="net45" developmentDependency="true" />
   <package id="NUnit.Runners" version="2.6.3" targetFramework="net45" developmentDependency="true" />
-  <package id="Remotion.BuildScript" version="2.0.0-alpha017" targetFramework="net45" developmentDependency="true" />
+  <package id="Remotion.BuildScript" version="2.0.0-alpha018" targetFramework="net45" developmentDependency="true" />
   <package id="Remotion.BuildTools.MSBuildTasks" version="1.0.6180.28602" targetFramework="net45" developmentDependency="true" />
   <package id="Remotion.ReleaseProcessScript" version="2.0.0-alpha017" targetFramework="net45" developmentDependency="true" />
 </packages>