Skip to content

Commit 7a5993d

Browse files
bgraingerbgrainger
committed
Use Central Package Management.
Use the new simplified artifact output paths.
1 parent f3767b4 commit 7a5993d

File tree

24 files changed

+129
-90
lines changed

24 files changed

+129
-90
lines changed

‎.ci/build-steps.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ steps:
3333
- task: PublishPipelineArtifact@0
3434
inputs:
3535
artifactName: 'MySqlConnector.Tests-8.0-$(Agent.OS)'
36-
targetPath: 'tests/MySqlConnector.Tests/bin/Release/net8.0/publish'
36+
targetPath: 'artifacts/publish/MySqlConnector.Tests/release_net8.0'
3737

3838
- task: DotNetCoreCLI@2
3939
displayName: 'Publish Conformance.Tests'
@@ -45,7 +45,7 @@ steps:
4545
- task: PublishPipelineArtifact@0
4646
inputs:
4747
artifactName: 'Conformance.Tests-8.0-$(Agent.OS)'
48-
targetPath: 'tests/Conformance.Tests/bin/Release/net8.0/publish'
48+
targetPath: 'artifacts/publish/Conformance.Tests/release_net8.0'
4949

5050
- task: DotNetCoreCLI@2
5151
displayName: 'Publish IntegrationTests (7.0)'
@@ -57,7 +57,7 @@ steps:
5757
- task: PublishPipelineArtifact@0
5858
inputs:
5959
artifactName: 'IntegrationTests-net8.0-$(Agent.OS)'
60-
targetPath: 'tests/IntegrationTests/bin/Release/net8.0/publish'
60+
targetPath: 'artifacts/publish/IntegrationTests/release_net8.0'
6161

6262
- task: DotNetCoreCLI@2
6363
displayName: 'Publish IntegrationTests (6.0)'
@@ -69,4 +69,4 @@ steps:
6969
- task: PublishPipelineArtifact@0
7070
inputs:
7171
artifactName: 'IntegrationTests-net6.0-$(Agent.OS)'
72-
targetPath: 'tests/IntegrationTests/bin/Release/net6.0/publish'
72+
targetPath: 'artifacts/publish/IntegrationTests/release_net6.0'

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"Data": {
33
"ConnectionString": "server=127.0.0.1;user id=ssltest;password=test;port=3306;database=mysqltest;ssl mode=required;use compression=true;DefaultCommandTimeout=3600",
4-
"SocketPath": "./../../../../../.ci/run/mysql/mysqld.sock",
4+
"SocketPath": "./../../../../.ci/run/mysql/mysqld.sock",
55
"PasswordlessUser": "no_password",
66
"SecondaryDatabase": "testdb2",
77
"UnsupportedFeatures": "RsaEncryption,CachingSha2Password,Tls12,Tls13,UuidToBin",
8-
"MySqlBulkLoaderLocalCsvFile": "../../../../TestData/LoadData_UTF8_BOM_Unix.CSV",
9-
"MySqlBulkLoaderLocalTsvFile": "../../../../TestData/LoadData_UTF8_BOM_Unix.TSV",
10-
"CertificatesPath": "../../../../../.ci/server/certs"
8+
"MySqlBulkLoaderLocalCsvFile": "../../../TestData/LoadData_UTF8_BOM_Unix.CSV",
9+
"MySqlBulkLoaderLocalTsvFile": "../../../TestData/LoadData_UTF8_BOM_Unix.TSV",
10+
"CertificatesPath": "../../../../.ci/server/certs"
1111
}
1212
}

‎.ci/config/config.compression.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"Data": {
33
"ConnectionString": "server=127.0.0.1;user id=mysqltest;password=test;port=3306;database=mysqltest;ssl mode=none;UseCompression=true;DefaultCommandTimeout=3600",
4-
"SocketPath": "./../../../../../.ci/run/mysql/mysqld.sock",
4+
"SocketPath": "./../../../../.ci/run/mysql/mysqld.sock",
55
"PasswordlessUser": "no_password",
66
"SecondaryDatabase": "testdb2",
77
"UnsupportedFeatures": "Ed25519,RsaEncryption,CachingSha2Password,QueryAttributes,Tls12,Tls13,UnixDomainSocket,UuidToBin",
8-
"MySqlBulkLoaderLocalCsvFile": "../../../../TestData/LoadData_UTF8_BOM_Unix.CSV",
9-
"MySqlBulkLoaderLocalTsvFile": "../../../../TestData/LoadData_UTF8_BOM_Unix.TSV"
8+
"MySqlBulkLoaderLocalCsvFile": "../../../../tests/TestData/LoadData_UTF8_BOM_Unix.CSV",
9+
"MySqlBulkLoaderLocalTsvFile": "../../../../tests/TestData/LoadData_UTF8_BOM_Unix.TSV"
1010
}
1111
}

