Skip to content

Commit

Permalink
Fix TargetFramework
Browse files Browse the repository at this point in the history
  • Loading branch information
ghost1372 committed Nov 18, 2024
1 parent 2d05b2f commit a74e2bb
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 16 deletions.
6 changes: 4 additions & 2 deletions DevWinUI.slnx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<Solution>
<Folder Name="/Solution Items/" Id="33905DB2-64FA-4677-9694-9064DC5A0372">
<File Path=".github/workflows/dotnet-release.yml" />
<File Path="AppData.Schema.json" />
<File Path="Clean-obj-bin.bat" />
<File Path="Directory.Build.props" />
Expand All @@ -12,14 +11,17 @@
<Folder Name="/VSIX_Extension/" Id="55c3cdfc-dabe-4658-ada9-aa32a6371d9b">
<Project Path="VSIX/DevWinUI_Template/DevWinUI_Template/DevWinUI_Template.csproj" Id="84913ae7-791a-451d-b4c6-c2c93207d9ff" />
</Folder>
<Folder Name="/VSIX_Extension/Templates/" Id="02ea681e-c7d8-13c7-8484-4ac65e1b71e8">
<Folder Name="/VSIX_Extension/Templates/" Id="9A3152D3-EAED-497A-BA1E-9792B5EA0DF5">
<Project Path="VSIX/DevWinUI_Template/WinUIApp-Blank-UnitTest/WinUIApp-Blank-UnitTest.csproj" Id="b8948970-c773-4711-9839-ba3a311a2f2a" />
<Project Path="VSIX/DevWinUI_Template/WinUIApp-Blank/WinUIApp-Blank.csproj" Id="aaf6a3c7-a34b-440c-a31b-04a6e07cb344" />
<Project Path="VSIX/DevWinUI_Template/WinUIApp-MVVM-NavigationView/WinUIApp-MVVM-NavigationView.csproj" Id="0e3decea-492d-4ff6-b77e-4e68e6affa90" />
<Project Path="VSIX/DevWinUI_Template/WinUIApp-MVVM/WinUIApp-MVVM.csproj" Id="df24dc85-9ed7-4697-85a0-ad2bed5e7916" />
<Project Path="VSIX/DevWinUI_Template/WinUIApp-NavigationView/WinUIApp-NavigationView.csproj" Id="4c1692ff-c0b8-49fb-948d-090160e0e63a" />
<Project Path="VSIX/DevWinUI_Template/WinUIApp/WinUIApp.csproj" Id="d9c038b7-6a62-4945-a030-4ac7597f53ca" />
</Folder>
<Folder Name="/Workflows/" Id="02ea681e-c7d8-13c7-8484-4ac65e1b71e8">
<File Path=".github/workflows/dotnet-release.yml" />
</Folder>
<Project Path="dev/DevWinUI.ContextMenu/DevWinUI.ContextMenu.csproj" Id="a95cc543-1958-4754-a79a-1f8bd1ca2dac" />
<Project Path="dev/DevWinUI.Controls/DevWinUI.Controls.csproj" Id="19a8b4a4-dcde-4a2f-9874-6a0315609ee8" />
<Project Path="dev/DevWinUI.Gallery/DevWinUI.Gallery.csproj">
Expand Down
5 changes: 2 additions & 3 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
<CommunityToolkitMediaVersion>8.2.241112-preview1</CommunityToolkitMediaVersion>
<Win2dVersion>1.3.0</Win2dVersion>
<DebugTargetFramework>net9.0-windows10.0.19041.0</DebugTargetFramework>
<TargetFramework>net9.0-windows10.0.19041.0</TargetFramework>
<NoWarn>WMC1506;WMC0001;CA1416;CS8632;CS0067;CS0078;CS0649;CS0414;NU1903;NU1902</NoWarn>

<OutputPath Condition="'$(MSBuildProjectName)' != $(GalleryAppName)">$(SolutionDir)Output\</OutputPath>
Expand All @@ -32,7 +31,7 @@
<PackageIcon>icon.png</PackageIcon>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<PackageReadmeFile>README.md</PackageReadmeFile>
<Authors>DevWinUI</Authors>
<Authors>Mahdi Hosseini</Authors>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<GeneratePackageOnBuild Condition="'$(Configuration)' != 'Debug' And '$(MSBuildProjectName)' != $(GalleryAppName)">True</GeneratePackageOnBuild>
Expand All @@ -44,7 +43,7 @@

<!-- The NuGet versions of dependencies to build against. -->
<ItemGroup Condition="'$(MSBuildProjectName)' != $(ContextMenuLibName)">
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.241106002" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.240923002" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" />
</ItemGroup>

Expand Down
6 changes: 3 additions & 3 deletions dev/DevWinUI.ContextMenu/DevWinUI.ContextMenu.csproj
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Version>8.0.0</Version>
<Version>8.0.0-Preview1</Version>
<AssemblyName>$(BaseNamespace).ContextMenu</AssemblyName>
<PackageId>$(BaseNamespace).ContextMenu</PackageId>
<Description></Description>
<PackageTags></PackageTags>
<Description>Create a New Context Menu Item for Windows 11/10 working with WinUI, WPF And all platforms that support .NET 8, 9 and package identity</Description>
<PackageTags>winui WindDevUI WinDevUIContextMenu contextmenu contextmenuextensions wpf packaged winform winui3 win11 xaml settings theme styles projectreunion winappsdk windowsappsdk wasdk reunion contextmenu shell WinUICommunity</PackageTags>
</PropertyGroup>
<ItemGroup>
<Content Include="ContextMenuCustomHost.dll">
Expand Down
8 changes: 5 additions & 3 deletions dev/DevWinUI.Controls/DevWinUI.Controls.csproj
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Version>8.0.0</Version>
<Version>8.0.0-Preview1</Version>
<PackageId>$(BaseNamespace).Controls</PackageId>
<AssemblyName>$(BaseNamespace).Controls</AssemblyName>
<Description></Description>
<PackageTags></PackageTags>
<Description>
Experience WinUI 3 quickly and easily with the help of DevWinUI.Controls, Everything you need to develop an application is gathered in one place. DevWinUI.Controls Includes custom controls, styles, landingPages and win2d.
</Description>
<PackageTags>winui winui3 win11 xaml DevWinUI DevWinUI.Controls SettingsUI Components settings theme styles projectreunion winappsdk windowsappsdk wasdk reunion SettingsControls settingsexpander settingscard landingPages win2d</PackageTags>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="CommunityToolkit.WinUI.Media" Version="$(CommunityToolkitMediaVersion)" />
Expand Down
4 changes: 2 additions & 2 deletions dev/DevWinUI.Gallery/DevWinUI.Gallery.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>$(DebugTargetFramework)</TargetFramework>
<TargetFramework>net9.0-windows10.0.19041.0</TargetFramework>
<RootNamespace>$(BaseNamespace)Gallery</RootNamespace>
<ApplicationManifest>app.manifest</ApplicationManifest>
<Platforms>x86;x64;ARM64</Platforms>
Expand All @@ -14,7 +14,7 @@
<WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
<WindowsPackageType Condition="'$(GITHUB_ACTIONS)'=='true'">None</WindowsPackageType>
<ApplicationIcon>Assets\icon.ico</ApplicationIcon>
<Version>8.0.0</Version>
<Version>8.0.0-Preview1</Version>

<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
<NoWarn>NU1903;NU1902;CS8632;WMC1506;WMC1006</NoWarn>
Expand Down
6 changes: 3 additions & 3 deletions dev/DevWinUI/DevWinUI.csproj
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Version>8.0.0</Version>
<Version>8.0.0-Preview1</Version>
<AssemblyName>$(BaseNamespace)</AssemblyName>
<PackageId>$(BaseNamespace)</PackageId>
<Description></Description>
<PackageTags></PackageTags>
<Description>Experience WinUI 3 quickly and easily with the help of Core, Everything you need to develop an application is gathered in one place. Helpers, Extensions...</Description>
<PackageTags>winui winui3 win11 xaml core DevWinUI Common SettingsUI settings theme styles projectreunion winappsdk windowsappsdk wasdk reunion SettingsControls settingsexpander settingscard</PackageTags>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Windows.CsWin32" Version="$(CsWin32Version)">
Expand Down

0 comments on commit a74e2bb

Please sign in to comment.