Skip to content

Commit

Permalink
Prep for release.
Browse files Browse the repository at this point in the history
  • Loading branch information
@FirehawkV21
FirehawkV21 committed Nov 11, 2020
1 parent b9a9dba commit c3d0a47
Show file tree
Hide file tree
Showing 4 changed files with 79 additions and 70 deletions.
105 changes: 53 additions & 52 deletions RMMVCookTool.CLI/RMMVCookTool.CLI.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,85 +1,86 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>.net5</TargetFramework>
<AssemblyVersion>2.0.0.20296</AssemblyVersion>
<FileVersion>2.0.0.20296</FileVersion>
<ApplicationIcon>Brick-02-WF.ico</ApplicationIcon>
<StartupObject>RMMVCookTool.CLI.Program</StartupObject>
<AssemblyTitle>RPG Maker MV Cook Tool (CLI Version)</AssemblyTitle>
<PackageId>StudioACE.RMMVCookTool.CLI</PackageId>
<Version>2.0.0-20201005</Version>
<Authors>AceOfAces</Authors>
<Company>Studio ACE</Company>
<Product>RPG Maker MV Cook Tool</Product>
<Description>Command-line version of the RPG Maker MV Cook Tool.</Description>
<PackageLicenseUrl></PackageLicenseUrl>
<PackageProjectUrl>https://studioace.wordpress.com/projects/rpg-maker-mv-cook-tool/</PackageProjectUrl>
<RepositoryUrl>https://github.com/acemod13/RMMVCookTool</RepositoryUrl>
<TieredCompilation>true</TieredCompilation>
<TieredCompilationQuickJit>true</TieredCompilationQuickJit>
<Copyright>Copyright © 2019 Studio ACE. RPG Maker MV: KADOKAWA/YOJI OJIMA</Copyright>
<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
<PublishReadyToRun>true</PublishReadyToRun>
<PublishTrimmed>false</PublishTrimmed>
<RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
<NeutralLanguage>en</NeutralLanguage>
<Platforms>AnyCPU;x86;x64</Platforms>
<OutputType>Exe</OutputType>
<TargetFramework>.net5</TargetFramework>
<AssemblyVersion>2.0.0.20296</AssemblyVersion>
<FileVersion>2.0.0.20296</FileVersion>
<ApplicationIcon>Brick-02-WF.ico</ApplicationIcon>
<StartupObject>RMMVCookTool.CLI.Program</StartupObject>
<AssemblyTitle>RPG Maker MV Cook Tool (CLI Version)</AssemblyTitle>
<PackageId>StudioACE.RMMVCookTool.CLI</PackageId>
<Version>2.0.0-20201005</Version>
<Authors>AceOfAces</Authors>
<Company>Studio ACE</Company>
<Product>RPG Maker MV Cook Tool</Product>
<Description>Command-line version of the RPG Maker MV Cook Tool.</Description>
<PackageLicenseUrl></PackageLicenseUrl>
<PackageProjectUrl>https://studioace.wordpress.com/projects/rpg-maker-mv-cook-tool/</PackageProjectUrl>
<RepositoryUrl>https://github.com/acemod13/RMMVCookTool</RepositoryUrl>
<TieredCompilation>true</TieredCompilation>
<TieredCompilationQuickJit>true</TieredCompilationQuickJit>
<Copyright>Copyright © 2019 Studio ACE. RPG Maker MV: KADOKAWA/YOJI OJIMA</Copyright>
<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
<PublishReadyToRun>true</PublishReadyToRun>
<PublishTrimmed>false</PublishTrimmed>
<RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
<NeutralLanguage>en</NeutralLanguage>
<Platforms>AnyCPU;x86;x64</Platforms>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<FileAlignment>4096</FileAlignment>
<FileAlignment>4096</FileAlignment>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<FileAlignment>4096</FileAlignment>
<FileAlignment>4096</FileAlignment>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
<FileAlignment>4096</FileAlignment>
<FileAlignment>4096</FileAlignment>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\RMMVCookTool.Core\RMMVCookTool.Core.csproj" />
<ProjectReference Include="..\RMMVCookTool.Core\RMMVCookTool.Core.csproj" />
</ItemGroup>

<ItemGroup>
<None Include="..\LICENSE.txt">
<Pack>True</Pack>
<PackagePath></PackagePath>
</None>
<None Include="..\LICENSE.txt">
<Pack>True</Pack>
<PackagePath></PackagePath>
</None>
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.1" />
<PackageReference Include="Microsoft.NETCore.Platforms" Version="5.0.0" />
<PackageReference Include="Microsoft.NETCore.Targets" Version="5.0.0" />
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.1" />
<PackageReference Include="Microsoft.NETCore.Platforms" Version="5.0.0" />
<PackageReference Include="Microsoft.NETCore.Targets" Version="5.0.0" />
</ItemGroup>

