Skip to content

Commit

Permalink
Updated configuration.
Browse files Browse the repository at this point in the history
  • Loading branch information
mahara committed Jan 25, 2024
1 parent 549bc51 commit 63ee52d
Show file tree
Hide file tree
Showing 34 changed files with 601 additions and 366 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,12 @@ jobs:
Write-Host "Project Name: $project_name"
Write-Host "Test Results Artifact Name: $test_results_artifact_name"
Write-Host "Working Directory: $working_directory"
Write-Output "project_name=$project_name" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
Write-Output "test_results_artifact_name=$test_results_artifact_name" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
Write-Output "project_name=$project_name" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8NoBOM -Append
Write-Output "test_results_artifact_name=$test_results_artifact_name" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8NoBOM -Append
# Set the Azure DevOps default working directory env variable, so our tests only need to deal with a single env variable
Write-Output "SYSTEM_DEFAULTWORKINGDIRECTORY=$working_directory" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
Write-Output "SYSTEM_DEFAULTWORKINGDIRECTORY=$working_directory" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8NoBOM -Append
# Title for LiquidTestReports.Markdown
Write-Output "title=Test Run for $project_name - ${{matrix.os}} - ${{matrix.framework}}" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
Write-Output "title=Test Run for $project_name - ${{matrix.os}} - ${{matrix.framework}}" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8NoBOM -Append
shell: pwsh

- name: Build
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@

.vs/
.idea/
artifacts/
bin/
obj/
packages/
testresults/
log/

*.suo
Expand Down
5 changes: 3 additions & 2 deletions BuildPackages.cmd
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
@ECHO OFF


@CALL "build\BuildPackages.cmd" "configuration=Release" "version=5.0.0"

SET BUILD_CONFIGURATION_FOLDER_NAME=build

SET BUILD_CONFIGURATION_FOLDER_PATH=%BUILD_CONFIGURATION_FOLDER_NAME%

@CALL "%BUILD_CONFIGURATION_FOLDER_PATH%\BuildPackages.cmd" "configuration=Release" "version=5.0.0"
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# NHibernate.ObservableCollections - Changelog

## 5.0.0 (2024-01-11)
## 5.0.0 (2024-01-24)

Initial release.

Expand Down
31 changes: 5 additions & 26 deletions CleanPackages.cmd
Original file line number Diff line number Diff line change
@@ -1,36 +1,15 @@
@ECHO OFF


SET OUTPUT_FOLDER_PATH=bin
SET TEMPORARY_OUTPUT_FOLDER_PATH=obj
SET NEV_BIN_FOLDER_PATH=tools\Explicit.NuGet.Versions\bin
SET NEV_OBJ_FOLDER_PATH=tools\Explicit.NuGet.Versions\obj
SET ARTIFACTS_FOLDER_NAME=artifacts

ECHO.
SET ARTIFACTS_FOLDER_PATH=%ARTIFACTS_FOLDER_NAME%

REM dotnet clean %1 --configuration Debug
REM dotnet clean %1 --configuration Release

