Skip to content

Commit fa50505

Browse files
committed
Files move after DDEX and MSI cleanup.
1 parent 59b821c commit fa50505

File tree

518 files changed

+47
-60
lines changed

Some content is hidden

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

518 files changed

+47
-60
lines changed

.github/workflows/ci.yml

+13-3
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,21 @@ jobs:
1818
steps:
1919
- name: Checkout
2020
uses: actions/checkout@v2
21+
22+
- name: .NET 6.0
23+
uses: actions/setup-dotnet@v1
24+
with:
25+
dotnet-version: 6.0.x
26+
27+
- name: .NET 5.0
28+
uses: actions/setup-dotnet@v1
29+
with:
30+
dotnet-version: 5.0.x
2131

2232
- name: Build
2333
run: |
2434
try {
25-
.\Provider\build.ps1 -Configuration ${{ env.CONFIGURATION }}
35+
.\build.ps1 -Configuration ${{ env.CONFIGURATION }}
2636
exit $LASTEXITCODE
2737
}
2838
catch {
@@ -36,7 +46,7 @@ jobs:
3646
try {
3747
$env:tests_firebird_dir = 'C:\firebird'
3848
39-
.\Provider\tests.ps1 -Configuration ${{ env.CONFIGURATION }} -FirebirdSelection ${{ matrix.FIREBIRD_SELECTION }} -TestSuite ${{ matrix.TEST_SUITE }}
49+
.\tests.ps1 -Configuration ${{ env.CONFIGURATION }} -FirebirdSelection ${{ matrix.FIREBIRD_SELECTION }} -TestSuite ${{ matrix.TEST_SUITE }}
4050
exit $LASTEXITCODE
4151
}
4252
catch {
@@ -48,4 +58,4 @@ jobs:
4858
- name: Publish Artifacts
4959
uses: actions/upload-artifact@v2
5060
with:
51-
path: '.\\Provider\\out\\'
61+
path: '.\\out\\'

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
.vs
55
bin
66
obj
7-
Provider/out/
7+
out/
88
.idea

Provider/readme.txt

-36
This file was deleted.

README.md

+25-13
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

Provider/src/EntityFramework.Firebird/EntityFramework.Firebird.csproj renamed to src/EntityFramework.Firebird/EntityFramework.Firebird.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
<ItemGroup>
4242
<None Update="App.config.install.xdt" Pack="true" PackagePath="content" />
4343
<None Update="Web.config.install.xdt" Pack="true" PackagePath="content" />
44-
<None Include="..\..\..\license.txt" Pack="true" PackagePath="" />
45-
<None Include="..\..\..\firebird-logo.png" Pack="true" PackagePath="" />
44+
<None Include="..\..\license.txt" Pack="true" PackagePath="" />
45+
<None Include="..\..\firebird-logo.png" Pack="true" PackagePath="" />
4646
</ItemGroup>
4747
<ItemGroup>
4848
<PackageReference Include="EntityFramework" Version="6.4.4" />

Provider/src/FirebirdSql.Data.FirebirdClient/FirebirdSql.Data.FirebirdClient.csproj renamed to src/FirebirdSql.Data.FirebirdClient/FirebirdSql.Data.FirebirdClient.csproj

+4-3
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<Title>Firebird ADO.NET Data provider</Title>
1919
<PackageDescription>Firebird ADO.NET data provider</PackageDescription>
2020
<PackageTags>firebird;firebirsql;firebirdclient;adonet;database</PackageTags>
21+
<PackageReadmeFile>README.md</PackageReadmeFile>
2122
</PropertyGroup>
2223
<PropertyGroup Condition="'$(Configuration)'=='Release'">
2324
<DefineConstants>TRACE</DefineConstants>
@@ -32,9 +33,9 @@
3233
<EmbeddedResource Include="Schema\FbMetaData.xml" />
3334
</ItemGroup>
3435
<ItemGroup>
35-
<None Include="..\..\readme.txt" Pack="true" PackagePath="" />
36-
<None Include="..\..\..\license.txt" Pack="true" PackagePath="" />
37-
<None Include="..\..\..\firebird-logo.png" Pack="true" PackagePath="" />
36+
<None Include="..\..\README.md" Pack="true" PackagePath="" />
37+
<None Include="..\..\license.txt" Pack="true" PackagePath="" />
38+
<None Include="..\..\firebird-logo.png" Pack="true" PackagePath="" />
3839
</ItemGroup>
3940
<ItemGroup Condition="'$(TargetFramework)'=='net48'">
4041
<Reference Include="System.Transactions" />

0 commit comments

Comments
 (0)