Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
Coscine
B
backend
apis
Project
Commits
82e21fb9
Commit
82e21fb9
authored
Oct 02, 2019
by
L. Ellenbeck
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'Hotfix/302-fixBuild' into 'master'
Hotfix/302 fix build See merge request coscine/api/project!21
parents
25b8dfbb
b38dba80
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
23 additions
and
7 deletions
+23
-7
.gitlab-ci.yml
.gitlab-ci.yml
+15
-0
src/Project.Tests/Project.Tests.csproj
src/Project.Tests/Project.Tests.csproj
+3
-2
src/Project.Tests/packages.config
src/Project.Tests/packages.config
+1
-1
src/Project/Project.csproj
src/Project/Project.csproj
+3
-3
src/Project/packages.config
src/Project/packages.config
+1
-1
No files found.
.gitlab-ci.yml
View file @
82e21fb9
...
...
@@ -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
src/Project.Tests/Project.Tests.csproj
View file @
82e21fb9
...
...
@@ -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>
...
...
src/Project.Tests/packages.config
View file @
82e21fb9
...
...
@@ -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"
/>
...
...
src/Project/Project.csproj
View file @
82e21fb9
...
...
@@ -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>
...
...
src/Project/packages.config
View file @
82e21fb9
...
...
@@ -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"
/>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment