Skip to content

Commit f75f35f

Browse files
caleblloydcaleblloyd
authored
Merge pull request #311 from caleblloyd/netstandard2.0-resolve
Resolve conflicts in netstandard2.0 branch
2 parents a5a1f62 + abc8741 commit f75f35f

34 files changed

+419
-139
lines changed

‎.ci/build.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ function DownloadWithRetry([string] $url, [string] $downloadLocation, [int] $ret
3131
$repoFolder = Join-Path $PSScriptRoot ..
3232
$env:REPO_FOLDER = $repoFolder
3333

34-
$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/rel/2.0.0-preview1.zip"
34+
$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/rel/2.0.0-preview2.zip"
3535
if ($env:KOREBUILD_ZIP)
3636
{
3737
$koreBuildZip=$env:KOREBUILD_ZIP
@@ -63,7 +63,7 @@ if (!(Test-Path $buildFolder)) {
6363

6464
$dotnetArch = 'x64'
6565
$dotnetChannel = "preview"
66-
$dotnetVersion = "2.0.0-preview1-005957"
66+
$dotnetVersion = "2.0.0-preview2-006497"
6767

6868
$dotnetLocalInstallFolder = $env:DOTNET_INSTALL_DIR
6969
if (!$dotnetLocalInstallFolder)

‎.ci/config/config.buffer.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44
"PasswordlessUser": "no_password",
55
"SecondaryDatabase": "testdb2",
66
"SupportedFeatures": "Json,StoredProcedures,Sha256Password,LargePackets",
7-
8-
"TestData": "../../../../TestData",
9-
"MySqlBulkLoaderLocalCsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.CSV",
10-
"MySqlBulkLoaderLocalTsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.TSV"
7+
"MySqlBulkLoaderLocalCsvFile": "../../../../TestData/LoadData_UTF8_BOM_Unix.CSV",
8+
"MySqlBulkLoaderLocalTsvFile": "../../../../TestData/LoadData_UTF8_BOM_Unix.TSV"
119
}
1210
}

‎.ci/config/config.compression+ssl.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,8 @@
44
"PasswordlessUser": "no_password",
55
"SecondaryDatabase": "testdb2",
66
"SupportedFeatures": "Json,StoredProcedures,Sha256Password,LargePackets",
7-
8-
"TestData": "../../../../TestData",
9-
"MySqlBulkLoaderLocalCsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.CSV",
10-
"MySqlBulkLoaderLocalTsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.TSV",
11-
7+
"MySqlBulkLoaderLocalCsvFile": "../../../../TestData/LoadData_UTF8_BOM_Unix.CSV",
8+
"MySqlBulkLoaderLocalTsvFile": "../../../../TestData/LoadData_UTF8_BOM_Unix.TSV",
129
"CertificatesPath": "../../../../../.ci/server/certs"
1310
}
1411
}

‎.ci/config/config.compression.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44
"PasswordlessUser": "no_password",
55
"SecondaryDatabase": "testdb2",
66
"SupportedFeatures": "Json,StoredProcedures,Sha256Password,LargePackets",
7-
8-
"TestData": "../../../../TestData",
9-
"MySqlBulkLoaderLocalCsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.CSV",
10-
"MySqlBulkLoaderLocalTsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.TSV"
7+
"MySqlBulkLoaderLocalCsvFile": "../../../../TestData/LoadData_UTF8_BOM_Unix.CSV",
8+
"MySqlBulkLoaderLocalTsvFile": "../../../../TestData/LoadData_UTF8_BOM_Unix.TSV"
119
}
1210
}

‎.ci/config/config.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44
"PasswordlessUser": "no_password",
55
"SecondaryDatabase": "testdb2",
66
"SupportedFeatures": "Json,StoredProcedures,Sha256Password,LargePackets",
7-
8-
"TestData": "../../../../TestData",
9-
"MySqlBulkLoaderLocalCsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.CSV",
10-
"MySqlBulkLoaderLocalTsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.TSV"
7+
"MySqlBulkLoaderLocalCsvFile": "../../../../TestData/LoadData_UTF8_BOM_Unix.CSV",
8+
"MySqlBulkLoaderLocalTsvFile": "../../../../TestData/LoadData_UTF8_BOM_Unix.TSV"
119
}
1210
}

