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

Jump to bottom

Update .NET dependencies [ALLOW INTERMEDIATE BUILDS] #422

Merged
merged 4 commits into from
Nov 17, 2021
Merged

Update .NET dependencies [ALLOW INTERMEDIATE BUILDS] #422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
16b9432
update dotnet dependencies
kate-goldenring Nov 16, 2021
d6766d6
increase version
kate-goldenring Nov 16, 2021
fd41dc6
increase OPENCV base version
kate-goldenring Nov 16, 2021
52aeccc
Fix library use
kate-goldenring Nov 16, 2021
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
28 changes: 14 additions & 14 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion agent/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "agent"
version = "0.7.3"
version = "0.7.4"
authors = ["Kate Goldenring <[email protected]>", "<[email protected]>"]
edition = "2018"

Expand Down
4 changes: 2 additions & 2 deletions build/containers/intermediate/Dockerfile.opencvsharp-build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ WORKDIR /app
LABEL org.opencontainers.image.source https://github.com/project-akri/akri

# based on https://xaviergeerinck.com/opencv-in-dotnet-core
ENV OPENCV_VERSION="4.1.1"
ENV OPENCV_VERSION="4.5.4"
ENV OPENCV_INSTALLATION_DIR="/opt/opencv/"
ENV OPENCV_SHARP_VERSION="4.1.0.20190417"
ENV OPENCV_SHARP_VERSION="4.5.3.20210821"

RUN whoami
RUN pwd
Expand Down
2 changes: 1 addition & 1 deletion build/intermediate-containers.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

BUILD_RUST_CROSSBUILD_VERSION = 0.0.7

BUILD_OPENCV_BASE_VERSION = 0.0.8
BUILD_OPENCV_BASE_VERSION = 0.0.9

CROSS_VERSION = 0.1.16

Expand Down
2 changes: 1 addition & 1 deletion controller/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "controller"
version = "0.7.3"
version = "0.7.4"
authors = ["<[email protected]>"]
edition = "2018"

Expand Down
4 changes: 2 additions & 2 deletions deployment/helm/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.7.3
version: 0.7.4

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
appVersion: 0.7.3
appVersion: 0.7.4
2 changes: 1 addition & 1 deletion discovery-handler-modules/debug-echo-discovery-handler/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "debug-echo-discovery-handler"
version = "0.7.3"
version = "0.7.4"
authors = ["Kate Goldenring <[email protected]>"]
edition = "2018"

Expand Down
2 changes: 1 addition & 1 deletion discovery-handler-modules/onvif-discovery-handler/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "onvif-discovery-handler"
version = "0.7.3"
version = "0.7.4"
authors = ["Kate Goldenring <[email protected]>"]
edition = "2018"

Expand Down
2 changes: 1 addition & 1 deletion discovery-handler-modules/opcua-discovery-handler/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "opcua-discovery-handler"
version = "0.7.3"
version = "0.7.4"
authors = ["Kate Goldenring <[email protected]>"]
edition = "2018"

Expand Down
2 changes: 1 addition & 1 deletion discovery-handler-modules/udev-discovery-handler/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "udev-discovery-handler"
version = "0.7.3"
version = "0.7.4"
authors = ["Kate Goldenring <[email protected]>"]
edition = "2018"

Expand Down
2 changes: 1 addition & 1 deletion discovery-handlers/debug-echo/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "akri-debug-echo"
version = "0.7.3"
version = "0.7.4"
authors = ["Kate Goldenring <[email protected]>"]
edition = "2018"

Expand Down
2 changes: 1 addition & 1 deletion discovery-handlers/onvif/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "akri-onvif"
version = "0.7.3"
version = "0.7.4"
authors = ["Kate Goldenring <[email protected]>"]
edition = "2018"

Expand Down
2 changes: 1 addition & 1 deletion discovery-handlers/opcua/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "akri-opcua"
version = "0.7.3"
version = "0.7.4"
authors = ["Kate Goldenring <[email protected]>"]
edition = "2018"

