From 78a330b68bc03eced3ee9d586c6fa7a64c71f147 Mon Sep 17 00:00:00 2001
From: stubbfel <stubbfel@stubbe.rocks>
Date: Thu, 18 May 2023 21:36:54 +0000
Subject: [PATCH] rm ilmerge, new version 0.0.2

---
 Readme.md                                     |  2 --
 .../ResourceString.Net.App.Console.csproj     |  2 +-
 .../ResourceString.Net.Logic.Tests.csproj     |  2 +-
 .../ResourceString.Net.Logic.csproj           |  2 +-
 ResourceString.Net/FodyWeavers.xml            |  3 ---
 ResourceString.Net/ResourceString.Net.csproj  | 20 +++++++++----------
 example/Example.App/Example.App.csproj        |  6 ++----
 example/Example.App/NuGet.Config              |  6 ++++++
 flake.nix                                     |  5 ++---
 9 files changed, 23 insertions(+), 25 deletions(-)
 delete mode 100644 ResourceString.Net/FodyWeavers.xml
 create mode 100644 example/Example.App/NuGet.Config

diff --git a/Readme.md b/Readme.md
index 06e0613..6d0f88a 100644
--- a/Readme.md
+++ b/Readme.md
@@ -214,8 +214,6 @@ You can redirect the output to a file if desired.
 
 | Package                               | Version |
 | ------------------------------------- | ------- |
-| Fody                                  | 6.7.0   |
-| ILMerge.Fody                          | 1.24.0  |
 | Microsoft.CodeAnalysis.Analyzers      | 3.3.4   |
 | Microsoft.CodeAnalysis.CSharp         | 4.3.0   |
 | NETStandard.Library (Auto-referenced) | 2.0.3   |
diff --git a/ResourceString.Net.App.Console/ResourceString.Net.App.Console.csproj b/ResourceString.Net.App.Console/ResourceString.Net.App.Console.csproj
index 9360a2a..60f3217 100644
--- a/ResourceString.Net.App.Console/ResourceString.Net.App.Console.csproj
+++ b/ResourceString.Net.App.Console/ResourceString.Net.App.Console.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\ResourceString.Net.Logic\ResourceString.Net.Logic.csproj" />
+    <ProjectReference Include="../ResourceString.Net.Logic/ResourceString.Net.Logic.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/ResourceString.Net.Logic.Tests/ResourceString.Net.Logic.Tests.csproj b/ResourceString.Net.Logic.Tests/ResourceString.Net.Logic.Tests.csproj
index b3ef7bf..fa87c09 100644
--- a/ResourceString.Net.Logic.Tests/ResourceString.Net.Logic.Tests.csproj
+++ b/ResourceString.Net.Logic.Tests/ResourceString.Net.Logic.Tests.csproj
@@ -19,7 +19,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\ResourceString.Net.Logic\ResourceString.Net.Logic.csproj" />
+    <ProjectReference Include="../ResourceString.Net.Logic/ResourceString.Net.Logic.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/ResourceString.Net.Logic/ResourceString.Net.Logic.csproj b/ResourceString.Net.Logic/ResourceString.Net.Logic.csproj
index 1746496..a715f06 100644
--- a/ResourceString.Net.Logic/ResourceString.Net.Logic.csproj
+++ b/ResourceString.Net.Logic/ResourceString.Net.Logic.csproj
@@ -12,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\ResourceString.Net.Contract\ResourceString.Net.Contract.csproj" />
+    <ProjectReference Include="../ResourceString.Net.Contract/ResourceString.Net.Contract.csproj" />
   </ItemGroup>  
 
   <ItemGroup>
