using the newest Irony nuget package instead of using Irony.dll directly

davidnemeti · Feb 5, 2023 · 29de40c · 29de40c
1 parent ccb6927
commit 29de40c
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 38 deletions.
diff --git a/Libraries/Irony.dll b/Libraries/Irony.dll
diff --git a/Libraries/readme.txt b/Libraries/readme.txt
diff --git a/MiniPL/MiniPL.csproj b/MiniPL/MiniPL.csproj
@@ -33,12 +33,6 @@
     </ProjectReference>
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="Irony">
-      <HintPath>..\Libraries\Irony.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
   <ItemGroup>
     <None Update="MiniPL\CodeGenerators\CppGeneratorTemplate.tt">
       <Generator>TextTemplatingFilePreprocessor</Generator>

diff --git a/Playground/Playground.csproj b/Playground/Playground.csproj
@@ -8,12 +8,6 @@
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Reference Include="Irony">
-      <HintPath>..\Libraries\Irony.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
   <ItemGroup>
     <None Update="MiniPL_long.mplp">
       <AutoGen>True</AutoGen>

diff --git a/Sarcasm.UnitTest/Sarcasm.UnitTest.csproj b/Sarcasm.UnitTest/Sarcasm.UnitTest.csproj
@@ -48,12 +48,7 @@
       <Name>Sarcasm</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Irony">
-      <HintPath>..\Libraries\Irony.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
+
   <ItemGroup>
     <None Update="Expected results\ASTs\Binary3.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>

diff --git a/Sarcasm/Sarcasm.csproj b/Sarcasm/Sarcasm.csproj
@@ -5,7 +5,7 @@
     <RootNamespace>Sarcasm</RootNamespace>
     <AssemblyName>Sarcasm</AssemblyName>
     <Description>SDK for creating typesafe and typeless domain bound grammar and using the general unparser</Description>
-    <Version>4.0.0</Version>
+    <Version>4.1.0</Version>
     <Authors>Dávid Németi</Authors>
     <PackageTags>Parser;Unparser;Grammar;AST;DomainBinding;Typesafety;CompileTimeSafety</PackageTags>
     <PackageLicenseExpression>LGPL-3.0-only</PackageLicenseExpression>
@@ -18,7 +18,6 @@
     <NoWarn>CS1591,CS0618</NoWarn>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>Signature\Sarcasm.snk</AssemblyOriginatorKeyFile>
-    <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);GetMyPackageFiles</TargetsForTfmSpecificBuildOutput>
     <!--<TransformOnBuild>true</TransformOnBuild>
     <TransformOutOfDateOnly>true</TransformOutOfDateOnly>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>-->
@@ -31,35 +30,24 @@
   <ItemGroup>
     <!--
       using Krafs.Publicizer instead of IgnoresAccessChecksToGenerator, because:
-        - IgnoresAccessChecksToGenerator raised error when processing netstandard2.0 Irony.dll
+        - IgnoresAccessChecksToGenerator raised error when processing the netstandard2.0 version of Irony.dll
         - IgnoresAccessChecksToGenerator cannot publicize private members
     -->
     <PackageReference Include="Krafs.Publicizer" Version="2.2.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="Irony" Version="1.2.0" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="Irony">
-      <HintPath>..\Libraries\Irony.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
   <ItemGroup>
     <None Include="..\README.md" Pack="true" PackagePath="\" />
   </ItemGroup>
 
-  <Target Name="GetMyPackageFiles">
-    <ItemGroup>
-      <BuildOutputInPackage Include="..\Libraries\Irony.dll" />
-    </ItemGroup>
-  </Target>
-
   <ItemGroup>
     <Compile Update="GrammarAst\BnfiExpressions\BnfiExpression.generated.cs">
       <AutoGen>True</AutoGen>