-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Upgrade WPF projects to .NET 10 #12922
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
gewarren
wants to merge
2
commits into
dotnet:main
Choose a base branch
from
gewarren:upgrade-wpf
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
47 changes: 14 additions & 33 deletions
47
...VS_Snippets_Wpf/AnimatePropertyStoryboards/XAML/AnimateProperty_Storyboards_markup.csproj
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,62 +1,43 @@ | ||
| <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <PropertyGroup> | ||
| <AssemblyName>AnimatingWithStoryboards_markup</AssemblyName> | ||
| <TargetType>winexe</TargetType> | ||
| <Configuration Condition="'$(Configuration)'==''">Debug</Configuration> | ||
| <ApplicationIcon>App.ico</ApplicationIcon> | ||
| <OutputType>WinExe</OutputType> | ||
| <TargetFramework>net10.0-windows</TargetFramework> | ||
| <UseWPF>true</UseWPF> | ||
| <EnableDefaultItems>false</EnableDefaultItems> | ||
| <RootNamespace>Microsoft.Samples.Animation.AnimatingWithStoryboards</RootNamespace> | ||
| <ProjectGuid>{77076AC3-80DC-41F1-9C3C-700A2561709C}</ProjectGuid> | ||
| <OutputPath>bin\$(Configuration)\</OutputPath> | ||
| <TargetFrameworkVersion>v4.8</TargetFrameworkVersion> | ||
| <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> | ||
| <TargetFrameworkProfile /> | ||
| <ProductVersion>10.0.20821</ProductVersion> | ||
| <AssemblyName>AnimatingWithStoryboards_markup</AssemblyName> | ||
| </PropertyGroup> | ||
| <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> | ||
| <ItemGroup> | ||
| <Reference Include="System" /> | ||
| <Reference Include="System.Xml" /> | ||
| <Reference Include="System.Data" /> | ||
| <Reference Include="WindowsBase" /> | ||
| <Reference Include="PresentationCore" /> | ||
| <Reference Include="PresentationFramework" /> | ||
| <Reference Include="System.Xaml"> | ||
| <RequiredTargetFramework>4.0</RequiredTargetFramework> | ||
| </Reference> | ||
| <Reference Include="UIAutomationProvider" /> | ||
| <Reference Include="UIAutomationTypes" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ApplicationDefinition Include="app.xaml"> | ||
| <Generator>MSBuild:Compile</Generator> | ||
| <SubType>Designer</SubType> | ||
| </ApplicationDefinition> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <Page Include="DataTriggerStoryboardExample.xaml"> | ||
| <Generator>MSBuild:Compile</Generator> | ||
| <SubType>Designer</SubType> | ||
| </Page> | ||
| <Page Include="SampleViewer.xaml"> | ||
| <Generator>MSBuild:Compile</Generator> | ||
| <SubType>Designer</SubType> | ||
| </Page> | ||
| <Page Include="StoryboardExample.xaml"> | ||
| <Generator>MSBuild:Compile</Generator> | ||
| <SubType>Designer</SubType> | ||
| </Page> | ||
| <Page Include="PropertyTriggerExample.xaml"> | ||
| <Generator>MSBuild:Compile</Generator> | ||
| <SubType>Designer</SubType> | ||
| </Page> | ||
| <Page Include="StyleStoryboardExample.xaml"> | ||
| <Generator>MSBuild:Compile</Generator> | ||
| <SubType>Designer</SubType> | ||
| </Page> | ||
| <Page Include="ControlTemplateStoryboardExample.xaml"> | ||
| <Generator>MSBuild:Compile</Generator> | ||
| <SubType>Designer</SubType> | ||
| </Page> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <Resource Include="App.ico" /> | ||
| </ItemGroup> | ||
| </Project> | ||
|
|
||
| </Project> |
87 changes: 26 additions & 61 deletions
87
snippets/xaml/VS_Snippets_Wpf/ApplicationMainWindowSnippets/XAML/XAML.csproj
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,85 +1,50 @@ | ||
| <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <PropertyGroup> | ||
| <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | ||
| <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | ||
| <ProjectGuid>{81575C54-3234-4369-B1B5-C3D0F4D98390}</ProjectGuid> | ||
| <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> | ||
| <OutputType>WinExe</OutputType> | ||
| <TargetFramework>net10.0-windows</TargetFramework> | ||
| <UseWPF>true</UseWPF> | ||
| <EnableDefaultItems>false</EnableDefaultItems> | ||
| <RootNamespace>XAML</RootNamespace> | ||
| <AssemblyName>XAML</AssemblyName> | ||
| <WarningLevel>4</WarningLevel> | ||
| <OutputType>winexe</OutputType> | ||
| <ApplicationVersion>1.0.0.*</ApplicationVersion> | ||
| <!-- Most people will use Publish dialog in Visual Studio to increment this --> | ||
| <BootstrapperEnabled>false</BootstrapperEnabled> | ||
| <TargetFrameworkVersion>v4.8</TargetFrameworkVersion> | ||
| <TargetFrameworkProfile /> | ||
| <ProductVersion>10.0.20821</ProductVersion> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> | ||
| <DebugSymbols>true</DebugSymbols> | ||
| <DebugType>full</DebugType> | ||
| <Optimize>false</Optimize> | ||
| <OutputPath>.\bin\Debug\</OutputPath> | ||
| <DefineConstants>DEBUG;TRACE</DefineConstants> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | ||
| <DebugSymbols>false</DebugSymbols> | ||
| <Optimize>true</Optimize> | ||
| <OutputPath>.\bin\Release\</OutputPath> | ||
| <DefineConstants>TRACE</DefineConstants> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <Reference Include="System" /> | ||
| <Reference Include="System.Data" /> | ||
| <Reference Include="System.Xml" /> | ||
| <Reference Include="WindowsBase" /> | ||
| <Reference Include="PresentationCore" /> | ||
| <Reference Include="PresentationFramework" /> | ||
| <Reference Include="System.Xaml"> | ||
| <RequiredTargetFramework>4.0</RequiredTargetFramework> | ||
| </Reference> | ||
| <Reference Include="UIAutomationProvider" /> | ||
| <Reference Include="UIAutomationTypes" /> | ||
| <Reference Include="ReachFramework" /> | ||
| <Reference Include="System.Printing" /> | ||
| <Reference Include="System.ServiceModel" /> | ||
| <Reference Include="System.Runtime.Serialization" /> | ||
| <Reference Include="System.IdentityModel" /> | ||
| <ApplicationDefinition Include="App.xaml" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ApplicationDefinition Include="App.xaml" /> | ||
| <Page Include="MainPage.xaml" /> | ||
| <Page Include="StartupWindow.xaml" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <Compile Include="StartupWindow.xaml.cs"> | ||
| <DependentUpon>StartupWindow.xaml</DependentUpon> | ||
| <SubType>Code</SubType> | ||
| </Compile> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <Compile Include="MainPage.xaml.cs"> | ||
| <DependentUpon>MainPage.xaml</DependentUpon> | ||
| </Compile> | ||
| <Compile Include="Properties\AssemblyInfo.cs" /> | ||
| <Compile Include="Properties\Resources.Designer.cs"> | ||
| <DependentUpon>Resources.resx</DependentUpon> | ||
| </Compile> | ||
| <Compile Include="Properties\Settings.Designer.cs"> | ||
| <DependentUpon>Settings.settings</DependentUpon> | ||
| </Compile> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <EmbeddedResource Include="Properties\Resources.resx"> | ||
| <Generator>ResXFileCodeGenerator</Generator> | ||
| <SubType>Designer</SubType> | ||
| <LastGenOutput>Resources.Designer.cs</LastGenOutput> | ||
| </EmbeddedResource> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <None Include="Properties\Settings.settings"> | ||
| <Generator>SettingsSingleFileGenerator</Generator> | ||
| <LastGenOutput>Settings.Designer.cs</LastGenOutput> | ||
| </None> | ||
| <Compile Include="Properties\Resources.Designer.cs"> | ||
| <AutoGen>True</AutoGen> | ||
| <DesignTime>True</DesignTime> | ||
| <DependentUpon>Resources.resx</DependentUpon> | ||
| </Compile> | ||
| <Compile Include="Properties\Settings.Designer.cs"> | ||
| <AutoGen>True</AutoGen> | ||
| <DesignTimeSharedInput>True</DesignTimeSharedInput> | ||
| <DependentUpon>Settings.settings</DependentUpon> | ||
| </Compile> | ||
| <AppDesigner Include="Properties\" /> | ||
| </ItemGroup> | ||
| <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> | ||
| </Project> | ||
|
|
||
| </Project> |
54 changes: 14 additions & 40 deletions
54
snippets/xaml/VS_Snippets_Wpf/Basic3D/XAML/BlankSample.csproj
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,53 +1,27 @@ | ||
| <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> | ||
| <!-- MSBUILD Project File --> | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <PropertyGroup> | ||
| <OutputType>WinExe</OutputType> | ||
| <TargetFramework>net10.0-windows</TargetFramework> | ||
| <UseWPF>true</UseWPF> | ||
| <EnableDefaultItems>false</EnableDefaultItems> | ||
| <AssemblyName>BlankSample</AssemblyName> | ||
| <DefaultClrNameSpace>Blank3DSample</DefaultClrNameSpace> | ||
| <TargetType>winexe</TargetType> | ||
| <Configuration>Debug</Configuration> | ||
| <BuildSystem>MSBuild</BuildSystem> | ||
| <HostInBrowser>False</HostInBrowser> | ||
| <ApplicationIcon>App.ico</ApplicationIcon> | ||
| <OutputPath>bin\$(Debug)\</OutputPath> | ||
| <ProductVersion>10.0.20821</ProductVersion> | ||
| <SchemaVersion>2.0</SchemaVersion> | ||
| <ProjectGuid>{EE434869-7982-4ADE-B848-1C5500C94289}</ProjectGuid> | ||
| <TargetFrameworkVersion>v4.8</TargetFrameworkVersion> | ||
| <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> | ||
| <TargetFrameworkProfile /> | ||
| </PropertyGroup> | ||
| <!--Import the target file that contains all the common targets --> | ||
| <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> | ||
|
|
||
| <ItemGroup> | ||
| <!-- Aplication Definition Markup File --> | ||
| <ApplicationDefinition Include="app.xaml"> | ||
| <Generator>MSBuild:Compile</Generator> | ||
| <SubType>Designer</SubType> | ||
| <Generator>MSBuild:Compile</Generator> | ||
| <SubType>Designer</SubType> | ||
| </ApplicationDefinition> | ||
| <!-- Compiled Xaml Files --> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <Page Include="Window1.xaml"> | ||
| <Generator>MSBuild:Compile</Generator> | ||
| <SubType>Designer</SubType> | ||
| <Generator>MSBuild:Compile</Generator> | ||
| <SubType>Designer</SubType> | ||
| </Page> | ||
| <!-- Compiled Code Files --> | ||
| <!-- Compiled-in Resources --> | ||
| <Resource Include="App.ico" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <Reference Include="System" /> | ||
| <Reference Include="System.Xml" /> | ||
| <Reference Include="System.Data" /> | ||
| <Reference Include="WindowsBase" /> | ||
| <Reference Include="PresentationCore" /> | ||
| <Reference Include="PresentationFramework" /> | ||
| <Reference Include="System.Xaml"> | ||
| <RequiredTargetFramework>4.0</RequiredTargetFramework> | ||
| </Reference> | ||
| <Reference Include="UIAutomationProvider" /> | ||
| <Reference Include="UIAutomationTypes" /> | ||
| <Resource Include="App.ico" /> | ||
| </ItemGroup> | ||
| </Project> | ||
|
|
||
| </Project> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.