Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[feature] Change versioning format #198

Merged
merged 9 commits into from
Oct 16, 2023
Merged

[feature] Change versioning format #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
567f789
[feature] Change versioning format
jmmorato Oct 13, 2023
43a5846
Update NuGet version
jmmorato Oct 13, 2023
2100c1f
Update gitversion configuration
jmmorato Oct 13, 2023
23781a8
Changed to continuous deployment
jmmorato Oct 15, 2023
3b71787
Removed MONO_THREADS_SUSPEND preemptive
jmmorato Oct 15, 2023
427187e
Change macos platform
jmmorato Oct 15, 2023
58647ab
Try
jmmorato Oct 15, 2023
4dd02b6
Fixed runner name
jmmorato Oct 15, 2023
5a9720d
Back to x64
jmmorato Oct 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions .github/workflows/ci_standard.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
- name: Setup dotnet 7.0
uses: actions/setup-dotnet@v3
with:
dotnet-version: '7.0.401'
dotnet-version: '7.0.402'

# - name: Setup dotnet 6.0
# shell: pwsh
Expand Down Expand Up @@ -132,7 +132,7 @@ jobs:
- name: Setup dotnet 7.0
uses: actions/setup-dotnet@v3
with:
dotnet-version: '7.0.401'
dotnet-version: '7.0.402'

- name: Cache OpenDDS libraries
id: opendds-libraries-linux
Expand Down Expand Up @@ -204,17 +204,15 @@ jobs:
ACE_ROOT: "${{ github.workspace }}/ext/OpenDDS_Linux/ACE_wrappers"
TAO_ROOT: "${{ github.workspace }}/ext/OpenDDS_Linux/ACE_wrappers/TAO"


- name: Test OpenDDSharp
shell: bash
run: dotnet test ${{ github.workspace }}/Tests/OpenDDSharp.UnitTest/OpenDDSharp.UnitTest.csproj --no-build --no-restore --verbosity detailed --configuration ${{ env.BuildConfiguration }} --runtime linux-x64 --collect "XPlat code coverage" --logger "trx;LogFileName=test-results.trx" --logger "console;verbosity=detailed""console;verbosity=detailed" --settings ${{ github.workspace }}/Tests.runsettings --test-adapter-path "${{ github.workspace }}/packages/coverlet.collector/6.0.0/build/netstandard1.0/"
run: dotnet test ${{ github.workspace }}/Tests/OpenDDSharp.UnitTest/OpenDDSharp.UnitTest.csproj --blame-crash --no-build --no-restore --verbosity detailed --configuration ${{ env.BuildConfiguration }} --runtime linux-x64 --collect "XPlat code coverage" --logger "trx;LogFileName=test-results.trx" --logger "console;verbosity=detailed""console;verbosity=detailed" --settings ${{ github.workspace }}/Tests.runsettings --test-adapter-path "${{ github.workspace }}/packages/coverlet.collector/6.0.0/build/netstandard1.0/"
working-directory: ${{ github.workspace }}
env:
DDS_ROOT: "${{ github.workspace }}/ext/OpenDDS_Linux"
ACE_ROOT: "${{ github.workspace }}/ext/OpenDDS_Linux/ACE_wrappers"
TAO_ROOT: "${{ github.workspace }}/ext/OpenDDS_Linux/ACE_wrappers/TAO"
LD_LIBRARY_PATH: "${{ github.workspace }}/ext/OpenDDS_Linux/lib:${{ github.workspace }}/ext/OpenDDS_Linux/ACE_wrappers/lib:."
MONO_THREADS_SUSPEND: preemptive

- name: Test Report
uses: dorny/test-reporter@v1
Expand Down Expand Up @@ -260,7 +258,7 @@ jobs:
- name: Setup dotnet 7.0
uses: actions/setup-dotnet@v3
with:
dotnet-version: '7.0.401'
dotnet-version: '7.0.402'

- name: Cache OpenDDS libraries
id: opendds-libraries-macos
Expand Down
2 changes: 1 addition & 1 deletion Build/OpenDDSharp.Build/OpenDDSharp.Build.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="SonarAnalyzer.CSharp" Version="9.9.0.77355">
<PackageReference Include="SonarAnalyzer.CSharp" Version="9.12.0.78982">
<PrivateAssets>all</PrivateAssets>
</PackageReference>

Expand Down
2 changes: 1 addition & 1 deletion Examples/ConsoleDemoCore/ConsoleDemoCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="SonarAnalyzer.CSharp" Version="9.9.0.77355">
<PackageReference Include="SonarAnalyzer.CSharp" Version="9.12.0.78982">
<PrivateAssets>all</PrivateAssets>
</PackageReference>

Expand Down
28 changes: 14 additions & 14 deletions GitVersion.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
next-version: 3.25.0
mode: ContinuousDelivery
next-version: "3.250.1"
mode: ContinuousDeployment
update-build-number: true
tag-prefix: '(release-)?[vV]'

