diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml index 9862c06..b83d195 100644 --- a/.github/workflows/dotnetcore.yml +++ b/.github/workflows/dotnetcore.yml @@ -57,7 +57,7 @@ jobs: uses: actions/upload-artifact@v1.0.0 with: name: 'artifactory' - path: ./Analogy.Interfaces/bin/${{ matrix.configuration }} + path: ./ push-nuget: name: 'Push NuGet Packages' needs: build @@ -86,7 +86,6 @@ jobs: Get-ChildItem .\artifactory -Filter *.nupkg | Where-Object { !$_.Name.Contains('preview') } | ForEach-Object { nuget push $_ -Source "GPR" -SkipDuplicate } - concurrency: group: ${{ github.ref }} cancel-in-progress: true diff --git a/Analogy.Interfaces.UnitTests/Analogy.Interfaces.UnitTests.csproj b/Analogy.Interfaces.UnitTests/Analogy.Interfaces.UnitTests.csproj index 8b835c7..612e741 100644 --- a/Analogy.Interfaces.UnitTests/Analogy.Interfaces.UnitTests.csproj +++ b/Analogy.Interfaces.UnitTests/Analogy.Interfaces.UnitTests.csproj @@ -6,9 +6,9 @@ - - - + + + diff --git a/Analogy.Interfaces.sln b/Analogy.Interfaces.sln index b04f3b1..232dc0b 100644 --- a/Analogy.Interfaces.sln +++ b/Analogy.Interfaces.sln @@ -13,6 +13,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution .github\workflows\dotnetcore.yml = .github\workflows\dotnetcore.yml EndProjectSection EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Analogy.Interfaces.DataTypes", "Analogy.Types\Analogy.Interfaces.DataTypes.csproj", "{FC81D555-312D-41A9-A2A7-AE09AD9F050D}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -37,6 +39,14 @@ Global {4758E0A3-49E4-416A-A79F-AA55DE144F43}.Release|Any CPU.Build.0 = Release|Any CPU {4758E0A3-49E4-416A-A79F-AA55DE144F43}.Release|x86.ActiveCfg = Release|Any CPU {4758E0A3-49E4-416A-A79F-AA55DE144F43}.Release|x86.Build.0 = Release|Any CPU + {FC81D555-312D-41A9-A2A7-AE09AD9F050D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FC81D555-312D-41A9-A2A7-AE09AD9F050D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FC81D555-312D-41A9-A2A7-AE09AD9F050D}.Debug|x86.ActiveCfg = Debug|Any CPU + {FC81D555-312D-41A9-A2A7-AE09AD9F050D}.Debug|x86.Build.0 = Debug|Any CPU + {FC81D555-312D-41A9-A2A7-AE09AD9F050D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FC81D555-312D-41A9-A2A7-AE09AD9F050D}.Release|Any CPU.Build.0 = Release|Any CPU + {FC81D555-312D-41A9-A2A7-AE09AD9F050D}.Release|x86.ActiveCfg = Release|Any CPU + {FC81D555-312D-41A9-A2A7-AE09AD9F050D}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Analogy.Interfaces/Analogy.Interfaces.csproj b/Analogy.Interfaces/Analogy.Interfaces.csproj index 1905f26..2e3446d 100644 --- a/Analogy.Interfaces/Analogy.Interfaces.csproj +++ b/Analogy.Interfaces/Analogy.Interfaces.csproj @@ -1,7 +1,8 @@  - net8.0-windows;net7.0-windows;net6.0-windows;net48;net471 + net8.0-windows;net6.0-windows;net48 + true Interfaces assembly for creating custom data providers for Analogy Log Viewer https://github.com/Analogy-LogViewer/Analogy.Interfaces @@ -27,4 +28,7 @@ + + + \ No newline at end of file diff --git a/Analogy.Types/Analogy.Interfaces.DataTypes.csproj b/Analogy.Types/Analogy.Interfaces.DataTypes.csproj new file mode 100644 index 0000000..d318a6b --- /dev/null +++ b/Analogy.Types/Analogy.Interfaces.DataTypes.csproj @@ -0,0 +1,28 @@ + + + + net8.0;net6.0;net48 + enable + enable + Data Types assembly for creating custom data providers for Analogy Log Viewer + + https://github.com/Analogy-LogViewer/Analogy.Interfaces + Analogy.Interfaces.DataTypes + Analogy.Interfaces.DataTypes + Analogy.Interfaces.DataTypes + 1.0.0.0 + 1 + Lior Banai + Analogy.Interfaces.DataTypes + Lior Banai @ 2024 + icon.png + https://github.com/Analogy-LogViewer/Analogy.Interfaces + Analogy.LogViewer + + + + True + + + + diff --git a/Analogy.Interfaces/DataTypes/AnalogyColumnFilter.cs b/Analogy.Types/AnalogyColumnFilter.cs similarity index 100% rename from Analogy.Interfaces/DataTypes/AnalogyColumnFilter.cs rename to Analogy.Types/AnalogyColumnFilter.cs diff --git a/Analogy.Interfaces/DataTypes/AnalogyColumnInfo.cs b/Analogy.Types/AnalogyColumnInfo.cs similarity index 100% rename from Analogy.Interfaces/DataTypes/AnalogyColumnInfo.cs rename to Analogy.Types/AnalogyColumnInfo.cs diff --git a/Analogy.Interfaces/DataTypes/AnalogyFileReadProgress.cs b/Analogy.Types/AnalogyFileReadProgress.cs similarity index 100% rename from Analogy.Interfaces/DataTypes/AnalogyFileReadProgress.cs rename to Analogy.Types/AnalogyFileReadProgress.cs diff --git a/Analogy.Interfaces/DataTypes/AnalogyLogMessage.cs b/Analogy.Types/AnalogyLogMessage.cs similarity index 100% rename from Analogy.Interfaces/DataTypes/AnalogyLogMessage.cs rename to Analogy.Types/AnalogyLogMessage.cs diff --git a/Analogy.Interfaces/DataTypes/AnalogyLogMessageUpdaterEventData.cs b/Analogy.Types/AnalogyLogMessageUpdaterEventData.cs similarity index 100% rename from Analogy.Interfaces/DataTypes/AnalogyLogMessageUpdaterEventData.cs rename to Analogy.Types/AnalogyLogMessageUpdaterEventData.cs diff --git a/Analogy.Interfaces/DataTypes/AnalogyPlottingPointData.cs b/Analogy.Types/AnalogyPlottingPointData.cs similarity index 100% rename from Analogy.Interfaces/DataTypes/AnalogyPlottingPointData.cs rename to Analogy.Types/AnalogyPlottingPointData.cs diff --git a/Analogy.Interfaces/DataTypes/AnalogyProgressReport.cs b/Analogy.Types/AnalogyProgressReport.cs similarity index 100% rename from Analogy.Interfaces/DataTypes/AnalogyProgressReport.cs rename to Analogy.Types/AnalogyProgressReport.cs diff --git a/Analogy.Interfaces/DataTypes/Enums.cs b/Analogy.Types/Enums.cs similarity index 100% rename from Analogy.Interfaces/DataTypes/Enums.cs rename to Analogy.Types/Enums.cs diff --git a/Analogy.Interfaces/DataTypes/EventArgs.cs b/Analogy.Types/EventArgs.cs similarity index 100% rename from Analogy.Interfaces/DataTypes/EventArgs.cs rename to Analogy.Types/EventArgs.cs diff --git a/Analogy.Interfaces/DataTypes/FilterCriteria.cs b/Analogy.Types/FilterCriteria.cs similarity index 100% rename from Analogy.Interfaces/DataTypes/FilterCriteria.cs rename to Analogy.Types/FilterCriteria.cs diff --git a/Analogy.Interfaces/IAnalogyLogMessage.cs b/Analogy.Types/IAnalogyLogMessage.cs similarity index 100% rename from Analogy.Interfaces/IAnalogyLogMessage.cs rename to Analogy.Types/IAnalogyLogMessage.cs diff --git a/Analogy.Interfaces/ILogParserSettings.cs b/Analogy.Types/ILogParserSettings.cs similarity index 100% rename from Analogy.Interfaces/ILogParserSettings.cs rename to Analogy.Types/ILogParserSettings.cs diff --git a/Analogy.Interfaces/DataTypes/LogParserSettings.cs b/Analogy.Types/LogParserSettings.cs similarity index 100% rename from Analogy.Interfaces/DataTypes/LogParserSettings.cs rename to Analogy.Types/LogParserSettings.cs diff --git a/Analogy.Interfaces/DataTypes/SplitterLogParserSettings.cs b/Analogy.Types/SplitterLogParserSettings.cs similarity index 100% rename from Analogy.Interfaces/DataTypes/SplitterLogParserSettings.cs rename to Analogy.Types/SplitterLogParserSettings.cs diff --git a/Directory.Build.props b/Directory.Build.props index 9181461..6c39891 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,6 +1,5 @@ - true true True snupkg @@ -31,11 +30,11 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -53,7 +52,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive