Skip to content

Commit

Permalink
Merge pull request #51 from IronyProject/roman_dev
Browse files Browse the repository at this point in the history
Prepared new package versions 1.2
  • Loading branch information
rivantsov authored Jan 31, 2023
2 parents f7a9c46 + df6e010 commit b8330ef
Show file tree
Hide file tree
Showing 19 changed files with 44 additions and 256 deletions.
182 changes: 22 additions & 160 deletions Irony.GrammarExplorer/030.Irony.GrammarExplorer.csproj
Original file line number Diff line number Diff line change
@@ -1,160 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{AE1C04A8-B03D-4144-98E9-BF66C50265E7}</ProjectGuid>
<OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Irony.GrammarExplorer</RootNamespace>
<AssemblyName>Irony.GrammarExplorer</AssemblyName>
<FileUpgradeFlags>
</FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<SccProjectName>
</SccProjectName>
<SccLocalPath>
</SccLocalPath>
<SccAuxPath>
</SccAuxPath>
<SccProvider>
</SccProvider>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
<UpdateEnabled>false</UpdateEnabled>
<UpdateMode>Foreground</UpdateMode>
<UpdateInterval>7</UpdateInterval>
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
<UpdatePeriodically>false</UpdatePeriodically>
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Data" />
<Reference Include="System.Deployment" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="fmGrammarExplorer.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="fmGrammarExplorer.Designer.cs">
<DependentUpon>fmGrammarExplorer.cs</DependentUpon>
</Compile>
<Compile Include="fmSelectGrammars.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="fmSelectGrammars.Designer.cs">
<DependentUpon>fmSelectGrammars.cs</DependentUpon>
</Compile>
<Compile Include="GrammarItemList.cs" />
<Compile Include="GrammarLoader.cs" />
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<EmbeddedResource Include="fmGrammarExplorer.resx">
<DependentUpon>fmGrammarExplorer.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="fmSelectGrammars.resx">
<DependentUpon>fmSelectGrammars.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
<SubType>Designer</SubType>
</EmbeddedResource>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
<DesignTime>True</DesignTime>
</Compile>
<None Include="app.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
<Compile Include="Properties\Settings.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Irony.Interpreter\015.Irony.Interpreter.csproj">
<Project>{321A7F5D-00C2-4095-9970-075CDEE8C139}</Project>
<Name>015.Irony.Interpreter</Name>
</ProjectReference>
<ProjectReference Include="..\Irony.WinForms\035.Irony.WinForms.csproj">
<Project>{70D319F3-3C0C-4EB5-A271-58ED22FB3070}</Project>
<Name>035.Irony.WinForms</Name>
</ProjectReference>
<ProjectReference Include="..\Irony\010.Irony.csproj">
<Project>{D81F5C91-D7DB-46E5-BC99-49488FB6814C}</Project>
<Name>010.Irony</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
<Install>false</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1</ProductName>
<Install>true</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
<Visible>False</Visible>
<ProductName>Windows Installer 3.1</ProductName>
<Install>true</Install>
</BootstrapperPackage>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net472</TargetFramework>
<RootNamespace>Irony.GrammarExplorer</RootNamespace>
<AssemblyName>Irony.GrammarExplorer</AssemblyName>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\Irony.WinForms\035.Irony.WinForms.csproj" />
<ProjectReference Include="..\Irony\010.Irony.csproj" />
<ProjectReference Include="..\Irony.Interpreter\015.Irony.Interpreter.csproj" />
<ProjectReference Include="..\Irony.Samples\020.Irony.Samples.csproj" />
</ItemGroup>

<ItemGroup>
<Reference Include="System.Windows.Forms" />
</ItemGroup>

</Project>
3 changes: 2 additions & 1 deletion Irony.GrammarExplorer/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ static void Main() {
}