Expand All @@ -10,32 +10,32 @@ assembly-informational-format: '{Major}.{Minor}.{Patch}.{WeightedPreReleaseNumbe
branches:
main:
regex: ^master$|^main$
mode: ContinuousDelivery
mode: ContinuousDeployment
tag: ''
increment: None
increment: Patch
prevent-increment-of-merged-branch-version: true
track-merge-target: false
source-branches: [ 'develop' ]
source-branches: [ ]
tracks-release-branches: false
is-release-branch: false
is-mainline: true
is-mainline: false
pre-release-weight: 23000
develop:
regex: ^dev(elop)?(ment)?$
mode: ContinuousDelivery
tag: alpha
mode: ContinuousDeployment
tag: beta
increment: None
prevent-increment-of-merged-branch-version: false
track-merge-target: true
source-branches: [ ]
tracks-release-branches: true
is-release-branch: false
is-mainline: false
pre-release-weight: 10000
pre-release-weight: 20000
feature:
regex: ^feature(s)?[/-]
mode: ContinuousDelivery
tag: beta
regex: ^(feature|features|fix|fixes)[/-]
mode: ContinuousDeployment
tag: alpha
increment: None
prevent-increment-of-merged-branch-version: false
track-merge-target: false
Expand All @@ -46,8 +46,8 @@ branches:
pre-release-weight: 10000
pull-request:
regex: ^(pull|pull\-requests|pr)[/-]
mode: ContinuousDelivery
tag: beta
mode: ContinuousDeployment
tag: alpha
increment: None
prevent-increment-of-merged-branch-version: false
tag-number-pattern: '[/-](?<number>\d+)[-/]'
Expand Down
2 changes: 1 addition & 1 deletion Sources/OpenDDSharp.BuildTasks/OpenDDSharp.BuildTasks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="SonarAnalyzer.CSharp" Version="9.9.0.77355">
<PackageReference Include="SonarAnalyzer.CSharp" Version="9.12.0.78982">
<PrivateAssets>all</PrivateAssets>
</PackageReference>

Expand Down
2 changes: 1 addition & 1 deletion Sources/OpenDDSharp.Marshaller/OpenDDSharp.Marshaller.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="SonarAnalyzer.CSharp" Version="9.9.0.77355">
<PackageReference Include="SonarAnalyzer.CSharp" Version="9.12.0.78982">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Sources/OpenDDSharp/OpenDDSharp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="SonarAnalyzer.CSharp" Version="9.9.0.77355">
<PackageReference Include="SonarAnalyzer.CSharp" Version="9.12.0.78982">
<PrivateAssets>all</PrivateAssets>
</PackageReference>

Expand Down
12 changes: 3 additions & 9 deletions Tests/OpenDDSharp.UnitTest/DataWriterTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1080,8 +1080,6 @@ public void TestDispose()

var countDisposed = 0;
Timestamp timestamp = default;
var disposed = evtDisposed;
var alive = evtAlive;
listener.DataAvailable += (reader) =>
{
var samples = new List<TestStruct>();
Expand All @@ -1103,11 +1101,11 @@ public void TestDispose()
timestamp = info.SourceTimestamp;
}

disposed.Set();
evtDisposed.Set();
}
else if (info.InstanceState == InstanceStateKind.AliveInstanceState)
{
alive.Set();
evtAlive.Set();
}
}
};
Expand Down Expand Up @@ -1200,25 +1198,21 @@ public void TestDispose()

evtDisposed.Dispose();
evtAlive.Dispose();
evtDisposed = null;
evtAlive = null;

// Clean up entities
foreach (var d in listener.DataAvailable.GetInvocationList())
{
var del = (Action<DataReader>)d;
listener.DataAvailable -= del;
}
Assert.AreEqual(ReturnCode.Ok, dataReader.SetListener(null, StatusMask.NoStatusMask));
Assert.AreEqual(ReturnCode.Ok, dataReader.SetListener(null, StatusMask.AllStatusMask));
listener.Dispose();

Assert.AreEqual(ReturnCode.Ok, dataReader.DeleteContainedEntities());
Assert.AreEqual(ReturnCode.Ok, subscriber.DeleteDataReader(dataReader));
Assert.AreEqual(ReturnCode.Ok, subscriber.DeleteContainedEntities());
Assert.AreEqual(ReturnCode.Ok, _publisher.DeleteDataWriter(writer));
Assert.AreEqual(ReturnCode.Ok, _participant.DeleteSubscriber(subscriber));


}

/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion Tests/OpenDDSharp.UnitTest/OpenDDSharp.UnitTest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="SonarAnalyzer.CSharp" Version="9.9.0.77355">
<PackageReference Include="SonarAnalyzer.CSharp" Version="9.12.0.78982">
<PrivateAssets>all</PrivateAssets>
</PackageReference>

Expand Down
2 changes: 1 addition & 1 deletion Tests/TestSupportProcessCore/TestSupportProcessCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="SonarAnalyzer.CSharp" Version="9.9.0.77355">
<PackageReference Include="SonarAnalyzer.CSharp" Version="9.12.0.78982">
<PrivateAssets>all</PrivateAssets>
</PackageReference>

Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "7.0.401",
"version": "7.0.402",
"rollForward": "latestPatch"
}
}
Loading