<ItemGroup>
<Compile Update="Properties\Resources.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Update="Properties\Resources.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
</ItemGroup>

<ItemGroup>
<EmbeddedResource Update="Properties\Resources.en.resx">
<Generator></Generator>
</EmbeddedResource>
<EmbeddedResource Update="Properties\Resources.el.resx">
<Generator></Generator>
</EmbeddedResource>
<EmbeddedResource Update="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Update="Properties\Resources.en.resx">
<Generator></Generator>
</EmbeddedResource>
<EmbeddedResource Update="Properties\Resources.el.resx">
<Generator></Generator>
</EmbeddedResource>
<EmbeddedResource Update="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>

<ItemGroup>
<PackageReference Update="Microsoft.NETCore.App" />
<PackageReference Update="Microsoft.NETCore.App" />
</ItemGroup>

</Project>
30 changes: 20 additions & 10 deletions RMMVCookTool.Core/RMMVCookTool.Core.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,29 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<AssemblyVersion>2.0.0.20316</AssemblyVersion>
<FileVersion>2.0.0.20316</FileVersion>
<Version>2.0.0-20200810</Version>
<Platforms>AnyCPU;x64;x86</Platforms>
<TargetFramework>net5.0</TargetFramework>
<AssemblyVersion>2.0.1.20316</AssemblyVersion>
<FileVersion>2.0.1.20316</FileVersion>
<Version>2.0.1-20200810</Version>
<Platforms>AnyCPU;x64;x86</Platforms>
<AssemblyTitle>RPG Maker MV Cook Tool Core</AssemblyTitle>
<Authors>AceOfAces</Authors>
<Company>Studio ACE</Company>
<Product>RPG Maker MV Cook Tool</Product>
<TieredCompilation>true</TieredCompilation>
<TieredCompilationQuickJit>true</TieredCompilationQuickJit>
<PackageProjectUrl>https://studioace.wordpress.com/projects/rpg-maker-mv-cook-tool/</PackageProjectUrl>
<RepositoryUrl>https://github.com/acemod13/RMMVCookTool</RepositoryUrl>
<Description>The core library of the RPG Maker MV Cook Tool.</Description>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
</ItemGroup>

</Project>
6 changes: 2 additions & 4 deletions RMMVCookTool.GUI/MainWindow.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -281,10 +281,8 @@ private void Window_Loaded(object sender, RoutedEventArgs e)
ProgramVersionLabel.Content = ProgramVersionLabel.Content + @" (" + version + @")";

byte[] loader = Encoding.ASCII.GetBytes(Properties.Resources.Manual);
using (MemoryStream stream = new MemoryStream(loader))
{
UserManualBox.Selection.Load(stream, DataFormats.Rtf);
}
using MemoryStream stream = new MemoryStream(loader);
UserManualBox.Selection.Load(stream, DataFormats.Rtf);
}

private void BrowseSDKButton_Click(object sender, RoutedEventArgs e)
Expand Down
8 changes: 4 additions & 4 deletions RMMVCookTool.GUI/RMMVCookTool.GUI.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<OutputType>WinExe</OutputType>
<TargetFramework>.net5-windows</TargetFramework>
<UseWPF>true</UseWPF>
<AssemblyVersion>3.0.1.20316</AssemblyVersion>
<FileVersion>3.0.1.20316</FileVersion>
<AssemblyVersion>3.0.2.20316</AssemblyVersion>
<FileVersion>3.0.2.20316</FileVersion>
<ApplicationManifest>app.manifest</ApplicationManifest>
<ApplicationIcon>Brick-02-WF.ico</ApplicationIcon>
<NeutralLanguage>en</NeutralLanguage>
Expand All @@ -15,7 +15,7 @@
<Authors>AceOfAces</Authors>
<Company>Studio ACE</Company>
<Product>RPG Maker MV Cook Tool</Product>
<Version>3.0.1-20201009</Version>
<Version>3.0.2-20201111</Version>
<PublishReadyToRun>true</PublishReadyToRun>
<TieredCompilation>true</TieredCompilation>
<TieredCompilationQuickJit>true</TieredCompilationQuickJit>
Expand All @@ -39,7 +39,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="Ookii.Dialogs.Wpf.NETCore" Version="2.2.0-alpha.1" />
<PackageReference Include="Ookii.Dialogs.Wpf.NETCore" Version="2.2.1" />
</ItemGroup>

<ItemGroup>
Expand Down

0 comments on commit c3d0a47

Please sign in to comment.