‎.ci/config/config.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"Data": {
33
"ConnectionString": "server=127.0.0.1;user id=mysqltest;password=test;port=3306;database=mysqltest;ssl mode=none;DefaultCommandTimeout=3600",
4-
"SocketPath": "./../../../../../.ci/run/mysql/mysqld.sock",
4+
"SocketPath": "./../../../../.ci/run/mysql/mysqld.sock",
55
"PasswordlessUser": "no_password",
66
"SecondaryDatabase": "testdb2",
77
"UnsupportedFeatures": "Ed25519,RsaEncryption,CachingSha2Password,QueryAttributes,Tls12,Tls13,UnixDomainSocket,UuidToBin",
8-
"MySqlBulkLoaderLocalCsvFile": "../../../../TestData/LoadData_UTF8_BOM_Unix.CSV",
9-
"MySqlBulkLoaderLocalTsvFile": "../../../../TestData/LoadData_UTF8_BOM_Unix.TSV"
8+
"MySqlBulkLoaderLocalCsvFile": "../../../../tests/TestData/LoadData_UTF8_BOM_Unix.CSV",
9+
"MySqlBulkLoaderLocalTsvFile": "../../../../tests/TestData/LoadData_UTF8_BOM_Unix.TSV"
1010
}
1111
}

‎.ci/config/config.ssl.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"Data": {
33
"ConnectionString": "server=127.0.0.1;user id=ssltest;password=test;port=3306;database=mysqltest;ssl mode=required;certificate file=../../../../../.ci/server/certs/ssl-client.pfx;DefaultCommandTimeout=3600",
4-
"SocketPath": "./../../../../../.ci/run/mysql/mysqld.sock",
4+
"SocketPath": "./../../../../.ci/run/mysql/mysqld.sock",
55
"PasswordlessUser": "no_password",
66
"SecondaryDatabase": "testdb2",
77
"UnsupportedFeatures": "RsaEncryption,CachingSha2Password,Tls12,Tls13,UuidToBin",
8-
"MySqlBulkLoaderLocalCsvFile": "../../../../TestData/LoadData_UTF8_BOM_Unix.CSV",
9-
"MySqlBulkLoaderLocalTsvFile": "../../../../TestData/LoadData_UTF8_BOM_Unix.TSV",
10-
"CertificatesPath": "../../../../../.ci/server/certs"
8+
"MySqlBulkLoaderLocalCsvFile": "../../../TestData/LoadData_UTF8_BOM_Unix.CSV",
9+
"MySqlBulkLoaderLocalTsvFile": "../../../TestData/LoadData_UTF8_BOM_Unix.TSV",
10+
"CertificatesPath": "../../../../.ci/server/certs"
1111
}
1212
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"Data": {
3-
"ConnectionString": "server=./../../../../../.ci/mysqld/mysqld.sock;user id=ssltest;password=test;database=mysqltest;ssl mode=required;DefaultCommandTimeout=3600",
3+
"ConnectionString": "server=./../../../../.ci/mysqld/mysqld.sock;user id=ssltest;password=test;database=mysqltest;ssl mode=required;DefaultCommandTimeout=3600",
44
"PasswordlessUser": "no_password",
55
"SecondaryDatabase": "testdb2",
66
"UnsupportedFeatures": "None",
7-
"MySqlBulkLoaderLocalCsvFile": "../../../../TestData/LoadData_UTF8_BOM_Unix.CSV",
8-
"MySqlBulkLoaderLocalTsvFile": "../../../../TestData/LoadData_UTF8_BOM_Unix.TSV",
9-
"CertificatesPath": "../../../../../.ci/server/certs"
7+
"MySqlBulkLoaderLocalCsvFile": "../../../TestData/LoadData_UTF8_BOM_Unix.CSV",
8+
"MySqlBulkLoaderLocalTsvFile": "../../../TestData/LoadData_UTF8_BOM_Unix.TSV",
9+
"CertificatesPath": "../../../../.ci/server/certs"
1010
}
1111
}

