Missing ikvm.properties in source.

Remove dist version, comes in through pub now.
ikvmnet · Jun 9, 2024 · c304485 · c304485
1 parent cf4d10b
commit c304485
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 19 deletions.
diff --git a/src/IKVM.ConsoleApp/Program.cs b/src/IKVM.ConsoleApp/Program.cs
@@ -1,5 +1,4 @@
-using System.Diagnostics;
-using System.Runtime.CompilerServices;
+using java.text;
 
 namespace IKVM.ConsoleApp
 {
@@ -8,16 +7,7 @@ public class Program
     {
         public static void Main(string[] args)
         {
-            while (!Debugger.IsAttached)
-                System.Threading.Thread.Sleep(100);
-
-            new Program().New();
-        }
-
-        [MethodImpl(MethodImplOptions.NoInlining)]
-        void New()
-        {
-            java.lang.System.@out.println("hi");
+            java.text.Normalizer.normalize("hi", Normalizer.Form.NFC);
             System.Console.ReadLine();
         }
 

diff --git a/src/dist-image/ikvm/bin/ikvm.properties → src/IKVM.Image/ikvm/any/bin/ikvm.properties b/src/dist-image/ikvm/bin/ikvm.properties → src/IKVM.Image/ikvm/any/bin/ikvm.properties
diff --git a/src/dist-image/dist-image.csproj b/src/dist-image/dist-image.csproj
@@ -34,10 +34,6 @@
         <ImageTarget Include="net8.0|osx-arm64" TargetFramework="net8.0" RuntimeIdentifier="osx-arm64" Condition="$(_EnabledImageRuntimes.Contains(';osx-arm64;'))" />
     </ItemGroup>
 
-    <ItemGroup>
-        <_ContentFromProject Include="ikvm\**\*" />
-    </ItemGroup>
-
     <!-- Runs once per TFM/RID combination to generate individual output. -->
     <Target Name="GetCopyToOutputDirectoryItemsByImageTarget" BeforeTargets="BeforeBuild" Inputs="@(ImageTarget)" Outputs="%(Identity)\null">
 
@@ -49,9 +45,6 @@
 
         <!-- output for the TFM/RID -->
         <ItemGroup>
-            <PublishItems Include="@(_ContentFromProject)">
-                <TargetPath>$(_TargetFramework)\ikvm\$(_RuntimeIdentifier)\%(_ContentFromProject.RecursiveDir)%(_ContentFromProject.Filename)%(_ContentFromProject.Extension)</TargetPath>
-            </PublishItems>
             <PublishProjectReference Include="..\IKVM.Image.runtime.$(_RuntimeIdentifier)\IKVM.Image.runtime.$(_RuntimeIdentifier).csproj">
                 <SetTargetFramework>TargetFramework=$(_TargetFramework)</SetTargetFramework>
                 <PublishTargetPath>$(_TargetFramework)</PublishTargetPath>