‎.ci/config/config.ssl.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,8 @@
44
"PasswordlessUser": "no_password",
55
"SecondaryDatabase": "testdb2",
66
"SupportedFeatures": "Json,StoredProcedures,Sha256Password,LargePackets",
7-
8-
"TestData": "../../../../TestData",
9-
"MySqlBulkLoaderLocalCsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.CSV",
10-
"MySqlBulkLoaderLocalTsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.TSV",
11-
7+
"MySqlBulkLoaderLocalCsvFile": "../../../../TestData/LoadData_UTF8_BOM_Unix.CSV",
8+
"MySqlBulkLoaderLocalTsvFile": "../../../../TestData/LoadData_UTF8_BOM_Unix.TSV",
129
"CertificatesPath": "../../../../../.ci/server/certs"
1310
}
1411
}

‎.ci/config/config.uds+ssl.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,8 @@
44
"PasswordlessUser": "no_password",
55
"SecondaryDatabase": "testdb2",
66
"SupportedFeatures": "Json,StoredProcedures,Sha256Password,LargePackets",
7-
8-
"TestData": "../../../../TestData",
9-
"MySqlBulkLoaderLocalCsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.CSV",
10-
"MySqlBulkLoaderLocalTsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.TSV",
11-
7+
"MySqlBulkLoaderLocalCsvFile": "../../../../TestData/LoadData_UTF8_BOM_Unix.CSV",
8+
"MySqlBulkLoaderLocalTsvFile": "../../../../TestData/LoadData_UTF8_BOM_Unix.TSV",
129
"CertificatesPath": "../../../../../.ci/server/certs"
1310
}
1411
}

‎.ci/config/config.uds.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44
"PasswordlessUser": "no_password",
55
"SecondaryDatabase": "testdb2",
66
"SupportedFeatures": "Json,StoredProcedures,Sha256Password,LargePackets",
7-
8-
"TestData": "../../../../TestData",
9-
"MySqlBulkLoaderLocalCsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.CSV",
10-
"MySqlBulkLoaderLocalTsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.TSV"
7+
"MySqlBulkLoaderLocalCsvFile": "../../../../TestData/LoadData_UTF8_BOM_Unix.CSV",
8+
"MySqlBulkLoaderLocalTsvFile": "../../../../TestData/LoadData_UTF8_BOM_Unix.TSV"
119
}
1210
}

‎.ci/test.ps1

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,3 @@ dotnet test tests\SideBySide\SideBySide.csproj -c Baseline
4949
if ($LASTEXITCODE -ne 0){
5050
exit $LASTEXITCODE;
5151
}
52-
53-
echo "Building Benchmark"
54-
55-
dotnet restore tests\Benchmark\Benchmark.csproj
56-
dotnet run -p tests\Benchmark\Benchmark.csproj -c Release -f net462
57-
if ($LASTEXITCODE -ne 0){
58-
exit $LASTEXITCODE;
59-
}

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ before_install:
2121
- sudo sh -c 'echo "deb [arch=amd64] https://apt-mo.trafficmanager.net/repos/dotnet-release/ trusty main" > /etc/apt/sources.list.d/dotnetdev.list'
2222
- sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 417A0893
2323
- sudo apt-get update
24-
- sudo apt-get install -y dotnet-dev-2.0.0-preview1-005977 dotnet-sharedframework-microsoft.netcore.app-1.1.2
24+
- sudo apt-get install -y dotnet-sdk-2.0.0-preview2-006497 dotnet-sharedframework-microsoft.netcore.app-1.1.2
2525

2626
script:
2727
- dotnet restore

0 commit comments

Comments
 (0)