Skip to content

Commit aca36a2

Browse files
rojiroji
committed
Merge branch 'dev'
2 parents 44154a1 + f520c31 commit aca36a2

132 files changed

Lines changed: 2140 additions & 2569 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.teamcity/NpgsqlEntityFrameworkCorePostgreSQL/buildTypes/NpgsqlEntityFrameworkCorePostgreSQL_Build.xml‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<build-type xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" uuid="f579f33b-8663-4da8-ac92-c95c2362e10f" xsi:noNamespaceSchemaLocation="http://www.jetbrains.com/teamcity/schemas/9.0/project-config.xsd">
3+
<name>Build</name>
4+
<description />
5+
<settings>
6+
<options>
7+
<option name="artifactRules" value="src\Npgsql.EntityFrameworkCore.PostgreSQL\bin\Release\*.nupkg&#xA;src\Npgsql.EntityFrameworkCore.PostgreSQL.Design\bin\Release\*.nupkg" />
8+
<option name="checkoutMode" value="ON_AGENT" />
9+
</options>
10+
<parameters>
11+
<param name="env.Test__Npgsql__DefaultConnection" value="Server=localhost;Port=5495;Username=npgsql_tests;Password=npgsql_tests" />
12+
</parameters>
13+
<build-runners>
14+
<runner id="RUNNER_19" name="Set build number" type="simpleRunner">
15+
<parameters>
16+
<param name="command.executable" value="teamcity_set_version.cmd" />
17+
<param name="command.parameters" value="%build.counter%" />
18+
<param name="teamcity.step.mode" value="default" />
19+
</parameters>
20+
</runner>
21+
<runner id="RUNNER_25" name="Build Debug" type="simpleRunner">
22+
<parameters>
23+
<param name="script.content"><![CDATA[set KOREBUILD_DOTNET_PACK_OPTIONS=--version-suffix "%build.counter%"
24+
set Configuration=Debug
25+
build compile]]></param>
26+
<param name="teamcity.step.mode" value="default" />
27+
<param name="use.custom.script" value="true" />
28+
</parameters>
29+
</runner>
30+
<runner id="RUNNER_26" name="Test" type="simpleRunner">
31+
<parameters>
32+
<param name="command.executable" value="build.cmd" />
33+
<param name="command.parameters" value="test" />
34+
<param name="teamcity.step.mode" value="default" />
35+
</parameters>
36+
</runner>
37+
<runner id="RUNNER_27" name="Build Release" type="simpleRunner">
38+
<parameters>
39+
<param name="script.content"><![CDATA[set KOREBUILD_DOTNET_PACK_OPTIONS=--version-suffix "%build.counter%"
40+
set Configuration=Release
41+
build compile]]></param>
42+
<param name="teamcity.step.mode" value="default" />
43+
<param name="use.custom.script" value="true" />
44+
</parameters>
45+
</runner>
46+
<runner id="RUNNER_28" name="Publish nugets to myget" type="jb.nuget.publish">
47+
<parameters>
48+
<param name="nuget.path" value="?NuGet.CommandLine.DEFAULT" />
49+
<param name="nuget.publish.files"><![CDATA[src/Npgsql.EntityFrameworkCore.PostgreSQL/bin/Release/*.nupkg
50+
src/Npgsql.EntityFrameworkCore.PostgreSQL.Design/bin/Release/*.nupkg]]></param>
51+
<param name="nuget.publish.source" value="https://www.myget.org/F/npgsql-unstable" />
52+
<param name="nugetCustomPath" value="?NuGet.CommandLine.DEFAULT" />
53+
<param name="nugetPathSelector" value="?NuGet.CommandLine.DEFAULT" />
54+
<param name="secure:nuget.api.key" value="zxxca89988ce5b6f9ad529c572cd56e162ccda4fdff046b0cdb8bff3560c8e35dcbda3e64637e4ca2f1" />
55+
<param name="teamcity.step.mode" value="default" />
56+
</parameters>
57+
</runner>
58+
</build-runners>
59+
<vcs-settings>
60+
<vcs-entry-ref root-id="NpgsqlEntityFrameworkCorePostgreSQL_Github" />
61+
</vcs-settings>
62+
<requirements />
63+
<build-triggers>
64+
<build-trigger id="vcsTrigger" type="vcsTrigger">
65+
<parameters>
66+
<param name="branchFilter" value="+:*" />
67+
<param name="quietPeriodMode" value="DO_NOT_USE" />
68+
</parameters>
69+
</build-trigger>
70+
</build-triggers>
71+
<cleanup />
72+
</settings>
73+
</build-type>
74+

‎.teamcity/NpgsqlEntityFrameworkCorePostgreSQL/pluginData/plugin-settings.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<settings>
3+
<versionedSettings rootId="NpgsqlEntityFrameworkCorePostgreSQL_Github" enabled="true" showChanges="false" buildSettings="PREFER_VCS" />
4+
</settings>
5+

‎.teamcity/NpgsqlEntityFrameworkCorePostgreSQL/project-config.xml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" uuid="ba94274f-bb0e-4ed9-851e-90e4a25cd698" xsi:noNamespaceSchemaLocation="http://www.jetbrains.com/teamcity/schemas/9.0/project-config.xsd">
3+
<name>Npgsql.EntityFrameworkCore.PostgreSQL</name>
4+
<description>Entity Framework Core for PostgreSQL</description>
5+
<parameters>
6+
<param name="env.Test__Npgsql__DefaultConnection" value="Server=localhost;Port=5495;Username=npgsql_tests;Password=npgsql_tests;PersistSecurityInfo=true" />
7+
<param name="GitVersion.NuGetVersion" value="" />
8+
</parameters>
9+
<cleanup />
10+
</project>
11+

‎.teamcity/NpgsqlEntityFrameworkCorePostgreSQL/vcsRoots/NpgsqlEntityFrameworkCorePostgreSQL_Github.xml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<vcs-root xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" uuid="efb1b201-49da-44ec-962d-16fa17997599" type="jetbrains.git" xsi:noNamespaceSchemaLocation="http://www.jetbrains.com/teamcity/schemas/9.0/project-config.xsd">
3+
<name>Github</name>
4+
<param name="agentCleanFilesPolicy" value="ALL_UNTRACKED" />
5+
<param name="agentCleanPolicy" value="ALWAYS" />
6+
<param name="authMethod" value="PASSWORD" />
7+
<param name="branch" value="dev" />
8+
<param name="ignoreKnownHosts" value="true" />
9+
<param name="secure:password" value="zxx9b1a45147d7e64e7775d03cbe80d301b" />
10+
<param name="submoduleCheckout" value="CHECKOUT" />
11+
<param name="teamcity:branchSpec"><![CDATA[+:refs/heads/(*)
12+
# The following activates building PRs
13+
+:refs/pull/*/merge]]></param>
14+
<param name="url" value="https://github.com/npgsql/Npgsql.EntityFrameworkCore.PostgreSQL.git" />
15+
<param name="useAlternates" value="true" />
16+
<param name="username" value="npgsql-teamcity" />
17+
<param name="usernameStyle" value="USERID" />
18+
</vcs-root>
19+