Expand Down
2 changes: 1 addition & 1 deletion discovery-handlers/udev/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "akri-udev"
version = "0.7.3"
version = "0.7.4"
authors = ["Kate Goldenring <[email protected]>"]
edition = "2018"

Expand Down
2 changes: 1 addition & 1 deletion discovery-utils/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "akri-discovery-utils"
version = "0.7.3"
version = "0.7.4"
authors = ["Kate Goldenring <[email protected]>"]
edition = "2018"

Expand Down
2 changes: 1 addition & 1 deletion samples/brokers/onvif-video-broker/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ interface.
1. Install [opencvsharp](https://github.com/shimat/opencvsharp), the OpenCV wrapper for .NET
1. Build
```sh
cd ./samples/brokers/onvif-monitoring-broker
cd ./samples/brokers/onvif-video-broker
dotnet build
```
1. Run the broker, passing in the ONVIF service URL for the camera it should pull frames from.
Expand Down
15 changes: 7 additions & 8 deletions samples/brokers/onvif-video-broker/onvif-video-broker.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,17 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Json.NET" Version="1.0.18" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.9.10" />
<PackageReference Include="Google.Protobuf" Version="3.11.3" />
<PackageReference Include="Grpc" Version="2.27.0" />
<PackageReference Include="Grpc.AspNetCore" Version="2.27.0" />
<PackageReference Include="Grpc.Tools" Version="2.27.0">
<PackageReference Include="Json.NET" Version="1.0.33" />
<PackageReference Include="Google.Protobuf" Version="3.19.1" />
<PackageReference Include="Grpc" Version="2.40.0" />
<PackageReference Include="Grpc.AspNetCore" Version="2.40.0" />
<PackageReference Include="Grpc.Tools" Version="2.40.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="prometheus-net.AspNetCore" Version="3.4.0" />
<PackageReference Include="prometheus-net.AspNetCore" Version="5.0.1" />
<PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
<PackageReference Include="OpenCvSharp4" Version="4.1.0.20190416" />
<PackageReference Include="OpenCvSharp4" Version="4.5.3.20210817" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion samples/brokers/opcua-monitoring-broker/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ private async Task CreateAndRunClient()

if (haveAppCertificate)
{
config.ApplicationUri = Utils.GetApplicationUriFromCertificate(config.SecurityConfiguration.ApplicationCertificate.Certificate);
config.ApplicationUri = X509Utils.GetApplicationUriFromCertificate(config.SecurityConfiguration.ApplicationCertificate.Certificate);
config.CertificateValidator.CertificateValidation += new CertificateValidationEventHandler(CertificateValidator_CertificateValidation);
}
else
Expand Down
6 changes: 3 additions & 3 deletions samples/brokers/opcua-monitoring-broker/opcua-monitoring-broker.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Grpc.AspNetCore" Version="2.27.0" />
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua" Version="1.4.362.42" />
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Symbols" Version="1.4.362.42" />
<PackageReference Include="Grpc.AspNetCore" Version="2.40.0" />
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua" Version="1.4.367.42" />
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Symbols" Version="1.4.367.42" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion samples/brokers/udev-video-broker/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "udev-video-broker"
version = "0.7.3"
version = "0.7.4"
authors = ["Kate Goldenring <[email protected]>", "<[email protected]>"]
edition = "2018"

Expand Down
2 changes: 1 addition & 1 deletion samples/opcua-certificate-generator/opcua-certificate-generator.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua" Version="1.4.363.49" />
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua" Version="1.4.367.42" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion shared/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "akri-shared"
version = "0.7.3"
version = "0.7.4"
authors = ["<[email protected]>"]
edition = "2018"

Expand Down
2 changes: 1 addition & 1 deletion version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.7.3
0.7.4
2 changes: 1 addition & 1 deletion webhooks/validating/configuration/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "webhook-configuration"
version = "0.7.3"
version = "0.7.4"
authors = ["DazWilkin <[email protected]>"]
edition = "2018"

Expand Down