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

Modelcompiler 2021 11 24 #1627

Merged
merged 58 commits into from
Dec 5, 2021
Merged

Modelcompiler 2021 11 24 #1627

merged 58 commits into from
Dec 5, 2021

Conversation

opcfoundation-org
Copy link
Contributor

I don't understand why my merges end up with this huge history.

dependabot bot and others added 19 commits November 2, 2021 17:25
Bumps [Portable.BouncyCastle](https://github.com/novotnyllc/bc-csharp) from 1.8.10 to 1.9.0.
- [Release notes](https://github.com/novotnyllc/bc-csharp/releases)
- [Commits](novotnyllc/bc-csharp@pcl-v1.8.10...pcl-v1.9.0)

---
updated-dependencies:
- dependency-name: Portable.BouncyCastle
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.11.0 to 17.0.0.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](microsoft/vstest@v16.11.0...v17.0.0)

---
updated-dependencies:
- dependency-name: Microsoft.NET.Test.Sdk
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
-fixes for complex types:
  - a structure which contains an enum from namespace 0 can not be created. fixes #1561.
  - a structure with multidimensional array may lead to a endless loop in `ComplexTypeSystem.Load`
  - a malformed namespace Uri which contains a space character prevents creation of type system.
  - select endpoint doesn't pick the right scheme if the default endpoint must be picked
-prep for net472 or greater and net5.0 or greater build, only build #ifdef
Bumps [System.Io.Pipelines](https://github.com/dotnet/runtime) from 4.5.4 to 5.0.1.
- [Release notes](https://github.com/dotnet/runtime/releases)
- [Commits](https://github.com/dotnet/runtime/commits/v5.0.1)

---
updated-dependencies:
- dependency-name: System.Io.Pipelines
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [System.Text.Encodings.Web](https://github.com/dotnet/runtime) from 4.5.1 to 5.0.1.
- [Release notes](https://github.com/dotnet/runtime/releases)
- [Commits](https://github.com/dotnet/runtime/commits/v5.0.1)

---
updated-dependencies:
- dependency-name: System.Text.Encodings.Web
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
This can cause considerable slowdown when connecting to multiple MQTT
destinations or when waiting for pubsub application to start, and is
unecessary.

Instead, the DisconnectHandler fires on connect fail as well, so this
implementation works.
- add build targets for net6.0
- fix new warnings in VS2022 compiler
@CLAassistant
Copy link

CLAassistant commented Dec 5, 2021

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
5 out of 6 committers have signed the CLA.

✅ mregen
✅ randy-armstrong
✅ bdovaz
✅ mrsuciu
✅ einarmo
❌ dependabot[bot]
You have signed the CLA already but the status is still pending? Let us recheck it.

@codecov
Copy link

codecov bot commented Dec 5, 2021

Codecov Report

Merging #1627 (4e6a2c8) into master (edadaa8) will increase coverage by 0.02%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1627      +/-   ##
==========================================
+ Coverage   53.42%   53.44%   +0.02%     
==========================================
  Files         312      312              
  Lines       57368    57368              
==========================================
+ Hits        30646    30658      +12     
+ Misses      26722    26710      -12     
Impacted Files Coverage Δ
Libraries/Opc.Ua.Client/Session.cs 62.18% <0.00%> (+0.25%) ⬆️
...Security/Certificates/DirectoryCertificateStore.cs 90.03% <0.00%> (+0.33%) ⬆️
Stack/Opc.Ua.Core/Stack/Tcp/TcpMessageSocket.cs 73.72% <0.00%> (+0.34%) ⬆️
...ack/Opc.Ua.Core/Stack/Tcp/ChannelAsyncOperation.cs 68.75% <0.00%> (+1.04%) ⬆️
Stack/Opc.Ua.Core/Stack/Tcp/UaSCBinaryChannel.cs 69.36% <0.00%> (+1.70%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update edadaa8...4e6a2c8. Read the comment docs.

@mregen
Copy link
Contributor

mregen commented Dec 5, 2021

Hi @opcfoundation-org, after merge with master and manual compare it boils down to just the diff of the nodeset files..
To get rid of the commit history, replace the working branch with latest master after a merge. e.g. replace prototyping/master with this master etc.

@opcfoundation-org
Copy link
Contributor Author

opcfoundation-org commented Dec 5, 2021

Hi @opcfoundation-org, after merge with master and manual compare it boils down to just the diff of the nodeset files.. To get rid of the commit history, replace the working branch with latest master after a merge. e.g. replace prototyping/master with this master etc.

Do you mean literally copy and pasting files or is there a git command to do it right?

@mregen mregen merged commit 985035b into master Dec 5, 2021
@mregen mregen deleted the modelcompiler-2021-11-24 branch December 5, 2021 10:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants