Skip to content

Commit

Permalink
init dotnet8 branch
Browse files Browse the repository at this point in the history
  • Loading branch information
Manicsteiner committed Nov 13, 2024
1 parent d73a7a9 commit 50bc15d
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 146 deletions.
14 changes: 10 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ jobs:
- msbuild_target: ARM64
lowercase_target: arm64
crossbuild_target: x86_arm64
dotnet_version: [6.0, 8.0]
env:
TARGET_PLATFORM: ${{ matrix.msbuild_target }}
runs-on: windows-latest
Expand All @@ -34,6 +35,10 @@ jobs:
show-progress: false
- name: Add msbuild to PATH
uses: microsoft/setup-msbuild@v2
- name: Setup dotnet SDK
uses: actions/setup-dotnet@v4
with:
dotnet-version: ${{ matrix.dotnet_version }}.x

# Build libwebp
# mkdir libwebp\\${{ matrix.msbuild_target }}build
Expand All @@ -48,17 +53,18 @@ jobs:
# Restore NuGet packages
- name: Restore NuGet packages
run: nuget restore
run: dotnet restore
# Build the solution
- name: Build
run: msbuild /p:Configuration=Release /p:Platform="${{ matrix.lowercase_target }}" /p:TargetFrameworkVersion=v4.6.2 mvlView.sln
run: dotnet build mvlView.sln -c Release -f net${{ matrix.dotnet_version }}-windows7.0 /p:Platform="${{ matrix.lowercase_target }}"

# Publish the artifacts
- name: Publish Artifact
if: success()
uses: actions/upload-artifact@v4
with:
name: MvlView_${{ matrix.lowercase_target }}_net462
path: mvlView/bin/${{ matrix.lowercase_target }}/Release
name: MvlView_${{ matrix.lowercase_target }}_net${{ matrix.dotnet_version }}
path: mvlView/bin/${{ matrix.lowercase_target }}/Release/net${{ matrix.dotnet_version }}-windows7.0

release:
if: startsWith(github.ref, 'refs/tags/v')
Expand Down
11 changes: 2 additions & 9 deletions mvlView.sln
Original file line number Diff line number Diff line change
@@ -1,32 +1,25 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.9.34723.18
VisualStudioVersion = 17.7.34031.279
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mvlView", "mvlView\mvlView.csproj", "{3B163597-4A3F-4117-B1A0-FDDCC69D62B6}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "mvlView", "mvlView\mvlView.csproj", "{3B163597-4A3F-4117-B1A0-FDDCC69D62B6}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|ARM64 = Debug|ARM64
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|ARM64 = Release|ARM64
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{3B163597-4A3F-4117-B1A0-FDDCC69D62B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3B163597-4A3F-4117-B1A0-FDDCC69D62B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3B163597-4A3F-4117-B1A0-FDDCC69D62B6}.Debug|ARM64.ActiveCfg = Debug|ARM64
{3B163597-4A3F-4117-B1A0-FDDCC69D62B6}.Debug|ARM64.Build.0 = Debug|ARM64
{3B163597-4A3F-4117-B1A0-FDDCC69D62B6}.Debug|x64.ActiveCfg = Debug|x64
{3B163597-4A3F-4117-B1A0-FDDCC69D62B6}.Debug|x64.Build.0 = Debug|x64
{3B163597-4A3F-4117-B1A0-FDDCC69D62B6}.Debug|x86.ActiveCfg = Debug|x86
{3B163597-4A3F-4117-B1A0-FDDCC69D62B6}.Debug|x86.Build.0 = Debug|x86
{3B163597-4A3F-4117-B1A0-FDDCC69D62B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3B163597-4A3F-4117-B1A0-FDDCC69D62B6}.Release|Any CPU.Build.0 = Release|Any CPU
{3B163597-4A3F-4117-B1A0-FDDCC69D62B6}.Release|ARM64.ActiveCfg = Release|ARM64
{3B163597-4A3F-4117-B1A0-FDDCC69D62B6}.Release|ARM64.Build.0 = Release|ARM64
{3B163597-4A3F-4117-B1A0-FDDCC69D62B6}.Release|x64.ActiveCfg = Release|x64
Expand Down
2 changes: 1 addition & 1 deletion mvlView/Form1.cs
Original file line number Diff line number Diff line change
Expand Up @@ -572,7 +572,7 @@ private void aboutToolStripMenuItem_Click(object sender, EventArgs e)
if(MessageBox.Show("Developed by Wetor@github, Manicsteiner@github\rThanks support of ningshanwutuobang@github\rClick OK to open the github page.",
"About", MessageBoxButtons.OKCancel) == DialogResult.OK)
{
System.Diagnostics.Process.Start("https://github.com/Manicsteiner/mvl_preview");
System.Diagnostics.Process.Start(new System.Diagnostics.ProcessStartInfo("https://github.com/Manicsteiner/mvl_preview") { UseShellExecute = true});
}
}

Expand Down
2 changes: 1 addition & 1 deletion mvlView/Properties/Settings.Designer.cs

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

146 changes: 21 additions & 125 deletions mvlView/mvlView.csproj
Original file line number Diff line number Diff line change
@@ -1,161 +1,57 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\Microsoft.UI.Xaml.2.5.0\build\Microsoft.UI.Xaml.props" Condition="Exists('..\packages\Microsoft.UI.Xaml.2.5.0\build\Microsoft.UI.Xaml.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{3B163597-4A3F-4117-B1A0-FDDCC69D62B6}</ProjectGuid>
<TargetFrameworks>net6.0-windows7.0;net8.0-windows7.0</TargetFrameworks>
<OutputType>WinExe</OutputType>
<RootNamespace>mvlView</RootNamespace>
<AssemblyName>mvlView</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Deterministic>true</Deterministic>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>x64</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<UseWindowsForms>true</UseWindowsForms>
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
<Platforms>x64;x86;ARM64</Platforms>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x64\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>true</Prefer32Bit>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
<OutputPath>bin\x64\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x64</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>true</Prefer32Bit>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x86\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<OutputPath>bin\x86\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<PropertyGroup>
<StartupObject>mvlView.Program</StartupObject>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM64'">
<PlatformTarget>ARM64</PlatformTarget>
<OutputPath>bin\ARM64\Debug\</OutputPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM64'">
<PlatformTarget>ARM64</PlatformTarget>
<OutputPath>bin\ARM64\Release\</OutputPath>
</PropertyGroup>
<ItemGroup>
<Reference Include="Imazen.WebP, Version=10.0.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Imazen.WebP.10.0.1\lib\net45\Imazen.WebP.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Deployment" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
<PackageReference Include="Imazen.WebP" Version="10.0.1" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>
<ItemGroup>
<Compile Include="Format.cs" />
<Compile Include="Kaleido.cs" />
<Compile Include="Mvl.cs" />
<Compile Include="Form1.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Form1.Designer.cs">
<DependentUpon>Form1.cs</DependentUpon>
</Compile>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<EmbeddedResource Include="Form1.resx">
<DependentUpon>Form1.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>
</Compile>
<None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
<Compile Include="Properties\Settings.Designer.cs">
<Compile Update="Properties\Settings.Designer.cs">
<DesignTimeSharedInput>True</DesignTimeSharedInput>
<AutoGen>True</AutoGen>
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
<None Update="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息,请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Microsoft.UI.Xaml.2.5.0\build\Microsoft.UI.Xaml.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.UI.Xaml.2.5.0\build\Microsoft.UI.Xaml.props'))" />
</Target>
<PropertyGroup>
<PostBuildEvent>copy "$(SolutionDir)libwebp\$(PlatformName)build\libwebp.dll" "$(TargetDir)libwebp.dll"
copy "$(SolutionDir)libwebp\$(PlatformName)build\libsharpyuv.dll" "$(TargetDir)libsharpyuv.dll"
copy "$(SolutionDir)libwebp\$(PlatformName)build\libwebpdecoder.dll" "$(TargetDir)libwebpdecoder.dll"
copy "$(SolutionDir)libwebp\$(PlatformName)build\libwebpdemux.dll" "$(TargetDir)libwebpdemux.dll"</PostBuildEvent>
<PostBuildEvent>copy "$(SolutionDir)libwebp\$(Platform)build\libwebp.dll" "$(TargetDir)libwebp.dll"
copy "$(SolutionDir)libwebp\$(Platform)build\libsharpyuv.dll" "$(TargetDir)libsharpyuv.dll"
copy "$(SolutionDir)libwebp\$(Platform)build\libwebpdecoder.dll" "$(TargetDir)libwebpdecoder.dll"
copy "$(SolutionDir)libwebp\$(Platform)build\libwebpdemux.dll" "$(TargetDir)libwebpdemux.dll"</PostBuildEvent>
<SupportedOSPlatformVersion>7.0</SupportedOSPlatformVersion>
</PropertyGroup>
</Project>
6 changes: 0 additions & 6 deletions mvlView/packages.config

This file was deleted.

0 comments on commit 50bc15d

Please sign in to comment.