Skip to content

Commit

Permalink
commit
Browse files Browse the repository at this point in the history
  • Loading branch information
Rcmcpe committed Mar 18, 2020
1 parent fba7a26 commit f8f0172
Show file tree
Hide file tree
Showing 3 changed files with 139 additions and 151 deletions.
62 changes: 28 additions & 34 deletions Arknights Automation Library/Arknights Automation Library.csproj
Original file line number Diff line number Diff line change
@@ -1,36 +1,30 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<RootNamespace>REVUnit.AutoArknights.Core</RootNamespace>
<AssemblyName>REVUnit.AutoArknights.Core</AssemblyName>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Flurl" Version="3.0.0-pre3" />
<PackageReference Include="Flurl.Http" Version="3.0.0-pre3" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="System.Drawing.Common" Version="4.7.0" />
<PackageReference Include="System.Reactive" Version="4.3.2" />
</ItemGroup>

<ItemGroup>
<None Update="adb\**">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Assets\**">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<Compile Remove="Automation Script\**" />
</ItemGroup>

<ItemGroup>
<Folder Include="Assets\Cache" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Crlib\Crlib\Crlib.csproj" />
<ProjectReference Include="..\REVUnit.ImageLocator\REVUnit.ImageLocator\REVUnit.ImageLocator.csproj" />
</ItemGroup>

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<RootNamespace>REVUnit.AutoArknights.Core</RootNamespace>
<AssemblyName>REVUnit.AutoArknights.Core</AssemblyName>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Flurl" Version="3.0.0-pre3"/>
<PackageReference Include="Flurl.Http" Version="3.0.0-pre3"/>
<PackageReference Include="Newtonsoft.Json" Version="12.0.3"/>
<PackageReference Include="System.Drawing.Common" Version="4.7.0"/>
<PackageReference Include="System.Reactive" Version="4.3.2"/>
</ItemGroup>
<ItemGroup>
<None Update="adb\**">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Assets\**">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<Compile Remove="Automation Script\**"/>
</ItemGroup>
<ItemGroup>
<Folder Include="Assets\Cache"/>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Crlib\Crlib\Crlib.csproj"/>
<ProjectReference Include="..\REVUnit.ImageLocator\REVUnit.ImageLocator\REVUnit.ImageLocator.csproj"/>
</ItemGroup>
</Project>
62 changes: 28 additions & 34 deletions Auto Arknights CLI/Auto Arknights CLI.csproj
Original file line number Diff line number Diff line change
@@ -1,36 +1,30 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework>
<RootNamespace>REVUnit.AutoArknights.CLI</RootNamespace>
<UseWindowsForms>true</UseWindowsForms>
<UseWPF>true</UseWPF>
<AssemblyName>Auto Arknights CLI</AssemblyName>
</PropertyGroup>

<PropertyGroup>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
<SelfContained>False</SelfContained>
<PublishSingleFile>False</PublishSingleFile>
<PublishReadyToRun>True</PublishReadyToRun>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\Arknights Automation Library\Arknights Automation Library.csproj" />
<ProjectReference Include="..\Crlib\Crlib\Crlib.csproj" />
</ItemGroup>

<ItemGroup>
<None Update="Config.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.2" />
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="3.1.2" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.2" />
</ItemGroup>

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework>
<RootNamespace>REVUnit.AutoArknights.CLI</RootNamespace>
<UseWindowsForms>true</UseWindowsForms>
<UseWPF>true</UseWPF>
<AssemblyName>Auto Arknights CLI</AssemblyName>
</PropertyGroup>
<PropertyGroup>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
<SelfContained>False</SelfContained>
<PublishSingleFile>False</PublishSingleFile>
<PublishReadyToRun>True</PublishReadyToRun>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Arknights Automation Library\Arknights Automation Library.csproj"/>
<ProjectReference Include="..\Crlib\Crlib\Crlib.csproj"/>
</ItemGroup>
<ItemGroup>
<None Update="Config.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.2"/>
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="3.1.2"/>
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.2"/>
</ItemGroup>
</Project>
166 changes: 83 additions & 83 deletions Auto Arknights GUI/Auto Arknights GUI.csproj
Original file line number Diff line number Diff line change
@@ -1,85 +1,85 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<OutputType>WinExe</OutputType>
<RootNamespace>REVUnit.AutoArknights.GUI</RootNamespace>
<UseWindowsForms>true</UseWindowsForms>
<UseWPF>true</UseWPF>
</PropertyGroup>
<PropertyGroup>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
<SelfContained>False</SelfContained>
<PublishSingleFile>False</PublishSingleFile>
<PublishReadyToRun>True</PublishReadyToRun>
</PropertyGroup>
<ItemGroup>
<Reference Include="MaterialDesignColors">
<HintPath>Dlls\MaterialDesignColors.dll</HintPath>
</Reference>
<Reference Include="MaterialDesignThemes.MahApps">
<HintPath>Dlls\MaterialDesignThemes.MahApps.dll</HintPath>
</Reference>
<Reference Include="MaterialDesignThemes.Wpf">
<HintPath>Dlls\MaterialDesignThemes.Wpf.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\Roboto\Roboto-Black.ttf" />
<Resource Include="Resources\Roboto\Roboto-BlackItalic.ttf" />
<Resource Include="Resources\Roboto\Roboto-Bold.ttf" />
<Resource Include="Resources\Roboto\Roboto-BoldItalic.ttf" />
<Resource Include="Resources\Roboto\Roboto-Italic.ttf" />
<Resource Include="Resources\Roboto\Roboto-Light.ttf" />
<Resource Include="Resources\Roboto\Roboto-LightItalic.ttf" />
<Resource Include="Resources\Roboto\Roboto-Medium.ttf" />
<Resource Include="Resources\Roboto\Roboto-MediumItalic.ttf" />
<Resource Include="Resources\Roboto\Roboto-Regular.ttf" />
<Resource Include="Resources\Roboto\Roboto-Thin.ttf" />
<Resource Include="Resources\Roboto\Roboto-ThinItalic.ttf" />
<Resource Include="Resources\Roboto\RobotoCondensed-Bold.ttf" />
<Resource Include="Resources\Roboto\RobotoCondensed-BoldItalic.ttf" />
<Resource Include="Resources\Roboto\RobotoCondensed-Italic.ttf" />
<Resource Include="Resources\Roboto\RobotoCondensed-Light.ttf" />
<Resource Include="Resources\Roboto\RobotoCondensed-LightItalic.ttf" />
<Resource Include="Resources\Roboto\RobotoCondensed-Regular.ttf" />
</ItemGroup>
<ItemGroup>
<Resource Include="FodyWeavers.xml" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="ControlzEx" Version="4.2.2" />
<PackageReference Include="DynamicData" Version="6.14.3" />
<PackageReference Include="Fody" Version="6.0.8" />
<PackageReference Include="MahApps.Metro" Version="1.6.5" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="Pharmacist.Common" Version="1.5.3" />
<PackageReference Include="ReactiveUI" Version="11.1.23" />
<PackageReference Include="ReactiveUI.Events.WPF" Version="11.1.23" />
<PackageReference Include="ReactiveUI.Fody" Version="11.1.23" />
<PackageReference Include="ReactiveUI.WPF" Version="11.1.23" />
<PackageReference Include="Splat" Version="9.3.11" />
<PackageReference Include="Splat.Drawing" Version="9.3.11" />
<PackageReference Include="System.Drawing.Primitives" Version="4.3.0" />
<PackageReference Include="System.Reactive" Version="4.3.2" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.7.0" />
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.3" />
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Arknights Automation Library\Arknights Automation Library.csproj" />
</ItemGroup>
<ItemGroup>
<Compile Update="Properties\Settings.Designer.cs">
<DesignTimeSharedInput>True</DesignTimeSharedInput>
<AutoGen>True</AutoGen>
<DependentUpon>Settings.settings</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<None Update="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
</ItemGroup>
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<OutputType>WinExe</OutputType>
<RootNamespace>REVUnit.AutoArknights.GUI</RootNamespace>
<UseWindowsForms>true</UseWindowsForms>
<UseWPF>true</UseWPF>
</PropertyGroup>
<PropertyGroup>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
<SelfContained>False</SelfContained>
<PublishSingleFile>False</PublishSingleFile>
<PublishReadyToRun>True</PublishReadyToRun>
</PropertyGroup>
<ItemGroup>
<Reference Include="MaterialDesignColors">
<HintPath>Dlls\MaterialDesignColors.dll</HintPath>
</Reference>
<Reference Include="MaterialDesignThemes.MahApps">
<HintPath>Dlls\MaterialDesignThemes.MahApps.dll</HintPath>
</Reference>
<Reference Include="MaterialDesignThemes.Wpf">
<HintPath>Dlls\MaterialDesignThemes.Wpf.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\Roboto\Roboto-Black.ttf"/>
<Resource Include="Resources\Roboto\Roboto-BlackItalic.ttf"/>
<Resource Include="Resources\Roboto\Roboto-Bold.ttf"/>
<Resource Include="Resources\Roboto\Roboto-BoldItalic.ttf"/>
<Resource Include="Resources\Roboto\Roboto-Italic.ttf"/>
<Resource Include="Resources\Roboto\Roboto-Light.ttf"/>
<Resource Include="Resources\Roboto\Roboto-LightItalic.ttf"/>
<Resource Include="Resources\Roboto\Roboto-Medium.ttf"/>
<Resource Include="Resources\Roboto\Roboto-MediumItalic.ttf"/>
<Resource Include="Resources\Roboto\Roboto-Regular.ttf"/>
<Resource Include="Resources\Roboto\Roboto-Thin.ttf"/>
<Resource Include="Resources\Roboto\Roboto-ThinItalic.ttf"/>
<Resource Include="Resources\Roboto\RobotoCondensed-Bold.ttf"/>
<Resource Include="Resources\Roboto\RobotoCondensed-BoldItalic.ttf"/>
<Resource Include="Resources\Roboto\RobotoCondensed-Italic.ttf"/>
<Resource Include="Resources\Roboto\RobotoCondensed-Light.ttf"/>
<Resource Include="Resources\Roboto\RobotoCondensed-LightItalic.ttf"/>
<Resource Include="Resources\Roboto\RobotoCondensed-Regular.ttf"/>
</ItemGroup>
<ItemGroup>
<Resource Include="FodyWeavers.xml"/>
</ItemGroup>
<ItemGroup>
<PackageReference Include="ControlzEx" Version="4.2.2"/>
<PackageReference Include="DynamicData" Version="6.14.3"/>
<PackageReference Include="Fody" Version="6.0.8"/>
<PackageReference Include="MahApps.Metro" Version="1.6.5"/>
<PackageReference Include="Microsoft.CSharp" Version="4.7.0"/>
<PackageReference Include="Newtonsoft.Json" Version="12.0.3"/>
<PackageReference Include="Pharmacist.Common" Version="1.5.3"/>
<PackageReference Include="ReactiveUI" Version="11.1.23"/>
<PackageReference Include="ReactiveUI.Events.WPF" Version="11.1.23"/>
<PackageReference Include="ReactiveUI.Fody" Version="11.1.23"/>
<PackageReference Include="ReactiveUI.WPF" Version="11.1.23"/>
<PackageReference Include="Splat" Version="9.3.11"/>
<PackageReference Include="Splat.Drawing" Version="9.3.11"/>
<PackageReference Include="System.Drawing.Primitives" Version="4.3.0"/>
<PackageReference Include="System.Reactive" Version="4.3.2"/>
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.7.0"/>
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.3"/>
<PackageReference Include="System.ValueTuple" Version="4.5.0"/>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Arknights Automation Library\Arknights Automation Library.csproj"/>
</ItemGroup>
<ItemGroup>
<Compile Update="Properties\Settings.Designer.cs">
<DesignTimeSharedInput>True</DesignTimeSharedInput>
<AutoGen>True</AutoGen>
<DependentUpon>Settings.settings</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<None Update="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
</ItemGroup>
</Project>

0 comments on commit f8f0172

Please sign in to comment.