Skip to content

Commit 8e9e8cb

Browse files
MaggieKimani1MaggieKimani1
committed
Migrate WPF project to .NET6 and delete obsolete App.config
1 parent b977607 commit 8e9e8cb

File tree

2 files changed

+20
-127
lines changed

2 files changed

+20
-127
lines changed

‎src/Microsoft.OpenApi.Workbench/App.config

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎src/Microsoft.OpenApi.Workbench/Microsoft.OpenApi.Workbench.csproj

Lines changed: 20 additions & 121 deletions
Original file line numberDiff line numberDiff line change
@@ -1,136 +1,35 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
42
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{6A5E91E5-0441-46EE-AEB9-8334981B7F08}</ProjectGuid>
3+
<TargetFramework>net6.0-windows</TargetFramework>
84
<OutputType>WinExe</OutputType>
9-
<RootNamespace>Microsoft.OpenApi.Workbench</RootNamespace>
10-
<AssemblyName>Microsoft.OpenApi.Workbench</AssemblyName>
11-
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
12-
<FileAlignment>512</FileAlignment>
13-
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
14-
<WarningLevel>4</WarningLevel>
15-
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
16-
<TargetFrameworkProfile />
17-
<NuGetPackageImportStamp>
18-
</NuGetPackageImportStamp>
19-
</PropertyGroup>
20-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
21-
<PlatformTarget>AnyCPU</PlatformTarget>
22-
<DebugSymbols>true</DebugSymbols>
23-
<DebugType>full</DebugType>
24-
<Optimize>false</Optimize>
25-
<OutputPath>bin\Debug\</OutputPath>
26-
<DefineConstants>DEBUG;TRACE</DefineConstants>
27-
<ErrorReport>prompt</ErrorReport>
28-
<WarningLevel>4</WarningLevel>
29-
</PropertyGroup>
30-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
31-
<PlatformTarget>AnyCPU</PlatformTarget>
32-
<DebugType>pdbonly</DebugType>
33-
<Optimize>true</Optimize>
34-
<OutputPath>bin\Release\</OutputPath>
35-
<DefineConstants>TRACE</DefineConstants>
36-
<ErrorReport>prompt</ErrorReport>
37-
<WarningLevel>4</WarningLevel>
5+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
6+
<UseWPF>true</UseWPF>
7+
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
388
</PropertyGroup>
399
<ItemGroup>
40-
<Reference Include="System" />
41-
<Reference Include="System.Data" />
42-
<Reference Include="System.Xml" />
43-
<Reference Include="Microsoft.CSharp" />
44-
<Reference Include="System.Core" />
45-
<Reference Include="System.Xml.Linq" />
46-
<Reference Include="System.Data.DataSetExtensions" />
47-
<Reference Include="System.Net.Http" />
48-
<Reference Include="System.Xaml">
49-
<RequiredTargetFramework>4.0</RequiredTargetFramework>
50-
</Reference>
51-
<Reference Include="WindowsBase" />
52-
<Reference Include="PresentationCore" />
53-
<Reference Include="PresentationFramework" />
5410
<PackageReference Include="Infragistics.Themes.MetroLight.Wpf" Version="1.0.0" />
11+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
12+
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.3.310801">
13+
<PrivateAssets>all</PrivateAssets>
14+
</PackageReference>
15+
<PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0" />
5516
</ItemGroup>
5617
<ItemGroup>
57-
<ApplicationDefinition Include="App.xaml">
58-
<Generator>MSBuild:Compile</Generator>
59-
<SubType>Designer</SubType>
60-
</ApplicationDefinition>
61-
<Compile Include="StatsVisitor.cs" />
62-
<Page Include="MainWindow.xaml">
63-
<Generator>MSBuild:Compile</Generator>
64-
<SubType>Designer</SubType>
65-
</Page>
66-
<Compile Include="App.xaml.cs">
67-
<DependentUpon>App.xaml</DependentUpon>
68-
<SubType>Code</SubType>
69-
</Compile>
70-
<Compile Include="MainModel.cs" />
71-
<Compile Include="MainWindow.xaml.cs">
72-
<DependentUpon>MainWindow.xaml</DependentUpon>
73-
<SubType>Code</SubType>
74-
</Compile>
75-
<Resource Include="Themes\Metro\Metro.MSControls.Core.Implicit.xaml">
76-
<Generator>MSBuild:Compile</Generator>
77-
<SubType>Designer</SubType>
78-
</Resource>
79-
<Resource Include="Themes\Metro\Metro.MSControls.Toolkit.Implicit.xaml">
80-
<Generator>MSBuild:Compile</Generator>
81-
<SubType>Designer</SubType>
82-
</Resource>
83-
<Resource Include="Themes\Metro\Styles.Shared.xaml">
84-
<Generator>MSBuild:Compile</Generator>
85-
<SubType>Designer</SubType>
86-
</Resource>
87-
<Resource Include="Themes\Metro\Styles.WPF.xaml">
88-
<Generator>MSBuild:Compile</Generator>
89-
<SubType>Designer</SubType>
90-
</Resource>
91-
<Resource Include="Themes\Metro\Theme.Colors.xaml">
92-
<Generator>MSBuild:Compile</Generator>
93-
<SubType>Designer</SubType>
94-
</Resource>
95-
</ItemGroup>
96-
<ItemGroup>
97-
<Compile Include="Properties\AssemblyInfo.cs">
98-
<SubType>Code</SubType>
99-
</Compile>
100-
<Compile Include="Properties\Resources.Designer.cs">
101-
<AutoGen>True</AutoGen>
102-
<DesignTime>True</DesignTime>
103-
<DependentUpon>Resources.resx</DependentUpon>
104-
</Compile>
105-
<Compile Include="Properties\Settings.Designer.cs">
106-
<AutoGen>True</AutoGen>
107-
<DependentUpon>Settings.settings</DependentUpon>
108-
<DesignTimeSharedInput>True</DesignTimeSharedInput>
109-
</Compile>
110-
<EmbeddedResource Include="Properties\Resources.resx">
111-
<Generator>ResXFileCodeGenerator</Generator>
112-
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
113-
</EmbeddedResource>
114-
<None Include="Properties\Settings.settings">
115-
<Generator>SettingsSingleFileGenerator</Generator>
116-
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
117-
</None>
18+
<Resource Include="Themes\Metro\HowToApplyTheme.txt" />
11819
</ItemGroup>
11920
<ItemGroup>
120-
<None Include="App.config" />
21+
<ProjectReference Include="..\Microsoft.OpenApi.Readers\Microsoft.OpenApi.Readers.csproj" />
22+
<ProjectReference Include="..\Microsoft.OpenApi\Microsoft.OpenApi.csproj" />
12123
</ItemGroup>
12224
<ItemGroup>
123-
<Resource Include="Themes\Metro\HowToApplyTheme.txt" />
25+
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
26+
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
12427
</ItemGroup>
12528
<ItemGroup>
126-
<ProjectReference Include="..\Microsoft.OpenApi.Readers\Microsoft.OpenApi.Readers.csproj">
127-
<Project>{79933258-0126-4382-8755-d50820ecc483}</Project>
128-
<Name>Microsoft.OpenApi.Readers</Name>
129-
</ProjectReference>
130-
<ProjectReference Include="..\Microsoft.OpenApi\Microsoft.OpenApi.csproj">
131-
<Project>{a8e50143-69b2-472a-9d45-3f9a05d13202}</Project>
132-
<Name>Microsoft.OpenApi.Core</Name>
133-
</ProjectReference>
29+
<Page Remove="Themes\Metro\Metro.MSControls.Core.Implicit.xaml" />
30+
<Page Remove="Themes\Metro\Metro.MSControls.Toolkit.Implicit.xaml" />
31+
<Page Remove="Themes\Metro\Styles.Shared.xaml" />
32+
<Page Remove="Themes\Metro\Styles.WPF.xaml" />
33+
<Page Remove="Themes\Metro\Theme.Colors.xaml" />
13434
</ItemGroup>
135-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
13635
</Project>

0 commit comments

Comments
 (0)