‎.ci/config/config.uds.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"Data": {
3-
"ConnectionString": "server=./../../../../../.ci/run/mysql/mysqld.sock;user id=mysqltest;password=test;database=mysqltest;ssl mode=none;DefaultCommandTimeout=3600",
3+
"ConnectionString": "server=./../../../../.ci/run/mysql/mysqld.sock;user id=mysqltest;password=test;database=mysqltest;ssl mode=none;DefaultCommandTimeout=3600",
44
"PasswordlessUser": "no_password",
55
"SecondaryDatabase": "testdb2",
66
"UnsupportedFeatures": "None",
7-
"MySqlBulkLoaderLocalCsvFile": "../../../../TestData/LoadData_UTF8_BOM_Unix.CSV",
8-
"MySqlBulkLoaderLocalTsvFile": "../../../../TestData/LoadData_UTF8_BOM_Unix.TSV"
7+
"MySqlBulkLoaderLocalCsvFile": "../../../TestData/LoadData_UTF8_BOM_Unix.CSV",
8+
"MySqlBulkLoaderLocalTsvFile": "../../../TestData/LoadData_UTF8_BOM_Unix.TSV"
99
}
1010
}

‎.editorconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ dotnet_diagnostic.SA1500.severity = none # Braces for multi-line statements shou
110110
dotnet_diagnostic.SA1503.severity = none # Braces should not be omitted.
111111
dotnet_diagnostic.SA1513.severity = none # Closing brace should be followed by blank line.
112112
dotnet_diagnostic.SA1516.severity = none # Elements should be separated by blank line.
113+
dotnet_diagnostic.SA1519.severity = none # Braces should not be omitted from multi-line child statement
113114
dotnet_diagnostic.SA1600.severity = none # Elements should be documented.
114115
dotnet_diagnostic.SA1601.severity = none # Partial elements should be documented.
115116
dotnet_diagnostic.SA1602.severity = none # Enumeration items should be documented.

‎Directory.Build.props‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<Project>
2+
3+
<PropertyGroup>
4+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
5+
<LangVersion>preview</LangVersion>
6+
<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
7+
<NoWarn>$(NoWarn);1591;CA1708;CA1835;CA2215;CA5397;NU5105;SYSLIB0039</NoWarn>
8+
<UseArtifactsOutput>true</UseArtifactsOutput>
9+
<NuGetAudit>true</NuGetAudit>
10+
<NuGetAuditLevel>low</NuGetAuditLevel>
11+
</PropertyGroup>
12+
13+
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
14+
<RunAnalyzersDuringBuild>true</RunAnalyzersDuringBuild>
15+
</PropertyGroup>
16+
17+
<PropertyGroup Condition=" '$(GITHUB_ACTIONS)' == 'true' OR '$(APPVEYOR)' == 'True' OR '$(TF_BUILD)' == 'True' ">
18+
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
19+
<Deterministic>true</Deterministic>
20+
</PropertyGroup>
21+
22+
</Project>

‎Directory.Packages.props‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<Project>
2+
<PropertyGroup>
3+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
<CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
5+
</PropertyGroup>
6+
7+
<ItemGroup>
8+
<PackageVersion Include="AdoNet.Specification.Tests" Version="2.0.0-beta.1" />
9+
<PackageVersion Include="Dapper.StrongName" Version="2.0.143" />
10+
<PackageVersion Include="IndexRange" Version="1.0.2" />
11+
<PackageVersion Include="log4net" Version="2.0.10" />
12+
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.4" />
13+
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0" />
14+
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
15+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
16+
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
17+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
18+
<PackageVersion Include="MySql.Data" Version="8.1.0" />
19+
<PackageVersion Include="NLog" Version="4.5.0" />
20+
<PackageVersion Include="Serilog" Version="2.6.0" />
21+
<PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.507" />
22+
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="7.0.2" />
23+
<PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
24+
<PackageVersion Include="xunit" Version="2.4.2" />
25+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
26+
<PackageVersion Include="YamlDotNet" Version="13.1.1" />
27+
</ItemGroup>
28+
29+
<ItemGroup>
30+
<GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
31+
<GlobalPackageReference Include="MinVer" Version="4.3.0" />
32+
</ItemGroup>
33+
34+
</Project>

0 commit comments

Comments
 (0)