Skip to content

Commit 9551e33

Browse files
darrelmillerdarrelmiller
authored
Merge pull request #744 from microsoft/mk/fix-migrate-to-net6
Migrate all projects to .NET6
2 parents ad36f92 + b98a4cb commit 9551e33

File tree

12 files changed

+33
-146
lines changed

12 files changed

+33
-146
lines changed

‎.github/workflows/ci-cd.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Setup .NET
1717
uses: actions/setup-dotnet@v1
1818
with:
19-
dotnet-version: 5.0.x
19+
dotnet-version: 6.0.x
2020

2121
- name: Data gatherer
2222
id: data_gatherer

‎.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Setup .NET
2020
uses: actions/setup-dotnet@v1
2121
with:
22-
dotnet-version: 5.0.x
22+
dotnet-version: 6.0.x
2323

2424
- name: Initialize CodeQL
2525
id: init_codeql

‎Microsoft.OpenApi.sln

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ Global
3838
{A8E50143-69B2-472A-9D45-3F9A05D13202}.Debug|Any CPU.Build.0 = Debug|Any CPU
3939
{A8E50143-69B2-472A-9D45-3F9A05D13202}.Release|Any CPU.ActiveCfg = Release|Any CPU
4040
{A8E50143-69B2-472A-9D45-3F9A05D13202}.Release|Any CPU.Build.0 = Release|Any CPU
41+
{6A5E91E5-0441-46EE-AEB9-8334981B7F08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
42+
{6A5E91E5-0441-46EE-AEB9-8334981B7F08}.Debug|Any CPU.Build.0 = Debug|Any CPU
43+
{6A5E91E5-0441-46EE-AEB9-8334981B7F08}.Release|Any CPU.ActiveCfg = Release|Any CPU
44+
{6A5E91E5-0441-46EE-AEB9-8334981B7F08}.Release|Any CPU.Build.0 = Release|Any CPU
4145
{79933258-0126-4382-8755-D50820ECC483}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4246
{79933258-0126-4382-8755-D50820ECC483}.Debug|Any CPU.Build.0 = Debug|Any CPU
4347
{79933258-0126-4382-8755-D50820ECC483}.Release|Any CPU.ActiveCfg = Release|Any CPU

‎src/Microsoft.OpenApi.Hidi/Microsoft.OpenApi.Hidi.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net5.0</TargetFramework>
5+
<TargetFramework>net6.0</TargetFramework>
66
<LangVersion>9.0</LangVersion>
77
<PackAsTool>true</PackAsTool>
88
<PackageIconUrl>http://go.microsoft.com/fwlink/?LinkID=288890</PackageIconUrl>

‎src/Microsoft.OpenApi.Readers/Microsoft.OpenApi.Readers.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFrameworks>netstandard2.0</TargetFrameworks>
44
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -36,7 +36,7 @@
3636
</PropertyGroup>
3737

3838
<ItemGroup>
39-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
39+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
4040
</ItemGroup>
4141

4242
<ItemGroup>

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

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

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,4 @@
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:local="clr-namespace:Microsoft.OpenApi.Workbench"
55
StartupUri="MainWindow.xaml">
6-
<Application.Resources>
7-
<ResourceDictionary>
8-
<ResourceDictionary.MergedDictionaries>
9-
<ResourceDictionary Source="Themes/Metro/Metro.MSControls.Core.Implicit.xaml" />
10-
<ResourceDictionary Source="Themes/Metro/Metro.MSControls.Toolkit.Implicit.xaml" />
11-
</ResourceDictionary.MergedDictionaries>
12-
</ResourceDictionary>
13-
</Application.Resources>
146
</Application>

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

Lines changed: 20 additions & 122 deletions
Original file line numberDiff line numberDiff line change
@@ -1,136 +1,34 @@
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>
5+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
6+
<UseWPF>true</UseWPF>
7+
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
198
</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>
38-
</PropertyGroup>
39-
<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" />
54-
<PackageReference Include="Infragistics.Themes.MetroLight.Wpf" Version="1.0.0" />
55-
</ItemGroup>
569
<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>
10+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
11+
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.3.310801">
12+
<PrivateAssets>all</PrivateAssets>
13+
</PackageReference>
14+
<PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0" />
9515
</ItemGroup>
9616
<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>
17+
<Resource Include="Themes\Metro\HowToApplyTheme.txt" />
11818
</ItemGroup>
11919
<ItemGroup>
120-
<None Include="App.config" />
20+
<ProjectReference Include="..\Microsoft.OpenApi.Readers\Microsoft.OpenApi.Readers.csproj" />
21+
<ProjectReference Include="..\Microsoft.OpenApi\Microsoft.OpenApi.csproj" />
12122
</ItemGroup>
12223
<ItemGroup>
123-
<Resource Include="Themes\Metro\HowToApplyTheme.txt" />
24+
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
25+
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
12426
</ItemGroup>
12527
<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>
28+
<Page Remove="Themes\Metro\Metro.MSControls.Core.Implicit.xaml" />
29+
<Page Remove="Themes\Metro\Metro.MSControls.Toolkit.Implicit.xaml" />
30+
<Page Remove="Themes\Metro\Styles.Shared.xaml" />
31+
<Page Remove="Themes\Metro\Styles.WPF.xaml" />
32+
<Page Remove="Themes\Metro\Theme.Colors.xaml" />
13433
</ItemGroup>
135-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
13634
</Project>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFrameworks>netstandard2.0</TargetFrameworks>
4-
<LangVersion>9.0</LangVersion>
4+
<LangVersion>Latest</LangVersion>
55
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
66
<PackageIconUrl>http://go.microsoft.com/fwlink/?LinkID=288890</PackageIconUrl>
77
<PackageProjectUrl>https://github.com/Microsoft/OpenAPI.NET</PackageProjectUrl>

‎test/Microsoft.OpenApi.Readers.Tests/Microsoft.OpenApi.Readers.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net48;net50</TargetFrameworks>
3+
<TargetFrameworks>net6.0</TargetFrameworks>
44
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
55
<Authors></Authors>
66
<Company>Microsoft</Company>

0 commit comments

Comments
 (0)