diff --git a/ResourceString.Net/FodyWeavers.xml b/ResourceString.Net/FodyWeavers.xml
deleted file mode 100644
index f529bfe..0000000
--- a/ResourceString.Net/FodyWeavers.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
-  <ILMerge FullImport='true' HideImportedTypes='false' IncludeAssemblies='ResourceString.Net*|LanguageExt*'/>
-</Weavers>
\ No newline at end of file
diff --git a/ResourceString.Net/ResourceString.Net.csproj b/ResourceString.Net/ResourceString.Net.csproj
index 8d42a7c..fea5cb0 100644
--- a/ResourceString.Net/ResourceString.Net.csproj
+++ b/ResourceString.Net/ResourceString.Net.csproj
@@ -6,25 +6,25 @@
     <Nullable>enable</Nullable>
     <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>stubbfel</Authors>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <PackageTags>generator</PackageTags>
     <NoPackageAnalysis>true</NoPackageAnalysis>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+    <PackageProjectUrl>https://gitlab.com/stubbfel/ResourceString.Net</PackageProjectUrl>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageReadmeFile>Readme.md</PackageReadmeFile>
   </PropertyGroup>
 
     <!-- It puts the dll in the expected folder of the NuGet package to be recognized as a C# analyzer -->
   <ItemGroup>
-    <None Include="$(OutputPath)\$(AssemblyName).dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
+    <None Include="$(OutputPath)/*.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
+    <None Include="$(OutputPath)/$(AssemblyName).Contract.dll" Pack="true" PackagePath="lib/netstandard2.0" Visible="false" />
+    <None Include="../Readme.md" Pack="true" PackagePath="/"/>
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Fody" Version="6.7.0">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="ILMerge.Fody" Version="1.24.0">
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
     <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
@@ -34,8 +34,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\ResourceString.Net.Logic\ResourceString.Net.Logic.csproj">
+    <ProjectReference Include="../ResourceString.Net.Logic\ResourceString.Net.Logic.csproj">
       <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
+    </ProjectReference>   
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/example/Example.App/Example.App.csproj b/example/Example.App/Example.App.csproj
index 24a4f0f..a6d860b 100644
--- a/example/Example.App/Example.App.csproj
+++ b/example/Example.App/Example.App.csproj
@@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\ResourceString.Net\ResourceString.Net.csproj" OutputItemType="Analyzer" />    
-  </ItemGroup>
-
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net6.0</TargetFramework>
@@ -11,6 +7,7 @@
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
     <IsPackable>false</IsPackable>
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -19,5 +16,6 @@
 
   <ItemGroup>
     <PackageReference Include="System.Resources.Extensions" Version="7.0.0" />
+    <PackageReference Include="ResourceString.Net" />
   </ItemGroup>  
 </Project>
diff --git a/example/Example.App/NuGet.Config b/example/Example.App/NuGet.Config
new file mode 100644
index 0000000..03587d3
--- /dev/null
+++ b/example/Example.App/NuGet.Config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <add key="local-packages" value="../../ResourceString.Net/bin/Debug" />
+  </packageSources>
+</configuration>
\ No newline at end of file
diff --git a/flake.nix b/flake.nix
index c72218c..15d4525 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,7 +4,7 @@
   outputs = { self, nixpkgs }:
     let
       name = "ResourceString.Net";
-      version = "0.0.1";
+      version = "0.0.2";
       supportedSystems =
         [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ];
       forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
@@ -93,7 +93,6 @@
           projectFile = [
             "ResourceString.Net/ResourceString.Net.csproj"
             "ResourceString.Net.App.Console/ResourceString.Net.App.Console.csproj"
-            "example/Example.App/Example.App.csproj"
           ];
 
           nugetDeps = ./ResourceString.Net/deps.nix;
@@ -101,7 +100,7 @@
 
           dotnet-sdk = nixpkgsFor.${system}.dotnet-sdk;
           dotnet-runtime = nixpkgsFor.${system}.dotnet-runtime;
-          executables = [ "ResourceString.Net.App.Console" "Example.App" ];
+          executables = [ "ResourceString.Net.App.Console" ];
           packNupkg = true;
           runtimeDeps = [ ];
         };