‎GitVersionConfig.yaml‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎bump.sh‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
#!/bin/bash
2+
3+
if [ "$#" -ne 1 ]; then
4+
echo "usage: bump.sh <version>"
5+
exit 1
6+
fi
7+
8+
v=$1
9+
if [[ $v == *"-" ]]; then
10+
echo "Version must not end with -"
11+
exit 1
12+
fi
13+
14+
echo "echo ##teamcity[buildNumber '$v-%1']" > teamcity_set_version.cmd
15+
16+
if [[ $v == *"-"* ]]; then
17+
# Prerelease version
18+
19+
without_prerelease=`echo $v | cut -d- -f1`
20+
21+
sed -i 's/^\(\s*\)"version": "[^"]*"/\1"version": "'$v'-*"/' src/Npgsql.EntityFrameworkCore.PostgreSQL/project.json
22+
sed -i 's/^\(\s*\)"version": "[^"]*"/\1"version": "'$v'-*"/' src/Npgsql.EntityFrameworkCore.PostgreSQL.Design/project.json
23+
24+
sed -i 's/AssemblyVersion("[^"]*")/AssemblyVersion("'$without_prerelease'")/' src/Shared/CommonAssemblyInfo.cs
25+
sed -i 's/AssemblyFileVersion("[^"]*")/AssemblyFileVersion("'$without_prerelease'")/' src/Shared/CommonAssemblyInfo.cs
26+
sed -i 's/AssemblyInformationalVersion("[^"]*")/AssemblyInformationalVersion("'$v'")/' src/Shared/CommonAssemblyInfo.cs
27+
else
28+
# Release version
29+
30+
sed -i 's/^\(\s*\)"version": "[^"]*"/\1"version": "'$v'"/' src/Npgsql.EntityFrameworkCore.PostgreSQL/project.json
31+
sed -i 's/^\(\s*\)"version": "[^"]*"/\1"version": "'$v'"/' src/Npgsql.EntityFrameworkCore.PostgreSQL.Design/project.json
32+
33+
sed -i 's/AssemblyVersion("[^"]*")/AssemblyVersion("'$v'")/' src/Shared/CommonAssemblyInfo.cs
34+
sed -i 's/AssemblyFileVersion("[^"]*")/AssemblyFileVersion("'$v'")/' src/Shared/CommonAssemblyInfo.cs
35+
sed -i 's/AssemblyInformationalVersion("[^"]*")/AssemblyInformationalVersion("'$v'")/' src/Shared/CommonAssemblyInfo.cs
36+
fi
37+
38+
git add teamcity_set_version.cmd
39+
git add src/Npgsql.EntityFrameworkCore.PostgreSQL/project.json
40+
git add src/Npgsql.EntityFrameworkCore.PostgreSQL.Design/project.json
41+
git add src/Shared/CommonAssemblyInfo.cs
42+
43+
git commit -m "Bump version to $v"

