From b38dba802392740af3d1073d8883be30418e7273 Mon Sep 17 00:00:00 2001
From: "L. Ellenbeck" <ellenbeck@itc.rwth-aachen.de>
Date: Wed, 2 Oct 2019 15:18:10 +0200
Subject: [PATCH] Fix: Always build a 64 bit application coscine/issues#302
Build: Added pre_release job coscine/issues#302 Upgrade:
`Coscine.Action.1.3.0` to `Coscine.Action.1.3.1`
---
.gitlab-ci.yml | 15 +++++++++++++++
src/Project.Tests/Project.Tests.csproj | 5 +++--
src/Project.Tests/packages.config | 2 +-
src/Project/Project.csproj | 6 +++---
src/Project/packages.config | 2 +-
5 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 58b4648..1ac8b63 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,6 +6,7 @@ stages:
- build-release
- semantic-release
- release
+ - pre_release
build:
stage: build
@@ -105,3 +106,17 @@ release:
- "./Artifacts/*"
only:
- tags
+
+pre_release:
+ stage: pre_release
+ script:
+ - PowerShell .\build.ps1 -Target Build -Configuration Release
+ variables:
+ GIT_STRATEGY: clone
+ artifacts:
+ paths:
+ - "./Artifacts/*"
+ when: manual
+ except:
+ - tags
+ - master
\ No newline at end of file
diff --git a/src/Project.Tests/Project.Tests.csproj b/src/Project.Tests/Project.Tests.csproj
index d9a0666..d4fe9a0 100644
--- a/src/Project.Tests/Project.Tests.csproj
+++ b/src/Project.Tests/Project.Tests.csproj
@@ -41,6 +41,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <PlatformTarget>x64</PlatformTarget>
</PropertyGroup>
<ItemGroup>
<Reference Include="AutoMapper, Version=8.0.0.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
@@ -55,8 +56,8 @@
<Reference Include="Consul, Version=0.7.2.6, Culture=neutral, PublicKeyToken=20a6ad9a81df1d95, processorArchitecture=MSIL">
<HintPath>..\packages\Consul.0.7.2.6\lib\net45\Consul.dll</HintPath>
</Reference>
- <Reference Include="Coscine.Action, Version=1.3.0.0, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\Coscine.Action.1.3.0\lib\net461\Coscine.Action.dll</HintPath>
+ <Reference Include="Coscine.Action, Version=1.3.1.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\packages\Coscine.Action.1.3.1\lib\net461\Coscine.Action.dll</HintPath>
</Reference>
<Reference Include="Coscine.ApiCommons, Version=1.2.1.0, Culture=neutral, PublicKeyToken=af4c1345df96546b, processorArchitecture=MSIL">
<HintPath>..\packages\Coscine.ApiCommons.1.2.1\lib\net461\Coscine.ApiCommons.dll</HintPath>
diff --git a/src/Project.Tests/packages.config b/src/Project.Tests/packages.config
index 8372d0b..e9feed7 100644
--- a/src/Project.Tests/packages.config
+++ b/src/Project.Tests/packages.config
@@ -4,7 +4,7 @@
<package id="AutoMapper.Extensions.Microsoft.DependencyInjection" version="6.0.0" targetFramework="net472" />
<package id="Castle.Core" version="4.4.0" targetFramework="net472" />
<package id="Consul" version="0.7.2.6" targetFramework="net472" />
- <package id="Coscine.Action" version="1.3.0" targetFramework="net472" />
+ <package id="Coscine.Action" version="1.3.1" targetFramework="net472" />
<package id="Coscine.ApiCommons" version="1.2.1" targetFramework="net472" />
<package id="Coscine.Configuration" version="1.4.0" targetFramework="net472" />
<package id="Coscine.Database" version="1.6.0" targetFramework="net472" />
diff --git a/src/Project/Project.csproj b/src/Project/Project.csproj
index a0e9bc0..9441cf8 100644
--- a/src/Project/Project.csproj
+++ b/src/Project/Project.csproj
@@ -33,7 +33,7 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <PlatformTarget>AnyCPU</PlatformTarget>
+ <PlatformTarget>x64</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
@@ -45,8 +45,8 @@
<Reference Include="Consul, Version=0.7.2.6, Culture=neutral, PublicKeyToken=20a6ad9a81df1d95, processorArchitecture=MSIL">
<HintPath>..\packages\Consul.0.7.2.6\lib\net45\Consul.dll</HintPath>
</Reference>
- <Reference Include="Coscine.Action, Version=1.3.0.0, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\Coscine.Action.1.3.0\lib\net461\Coscine.Action.dll</HintPath>
+ <Reference Include="Coscine.Action, Version=1.3.1.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\packages\Coscine.Action.1.3.1\lib\net461\Coscine.Action.dll</HintPath>
</Reference>
<Reference Include="Coscine.ApiCommons, Version=1.2.1.0, Culture=neutral, PublicKeyToken=af4c1345df96546b, processorArchitecture=MSIL">
<HintPath>..\packages\Coscine.ApiCommons.1.2.1\lib\net461\Coscine.ApiCommons.dll</HintPath>
diff --git a/src/Project/packages.config b/src/Project/packages.config
index 4faf148..cc0c49a 100644
--- a/src/Project/packages.config
+++ b/src/Project/packages.config
@@ -3,7 +3,7 @@
<package id="AutoMapper" version="8.0.0" targetFramework="net472" />
<package id="AutoMapper.Extensions.Microsoft.DependencyInjection" version="6.0.0" targetFramework="net472" />
<package id="Consul" version="0.7.2.6" targetFramework="net472" />
- <package id="Coscine.Action" version="1.3.0" targetFramework="net472" />
+ <package id="Coscine.Action" version="1.3.1" targetFramework="net472" />
<package id="Coscine.ApiCommons" version="1.2.1" targetFramework="net472" />
<package id="Coscine.Configuration" version="1.4.0" targetFramework="net472" />
<package id="Coscine.Database" version="1.6.0" targetFramework="net472" />
--
GitLab