static Program CreateInstanceInSeparateDomain() {
var setup = new AppDomainSetup {
var setup = new AppDomainSetup()
{
ShadowCopyFiles = true.ToString()
};

Expand Down
2 changes: 1 addition & 1 deletion Irony.GrammarExplorer/Properties/Resources.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Irony.GrammarExplorer/Properties/Settings.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Irony.GrammarExplorer/app.config
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@
</setting>
</Irony.GrammarExplorer.Properties.Settings>
</userSettings>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
6 changes: 4 additions & 2 deletions Irony.Interpreter/015.Irony.Interpreter.csproj
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net40;netstandard2.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
<RootNamespace>Irony.Interpreter</RootNamespace>
<AssemblyName>Irony.Interpreter</AssemblyName>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>irony.snk</AssemblyOriginatorKeyFile>
<AssemblyVersion>1.2.0</AssemblyVersion>
<Version>1.2.0</Version>
</PropertyGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions Irony.Samples.Console/025.Irony.Samples.Console.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework>
<TargetFramework>net472</TargetFramework>
<RootNamespace>Irony.Samples.Console</RootNamespace>
<AssemblyName>Irony.Samples.Console</AssemblyName>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
Expand Down
2 changes: 1 addition & 1 deletion Irony.Tests/040.Irony.Tests.VsTest.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Irony.Tests</RootNamespace>
<AssemblyName>Irony.Tests.VSTest</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<SccProjectName>
Expand Down
4 changes: 2 additions & 2 deletions Irony.Tests/050.Irony.Tests.NUnit.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Irony.Tests</RootNamespace>
<AssemblyName>Irony.Tests.NUnit</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SccProjectName>
</SccProjectName>
Expand Down Expand Up @@ -50,7 +50,7 @@
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>TRACE;DEBUG;USE_NUNIT</DefineConstants>
<DefineConstants>TRACE;USE_NUNIT</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
Expand Down
2 changes: 1 addition & 1 deletion Irony.WinForms/035.Irony.WinForms.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Irony.WinForms</RootNamespace>
<AssemblyName>Irony.WinForms</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
Expand Down
Binary file modified Irony.WinForms/Properties/AssemblyInfo.cs
Binary file not shown.
6 changes: 4 additions & 2 deletions Irony/010.Irony.csproj
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net40;netstandard2.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
<RootNamespace>Irony</RootNamespace>
<AssemblyName>Irony</AssemblyName>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>irony.snk</AssemblyOriginatorKeyFile>
<AssemblyVersion>1.2.0</AssemblyVersion>
<Version>1.2.0</Version>

<!--
<!--
This assembly is marked SecurityTransparent, which requires verifiable IL.
Setting peverify-compat ensures that the C# compiler will forgoe optimizations that would produce unverifiable IL.
-->
Expand Down
6 changes: 0 additions & 6 deletions Irony/Irony.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,11 @@
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<tags> irony ast grammar bnf </tags>
<dependencies>
<group targetFramework=".NETFramework4.0" />
<group targetFramework=".NETFramework4.5" />
<group targetFramework=".NETStandard2.0">
<dependency id="System.Reflection.Emit.Lightweight" version="4.3.0" />
</group>
</dependencies>
</metadata>
<files>
<file src="bin\Release\net40\Irony.dll" target="lib\net40\Irony.dll" />
<file src="bin\Release\net45\Irony.dll" target="lib\net45\Irony.dll" />
<file src="bin\Release\netstandard2.0\Irony.dll" target="lib\netstandard2.0\Irony.dll" />
<file src="bin\Release\sl5\Irony.dll" target="lib\sl5\Irony.dll" />
</files>
</package>
2 changes: 1 addition & 1 deletion Languages/Refal.UnitTests/Refal.UnitTests.VsTest.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Refal.UnitTests</RootNamespace>
<AssemblyName>Refal.UnitTests.VsTest</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<TargetFrameworkProfile />
Expand Down
2 changes: 1 addition & 1 deletion Nuget/PackAll.bat
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
SET pver=1.1.0
SET pver=1.2.0
Echo Version: "%pver%"
del /q Nupkg\*.*
:: Need to delete some MSBuild-generated temp files (with .cs extension)
Expand Down
2 changes: 0 additions & 2 deletions Nuget/PackageSpecs/Irony.Interpreter.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
</metadata>

<files>
<file src="..\..\Irony.Interpreter\bin\Release\net40\Irony.Interpreter.dll" target="lib\net40" />
<file src="..\..\Irony.Interpreter\bin\Release\net40\Irony.Interpreter.pdb" target="lib\net40" />
<file src="..\..\Irony.Interpreter\bin\Release\netstandard2.0\Irony.Interpreter.dll" target="lib\netstandard2.0" />
<file src="..\..\Irony.Interpreter\bin\Release\netstandard2.0\Irony.Interpreter.pdb" target="lib\netstandard2.0" />
</files>
Expand Down
2 changes: 0 additions & 2 deletions Nuget/PackageSpecs/Irony.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
</metadata>

<files>
<file src="..\..\Irony\bin\Release\net40\Irony.dll" target="lib\net40" />
<file src="..\..\Irony\bin\Release\net40\Irony.pdb" target="lib\net40" />
<file src="..\..\Irony\bin\Release\netstandard2.0\Irony.dll" target="lib\netstandard2.0" />
<file src="..\..\Irony\bin\Release\netstandard2.0\Irony.pdb" target="lib\netstandard2.0" />
</files>
Expand Down
2 changes: 1 addition & 1 deletion Nuget/PushAll.bat
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
SET pver=1.1.0
SET pver=1.2.0
Echo Version: "%pver%"
dir Nupkg\*.nupkg
@echo off
Expand Down
Loading

0 comments on commit b8330ef

Please sign in to comment.