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.

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

Buildfix #2217

Merged
merged 2 commits into from
Apr 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -162,14 +162,6 @@ internal override void Encode(JsonEncoderEx encoder, string? publisherId, bool w
}
}

// force published timestamp into to source timestamp for the legacy heartbeat compatibility
if (MessageType == MessageType.KeepAlive &&
((DataSetMessageContentMask & (uint)JsonDataSetMessageContentMask.Timestamp) == 0) &&
((Payload.DataSetFieldContentMask & (uint)DataSetFieldContentMask.SourceTimestamp) != 0))
{
value.SourceTimestamp = Timestamp ?? default;
}

var reversibleMode = encoder.UseReversibleEncoding;
try
{
Expand Down
17 changes: 8 additions & 9 deletions tools/templates/cc.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# This Yaml Document has been converted by ESAI Yaml Pipeline Conversion Tool.
# Please make sure to check all the converted content, it is your team's responsibility to make sure that the pipeline is still valid and functions as expected.
jobs:
- job: codecoverage
displayName: Code coverage
Expand All @@ -21,27 +19,28 @@ jobs:
displayName: Versioning
inputs:
targetType: filePath
filePath: ./tools/scripts/set-version.ps1
filePath: .\tools\scripts\set-version.ps1
- task: DotNetCoreCLI@2
inputs:
command: custom
custom: tool
arguments: install --tool-path tools dotnet-reportgenerator-globaltool
arguments: install --tool-path .\tools dotnet-reportgenerator-globaltool
displayName: Install ReportGenerator tool
- task: DotNetCoreCLI@2
displayName: Code coverage
timeoutInMinutes: 60
inputs:
command: test
projects: '**/tests/*.csproj'
projects: '**\tests\*.csproj'
arguments: '--configuration Release /p:CollectCoverage=true /p:CoverletOutputFormat=cobertura'
- script: |
tools/reportgenerator -reports:$(Build.SourcesDirectory)/**/coverage.cobertura.xml -targetdir:$(Build.SourcesDirectory)/CodeCoverage "-reporttypes:Cobertura;HtmlSummary" "-title:Industrial IoT Test Coverage" "-assemblyfilters:-*.Tests"
cp $(Build.SourcesDirectory)/CodeCoverage/summary.htm $(Build.SourcesDirectory)/CodeCoverage/index.html
.\tools\reportgenerator -reports:$(Build.SourcesDirectory)\**\coverage.cobertura.xml -targetdir:$(Build.SourcesDirectory)\CodeCoverage "-reporttypes:Cobertura;HtmlSummary" "-title:Industrial IoT Test Coverage" "-assemblyfilters:-*.Tests"
copy $(Build.SourcesDirectory)\CodeCoverage\summary.htm $(Build.SourcesDirectory)\CodeCoverage\index.html

displayName: Create Code coverage report
- task: PublishCodeCoverageResults@1
displayName: 'Publish code coverage'
inputs:
codeCoverageTool: Cobertura
summaryFileLocation: '$(Build.SourcesDirectory)/CodeCoverage/Cobertura.xml'
reportDirectory: '$(Build.SourcesDirectory)/CodeCoverage'
summaryFileLocation: '$(Build.SourcesDirectory)\CodeCoverage\Cobertura.xml'
reportDirectory: '$(Build.SourcesDirectory)\CodeCoverage'
2 changes: 1 addition & 1 deletion version.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
"version": "2.9.7-rc.{height}",
"version": "2.9.8-rc.{height}",
"publicReleaseRefSpec": [
"^refs/heads/main$",
"^refs/heads/release/\\d+\\.\\d+\\.\\d+"
Expand Down