You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ignite.apache.org by GitBox <gi...@apache.org> on 2021/02/11 18:18:42 UTC
[GitHub] [ignite] ptupitsyn opened a new pull request #8790: IGNITE-12941 .NET: Fix and document single file publish on .NET 5
ptupitsyn opened a new pull request #8790:
URL: https://github.com/apache/ignite/pull/8790
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [ignite] Nikita-tech-writer commented on a change in pull request #8790: IGNITE-12941 .NET: Fix and document single file deployment on .NET 5
Posted by GitBox <gi...@apache.org>.
Nikita-tech-writer commented on a change in pull request #8790:
URL: https://github.com/apache/ignite/pull/8790#discussion_r575161714
##########
File path: docs/_docs/net-specific/net-deployment-options.adoc
##########
@@ -52,6 +52,17 @@ tab:MyApp.csproj[]
----
--
+== Single File Deployment
+
+Ignite.NET supports https://docs.microsoft.com/en-us/dotnet/core/deploying/single-file[single file deployment] that is available in .NET Core 3 / .NET 5+.
+
+* Use `IncludeAllContentForSelfExtract` MSBuild property to include jar files into the single-file bundle, or ship them separately.
Review comment:
```suggestion
* Use the `IncludeAllContentForSelfExtract` MSBuild property to include jar files into the single-file bundle, or ship them separately.
```
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [ignite] ptupitsyn merged pull request #8790: IGNITE-12941 .NET: Fix and document single file deployment on .NET 5
Posted by GitBox <gi...@apache.org>.
ptupitsyn merged pull request #8790:
URL: https://github.com/apache/ignite/pull/8790
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [ignite] gurustron commented on a change in pull request #8790: IGNITE-12941 .NET: Fix and document single file deployment on .NET 5
Posted by GitBox <gi...@apache.org>.
gurustron commented on a change in pull request #8790:
URL: https://github.com/apache/ignite/pull/8790#discussion_r574801747
##########
File path: modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/NativeLibraryUtils.cs
##########
@@ -0,0 +1,91 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Apache.Ignite.Core.Impl.Unmanaged
+{
+ using System;
+ using System.Diagnostics;
+ using System.Linq.Expressions;
+ using System.Reflection;
+ using System.Threading;
+
+ /// <summary>
+ /// Native library call utilities.
+ /// </summary>
+ public static class NativeLibraryUtils
+ {
+ /** */
+ private static int _resolversInitialized;
+
+ /// <summary>
+ /// Sets dll import resolvers.
+ /// </summary>
+ public static void SetDllImportResolvers()
+ {
+ if (Interlocked.CompareExchange(ref _resolversInitialized, 1, 0) != 0)
+ {
+ return;
+ }
+
+ // Init custom resolver for .NET 5+ single-file apps.
+ // Do it with Reflection, because SetDllImportResolver is not available on some frameworks,
+ // and multi-targeting is not yet implemented.
+ //
+ // The code below is equivalent to:
+ // NativeLibrary.SetDllImportResolver(typeof(Ignition).Assembly, (libName, _, _) => Resolve(libName));
+ var dllImportResolverType = Type.GetType("System.Runtime.InteropServices.DllImportResolver");
+ var dllImportSearchPathType = Type.GetType("System.Runtime.InteropServices.DllImportSearchPath");
+ var nativeLibraryType = Type.GetType("System.Runtime.InteropServices.NativeLibrary");
+
+ if (dllImportResolverType == null || dllImportSearchPathType == null || nativeLibraryType == null)
+ {
+ return;
+ }
+
+ var setDllImportResolverMethod = nativeLibraryType.GetMethod("SetDllImportResolver");
+
+ if (setDllImportResolverMethod == null)
+ {
+ return;
+ }
+
+ var resolveMethod = typeof(NativeLibraryUtils).GetMethod("Resolve", BindingFlags.Static | BindingFlags.NonPublic);
+ Debug.Assert(resolveMethod != null);
+
+ var libraryName = Expression.Parameter(typeof(string));
+ var assembly = Expression.Parameter(typeof(Assembly));
+ var searchPath = Expression.Parameter(typeof(Nullable<>).MakeGenericType(dllImportSearchPathType));
+
+ var resolve = Expression.Call(resolveMethod, libraryName);
Review comment:
Maybe change `resolve` to :
```
Expression<Func<string, IntPtr>> call = s => Resolve(s);
var resolve = Expression.Invoke(call, libraryName);
```
I think it is a little bit cleaner.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [ignite] Nikita-tech-writer commented on a change in pull request #8790: IGNITE-12941 .NET: Fix and document single file deployment on .NET 5
Posted by GitBox <gi...@apache.org>.
Nikita-tech-writer commented on a change in pull request #8790:
URL: https://github.com/apache/ignite/pull/8790#discussion_r575161513
##########
File path: docs/_docs/net-specific/net-deployment-options.adoc
##########
@@ -52,6 +52,17 @@ tab:MyApp.csproj[]
----
--
+== Single File Deployment
+
+Ignite.NET supports https://docs.microsoft.com/en-us/dotnet/core/deploying/single-file[single file deployment] that is available in .NET Core 3 / .NET 5+.
Review comment:
```suggestion
Ignite.NET supports link:https://docs.microsoft.com/en-us/dotnet/core/deploying/single-file[single file deployment] that is available in .NET Core 3 / .NET 5+.
```
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [ignite] ptupitsyn commented on a change in pull request #8790: IGNITE-12941 .NET: Fix and document single file deployment on .NET 5
Posted by GitBox <gi...@apache.org>.
ptupitsyn commented on a change in pull request #8790:
URL: https://github.com/apache/ignite/pull/8790#discussion_r575037003
##########
File path: modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/NativeLibraryUtils.cs
##########
@@ -0,0 +1,91 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Apache.Ignite.Core.Impl.Unmanaged
+{
+ using System;
+ using System.Diagnostics;
+ using System.Linq.Expressions;
+ using System.Reflection;
+ using System.Threading;
+
+ /// <summary>
+ /// Native library call utilities.
+ /// </summary>
+ public static class NativeLibraryUtils
+ {
+ /** */
+ private static int _resolversInitialized;
+
+ /// <summary>
+ /// Sets dll import resolvers.
+ /// </summary>
+ public static void SetDllImportResolvers()
+ {
+ if (Interlocked.CompareExchange(ref _resolversInitialized, 1, 0) != 0)
+ {
+ return;
+ }
+
+ // Init custom resolver for .NET 5+ single-file apps.
+ // Do it with Reflection, because SetDllImportResolver is not available on some frameworks,
+ // and multi-targeting is not yet implemented.
+ //
+ // The code below is equivalent to:
+ // NativeLibrary.SetDllImportResolver(typeof(Ignition).Assembly, (libName, _, _) => Resolve(libName));
+ var dllImportResolverType = Type.GetType("System.Runtime.InteropServices.DllImportResolver");
+ var dllImportSearchPathType = Type.GetType("System.Runtime.InteropServices.DllImportSearchPath");
+ var nativeLibraryType = Type.GetType("System.Runtime.InteropServices.NativeLibrary");
+
+ if (dllImportResolverType == null || dllImportSearchPathType == null || nativeLibraryType == null)
+ {
+ return;
+ }
+
+ var setDllImportResolverMethod = nativeLibraryType.GetMethod("SetDllImportResolver");
+
+ if (setDllImportResolverMethod == null)
+ {
+ return;
+ }
+
+ var resolveMethod = typeof(NativeLibraryUtils).GetMethod("Resolve", BindingFlags.Static | BindingFlags.NonPublic);
+ Debug.Assert(resolveMethod != null);
+
+ var libraryName = Expression.Parameter(typeof(string));
+ var assembly = Expression.Parameter(typeof(Assembly));
+ var searchPath = Expression.Parameter(typeof(Nullable<>).MakeGenericType(dllImportSearchPathType));
+
+ var resolve = Expression.Call(resolveMethod, libraryName);
Review comment:
Good point, fixed
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org