‎src/Npgsql.EntityFrameworkCore.PostgreSQL.Design/Npgsql.EntityFrameworkCore.PostgreSQL.Design.csproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@
1313
<AssemblyName>Npgsql.EntityFrameworkCore.PostgreSQL.Design</AssemblyName>
1414
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
1515
<FileAlignment>512</FileAlignment>
16-
<!-- The following stops VS from complaining about runtimes in project.json, see
17-
https://github.com/Microsoft/msbuild/issues/394 -->
18-
<CopyNuGetImplementations>false</CopyNuGetImplementations>
1916
</PropertyGroup>
2017
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2118
<DebugSymbols>true</DebugSymbols>

‎src/Npgsql.EntityFrameworkCore.PostgreSQL.Design/Npgsql.EntityFrameworkCore.PostgreSQL.Design.project.json‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"dependencies" : {
3+
"Microsoft.EntityFrameworkCore": "1.0.0",
4+
"Microsoft.EntityFrameworkCore.Relational": "1.0.0",
5+
"Microsoft.EntityFrameworkCore.Relational.Design": "1.0.0",
6+
"Microsoft.Extensions.DependencyInjection": "1.0.0",
7+
"Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0",
8+
"Npgsql": "3.1.5"
9+
},
10+
"frameworks": {
11+
"net451": {}
12+
},
13+
"runtimes": {
14+
"win": {}
15+
}
16+
}

‎src/Npgsql.EntityFrameworkCore.PostgreSQL.Design/NpgsqlDesignTimeServices.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
using Microsoft.EntityFrameworkCore.Storage.Internal;
2828
using Microsoft.Extensions.DependencyInjection;
2929

30-
namespace Microsoft.EntityFrameworkCore.Scaffolding
30+
namespace Microsoft.EntityFrameworkCore.Scaffolding.Internal
3131
{
3232
public class NpgsqlDesignTimeServices
3333
{

‎src/Npgsql.EntityFrameworkCore.PostgreSQL.Design/NpgsqlScaffoldingModelFactory.cs‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,31 +22,28 @@
2222
#endregion
2323

2424
using System;
25-
using System.Collections.Generic;
2625
using System.Linq;
2726
using JetBrains.Annotations;
28-
using Microsoft.EntityFrameworkCore;
29-
using Microsoft.EntityFrameworkCore.Internal;
3027
using Microsoft.EntityFrameworkCore.Metadata;
3128
using Microsoft.EntityFrameworkCore.Metadata.Builders;
32-
using Microsoft.EntityFrameworkCore.Metadata.Internal;
3329
using Microsoft.EntityFrameworkCore.Scaffolding.Metadata;
3430
using Microsoft.EntityFrameworkCore.Storage;
3531
using Microsoft.Extensions.Logging;
3632

37-
namespace Microsoft.EntityFrameworkCore.Scaffolding
33+
namespace Microsoft.EntityFrameworkCore.Scaffolding.Internal
3834
{
3935
public class NpgsqlScaffoldingModelFactory : RelationalScaffoldingModelFactory
4036
{
4137
public NpgsqlScaffoldingModelFactory(
4238
[NotNull] ILoggerFactory loggerFactory,
4339
[NotNull] IRelationalTypeMapper typeMapper,
44-
[NotNull] IDatabaseModelFactory databaseModelFactory)
45-
: base(loggerFactory, typeMapper, databaseModelFactory)
40+
[NotNull] IDatabaseModelFactory databaseModelFactory,
41+
[NotNull] CandidateNamingService candidateNamingService)
42+
: base(loggerFactory, typeMapper, databaseModelFactory, candidateNamingService)
4643
{
4744
}
4845

49-
public override IModel Create(string connectionString, TableSelectionSet tableSelectionSet)
46+
public override IModel Create(string connectionString, [CanBeNull] TableSelectionSet tableSelectionSet)
5047
{
5148
var model = base.Create(connectionString, tableSelectionSet);
5249
model.Scaffolding().UseProviderMethodName = nameof(NpgsqlDbContextOptionsExtensions.UseNpgsql);

0 commit comments

Comments
 (0)