This is an automated email from the ASF dual-hosted git repository.
zoltan pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/avro.git
The following commit(s) were added to refs/heads/main by this push:
new cc563e077 AVRO-4079: Remove not needed libssl trickery, what was
required by C# NET 3.1 and 5.0 (#3215)
cc563e077 is described below
commit cc563e0775e407834303a0731ba2ed4e9b2e01c6
Author: Zoltan Csizmadia <[email protected]>
AuthorDate: Wed Oct 16 10:41:16 2024 -0500
AVRO-4079: Remove not needed libssl trickery, what was required by C# NET
3.1 and 5.0 (#3215)
* Remove netcoreapp3.1 and 5.0 support
* Revert to ubuntu-latest
* Remove libssl trickery
---------
Co-authored-by: Zoltan Csizmadia <[email protected]>
---
.devcontainer/devcontainer.json | 7 +++++--
lang/csharp/common.props | 2 +-
share/docker/Dockerfile | 8 --------
3 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 2196d458c..c2ac39ddd 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -2,7 +2,10 @@
"name": "Avro Development",
"build": {
"dockerfile": "../share/docker/Dockerfile",
- "context": ".."
+ "context": "..",
+ "options": [
+ "--build-arg=BUILDPLATFORM=linux/amd64" // Dockerfile needs a
build platfrom argument
+ ]
},
"customizations": {
"vscode": {
@@ -27,4 +30,4 @@
]
}
}
-}
\ No newline at end of file
+}
diff --git a/lang/csharp/common.props b/lang/csharp/common.props
index f4c973f44..e12601f3d 100644
--- a/lang/csharp/common.props
+++ b/lang/csharp/common.props
@@ -58,7 +58,7 @@
<ItemGroup>
<None Include="$(MSBuildThisFileDirectory)\LICENSE" Pack="true"
Visible="false" PackagePath=""/>
<None Include="$(MSBuildThisFileDirectory)\README.md" Pack="true"
Visible="false" PackagePath=""/>
- <None
Include="$(MSBuildThisFileDirectory)\..\..\doc\assets\icons\logo.png"
Pack="true" Visible="false" PackagePath=""/>
+ <None
Include="$(MSBuildThisFileDirectory)\..\..\doc\assets\images\logo.png"
Pack="true" Visible="false" PackagePath=""/>
</ItemGroup>
<PropertyGroup>
diff --git a/share/docker/Dockerfile b/share/docker/Dockerfile
index 5b1df275e..7aba02e98 100644
--- a/share/docker/Dockerfile
+++ b/share/docker/Dockerfile
@@ -94,14 +94,6 @@ RUN apt-get -qqy install --no-install-recommends libzstd-dev
\
php-mbstring \
php-dev
-# Required for Dotnet
-RUN export ARCH="$(dpkg --print-architecture)"; \
- export LIBSSL_DEB="libssl1.1_1.1.1f-1ubuntu2.23_$ARCH.deb"; \
- wget -q "http://security.ubuntu.com/ubuntu/pool/main/o/openssl/$LIBSSL_DEB";
|| \
- wget -q
"http://ports.ubuntu.com/ubuntu-ports/pool/main/o/openssl/$LIBSSL_DEB";; \
- dpkg -i "$LIBSSL_DEB"; \
- rm "$LIBSSL_DEB"
-
# Install a maven release -------------------------------------------
# Inspired from
https://github.com/apache/accumulo-docker/blob/bbb9892e165d40fb35fa19f38929effc5d0c709b/Dockerfile#L30
ENV MAVEN_VERSION 3.9.6