IF EXIST "%OUTPUT_FOLDER_PATH%" (
ECHO Deleting "%OUTPUT_FOLDER_PATH%" folder...
IF EXIST "%ARTIFACTS_FOLDER_PATH%" (
ECHO Deleting "%ARTIFACTS_FOLDER_PATH%" folder...

RMDIR "%OUTPUT_FOLDER_PATH%" /S /Q
RMDIR "%ARTIFACTS_FOLDER_PATH%\" /S /Q
)
IF EXIST "%TEMPORARY_OUTPUT_FOLDER_PATH%" (
ECHO Deleting "%TEMPORARY_OUTPUT_FOLDER_PATH%" folder...

RMDIR "%TEMPORARY_OUTPUT_FOLDER_PATH%" /S /Q
)

IF EXIST "%NEV_BIN_FOLDER_PATH%" (
ECHO Deleting "%NEV_BIN_FOLDER_PATH%" folder...

RMDIR "%NEV_BIN_FOLDER_PATH%" /S /Q
)
IF EXIST "%NEV_OBJ_FOLDER_PATH%" (
ECHO Deleting "%NEV_OBJ_FOLDER_PATH%" folder...

RMDIR "%NEV_OBJ_FOLDER_PATH%" /S /Q
)

ECHO.
20 changes: 20 additions & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<!--
PROPERTIES
-->

<PropertyGroup>

<!--
Expand All @@ -21,4 +25,20 @@

</PropertyGroup>

<Import Project="Solution.Build.Folders.props"
Condition="Exists('Solution.Build.Folders.props')" />

<PropertyGroup>

<BuildConfigurationFolderName Condition="'$(BuildConfigurationFolderName)' == ''">build</BuildConfigurationFolderName>

<SolutionDir Condition="'$(SolutionDir)' == ''">$(MSBuildThisFileDirectory)</SolutionDir>
<WorkspaceFolderPath Condition="'$(WorkspaceFolderPath)' == ''">$(SolutionDir)</WorkspaceFolderPath>

<BuildConfigurationFolderPath Condition="'$(BuildConfigurationFolderPath)' == ''">$(WorkspaceFolderPath)$(BuildConfigurationFolderName)\</BuildConfigurationFolderPath>

</PropertyGroup>

<Import Project="$(BuildConfigurationFolderPath)Solution.Build.props" />

</Project>
7 changes: 7 additions & 0 deletions Directory.Build.targets
Original file line number Diff line number Diff line change
@@ -1,2 +1,9 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<!--
TARGETS
-->

<Import Project="$(BuildConfigurationFolderPath)Solution.Build.targets" />

</Project>
9 changes: 2 additions & 7 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!--
https://learn.microsoft.com/en-us/nuget/consume-packages/central-package-management
https://devblogs.microsoft.com/nuget/introducing-central-package-management/
Expand All @@ -7,17 +7,14 @@
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="ConfigureAwaitChecker.Analyzer" Version="5.0.0.1" />
<PackageVersion Include="coverlet.collector" Version="6.0.0" />
<PackageVersion Include="CSharpIsNullAnalyzer" Version="0.1.495" />
<PackageVersion Include="DotNetZip" Version="1.16.0" />
<PackageVersion Include="Iesi.Collections" Version="4.0.5" />
<PackageVersion Include="IndexRange" Version="1.0.3" />
<PackageVersion Include="LiquidTestReports.Markdown" Version="1.0.9" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
<PackageVersion Include="NHibernate" Version="[5.4,6.0)" />
<PackageVersion Include="Nullable" Version="1.3.1" />
<PackageVersion Include="NUnit" Version="4.0.1" />
Expand All @@ -26,8 +23,6 @@
<PackageVersion Include="NUnitLite" Version="4.0.1" />
<PackageVersion Include="NunitXml.TestLogger" Version="3.1.15" />
<PackageVersion Include="PublicApiGenerator" Version="11.1.0" />
<PackageVersion Include="Remotion.Linq" Version="2.2.0" />
<PackageVersion Include="Remotion.Linq.EagerFetching" Version="2.2.0" />
<PackageVersion Include="System.Data.SqlClient" Version="4.8.5" />
<PackageVersion Include="System.Data.SqlClient" Version="4.8.6" />
</ItemGroup>
</Project>
87 changes: 87 additions & 0 deletions NHibernate.ObservableCollections-full.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.8.34330.188
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{7E507A42-984B-470D-8A0C-648B9AF8E1DC}"
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
.gitattributes = .gitattributes
.gitignore = .gitignore
CHANGELOG.md = CHANGELOG.md
LICENSE = LICENSE
README.md = README.md
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{6E3FEE79-C382-439C-AFD9-5505D414680D}"
ProjectSection(SolutionItems) = preProject
BuildPackages.cmd = BuildPackages.cmd
CleanPackages.cmd = CleanPackages.cmd
Directory.Build.props = Directory.Build.props
Directory.Build.targets = Directory.Build.targets
Directory.Packages.props = Directory.Packages.props
nuget.config = nuget.config
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{E8456C26-3E0D-4272-9794-3041D2DC97E8}"
ProjectSection(SolutionItems) = preProject
build\AssemblyInfo.Global.cs = build\AssemblyInfo.Global.cs
build\BuildPackages.cmd = build\BuildPackages.cmd
build\Project.Build.props = build\Project.Build.props
build\Project.Build.targets = build\Project.Build.targets
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GitHub Actions", "GitHub Actions", "{7BAAD61E-1493-4B51-A458-2A8F2FDD45FE}"
ProjectSection(SolutionItems) = preProject
.github\workflows\build.yml = .github\workflows\build.yml
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{BCAA4557-7813-4A6E-AFE3-D5745C62E6BB}"
ProjectSection(SolutionItems) = preProject
src\Directory.Build.props = src\Directory.Build.props
src\Directory.Build.targets = src\Directory.Build.targets
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NHibernate.ObservableCollections", "src\NHibernate.ObservableCollections\NHibernate.ObservableCollections.csproj", "{74E68B0D-2E27-4360-8AEB-75D389533DD3}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NHibernate.ObservableCollections.Tests", "src\NHibernate.ObservableCollections.Tests\NHibernate.ObservableCollections.Tests.csproj", "{4E1305F2-75E0-4736-9A07-B2AD69C4F1A2}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NHibernate.ObservableCollections.Helpers", "src\NHibernate.ObservableCollections.Helpers\NHibernate.ObservableCollections.Helpers.csproj", "{F4BDCE2B-9911-48C9-9D5C-93CB14992966}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NHibernate.ObservableCollections.DemoApp", "src\NHibernate.ObservableCollections.DemoApp\NHibernate.ObservableCollections.DemoApp.csproj", "{E97AE325-7B6F-4C7F-AF03-643877DC8C52}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{74E68B0D-2E27-4360-8AEB-75D389533DD3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{74E68B0D-2E27-4360-8AEB-75D389533DD3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{74E68B0D-2E27-4360-8AEB-75D389533DD3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{74E68B0D-2E27-4360-8AEB-75D389533DD3}.Release|Any CPU.Build.0 = Release|Any CPU
{4E1305F2-75E0-4736-9A07-B2AD69C4F1A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4E1305F2-75E0-4736-9A07-B2AD69C4F1A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4E1305F2-75E0-4736-9A07-B2AD69C4F1A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4E1305F2-75E0-4736-9A07-B2AD69C4F1A2}.Release|Any CPU.Build.0 = Release|Any CPU
{F4BDCE2B-9911-48C9-9D5C-93CB14992966}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F4BDCE2B-9911-48C9-9D5C-93CB14992966}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F4BDCE2B-9911-48C9-9D5C-93CB14992966}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F4BDCE2B-9911-48C9-9D5C-93CB14992966}.Release|Any CPU.Build.0 = Release|Any CPU
{E97AE325-7B6F-4C7F-AF03-643877DC8C52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E97AE325-7B6F-4C7F-AF03-643877DC8C52}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E97AE325-7B6F-4C7F-AF03-643877DC8C52}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E97AE325-7B6F-4C7F-AF03-643877DC8C52}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{6E3FEE79-C382-439C-AFD9-5505D414680D} = {7E507A42-984B-470D-8A0C-648B9AF8E1DC}
{7BAAD61E-1493-4B51-A458-2A8F2FDD45FE} = {6E3FEE79-C382-439C-AFD9-5505D414680D}
{E8456C26-3E0D-4272-9794-3041D2DC97E8} = {6E3FEE79-C382-439C-AFD9-5505D414680D}
{BCAA4557-7813-4A6E-AFE3-D5745C62E6BB} = {6E3FEE79-C382-439C-AFD9-5505D414680D}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {533C1EB4-B488-47CC-AB26-AD9C1A24E5CF}
EndGlobalSection
EndGlobal
19 changes: 3 additions & 16 deletions NHibernate.ObservableCollections.sln
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.8.34330.188
Expand Down Expand Up @@ -26,9 +25,9 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{E8456C26-3E0D-4272-9794-3041D2DC97E8}"
ProjectSection(SolutionItems) = preProject
build\AssemblyInfo.Global.cs = build\AssemblyInfo.Global.cs
build\Build.props = build\Build.props
build\Build.targets = build\Build.targets
build\BuildPackages.cmd = build\BuildPackages.cmd
build\Project.Build.props = build\Project.Build.props
build\Project.Build.targets = build\Project.Build.targets
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GitHub Actions", "GitHub Actions", "{7BAAD61E-1493-4B51-A458-2A8F2FDD45FE}"
Expand All @@ -46,10 +45,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NHibernate.ObservableCollec
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NHibernate.ObservableCollections.Tests", "src\NHibernate.ObservableCollections.Tests\NHibernate.ObservableCollections.Tests.csproj", "{4E1305F2-75E0-4736-9A07-B2AD69C4F1A2}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NHibernate.ObservableCollections.Helpers", "src\NHibernate.ObservableCollections.Helpers\NHibernate.ObservableCollections.Helpers.csproj", "{F4BDCE2B-9911-48C9-9D5C-93CB14992966}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NHibernate.ObservableCollections.DemoApp", "src\NHibernate.ObservableCollections.DemoApp\NHibernate.ObservableCollections.DemoApp.csproj", "{E97AE325-7B6F-4C7F-AF03-643877DC8C52}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -64,22 +59,14 @@ Global
{4E1305F2-75E0-4736-9A07-B2AD69C4F1A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4E1305F2-75E0-4736-9A07-B2AD69C4F1A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4E1305F2-75E0-4736-9A07-B2AD69C4F1A2}.Release|Any CPU.Build.0 = Release|Any CPU
{F4BDCE2B-9911-48C9-9D5C-93CB14992966}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F4BDCE2B-9911-48C9-9D5C-93CB14992966}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F4BDCE2B-9911-48C9-9D5C-93CB14992966}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F4BDCE2B-9911-48C9-9D5C-93CB14992966}.Release|Any CPU.Build.0 = Release|Any CPU
{E97AE325-7B6F-4C7F-AF03-643877DC8C52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E97AE325-7B6F-4C7F-AF03-643877DC8C52}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E97AE325-7B6F-4C7F-AF03-643877DC8C52}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E97AE325-7B6F-4C7F-AF03-643877DC8C52}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{6E3FEE79-C382-439C-AFD9-5505D414680D} = {7E507A42-984B-470D-8A0C-648B9AF8E1DC}
{7BAAD61E-1493-4B51-A458-2A8F2FDD45FE} = {6E3FEE79-C382-439C-AFD9-5505D414680D}
{E8456C26-3E0D-4272-9794-3041D2DC97E8} = {6E3FEE79-C382-439C-AFD9-5505D414680D}
{7BAAD61E-1493-4B51-A458-2A8F2FDD45FE} = {6E3FEE79-C382-439C-AFD9-5505D414680D}
{BCAA4557-7813-4A6E-AFE3-D5745C62E6BB} = {6E3FEE79-C382-439C-AFD9-5505D414680D}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
Expand Down
17 changes: 17 additions & 0 deletions Solution.Build.Folders.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<!--
PROPERTIES
-->

<PropertyGroup>

<BuildConfigurationFolderName Condition="'$(BuildConfigurationFolderName)' == ''">build</BuildConfigurationFolderName>
<ArtifactsFolderName Condition="'$(ArtifactsFolderName)' == ''">artifacts</ArtifactsFolderName>
<OutputFolderName Condition="'$(OutputFolderName)' == ''">bin</OutputFolderName>
<IntermediateOutputFolderName Condition="'$(IntermediateOutputFolderName)' == ''">obj</IntermediateOutputFolderName>
<PackageOutputFolderName Condition="'$(PackageOutputFolderName)' == ''">packages</PackageOutputFolderName>

</PropertyGroup>

</Project>
Loading

0 comments on commit 63ee52d

Please sign in to comment.