Skip to content

Commit fe9f19b

Browse files
swhardenswharden
committed
try-convert
1 parent 520ab0e commit fe9f19b

File tree

2 files changed

+21
-179
lines changed

2 files changed

+21
-179
lines changed

‎dev/sff/SffViewer/SffViewer.csproj

Lines changed: 10 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -1,93 +1,16 @@
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>{9478208D-60C7-4F6A-B2E4-6325D38139DA}</ProjectGuid>
3+
<TargetFramework>net5.0-windows</TargetFramework>
84
<OutputType>WinExe</OutputType>
9-
<RootNamespace>SffViewer</RootNamespace>
10-
<AssemblyName>SffViewer</AssemblyName>
11-
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
12-
<FileAlignment>512</FileAlignment>
13-
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
14-
<Deterministic>true</Deterministic>
5+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
6+
<UseWindowsForms>true</UseWindowsForms>
7+
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
158
</PropertyGroup>
16-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17-
<PlatformTarget>AnyCPU</PlatformTarget>
18-
<DebugSymbols>true</DebugSymbols>
19-
<DebugType>full</DebugType>
20-
<Optimize>false</Optimize>
21-
<OutputPath>bin\Debug\</OutputPath>
22-
<DefineConstants>DEBUG;TRACE</DefineConstants>
23-
<ErrorReport>prompt</ErrorReport>
24-
<WarningLevel>4</WarningLevel>
25-
</PropertyGroup>
26-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27-
<PlatformTarget>AnyCPU</PlatformTarget>
28-
<DebugType>pdbonly</DebugType>
29-
<Optimize>true</Optimize>
30-
<OutputPath>bin\Release\</OutputPath>
31-
<DefineConstants>TRACE</DefineConstants>
32-
<ErrorReport>prompt</ErrorReport>
33-
<WarningLevel>4</WarningLevel>
34-
</PropertyGroup>
35-
<ItemGroup>
36-
<Reference Include="FftSharp, Version=1.0.8.0, Culture=neutral, processorArchitecture=MSIL">
37-
<HintPath>..\..\..\src\packages\FftSharp.1.0.8\lib\netstandard2.0\FftSharp.dll</HintPath>
38-
</Reference>
39-
<Reference Include="Spectrogram, Version=1.2.6.0, Culture=neutral, processorArchitecture=MSIL">
40-
<HintPath>..\..\..\src\packages\Spectrogram.1.2.6\lib\netstandard2.0\Spectrogram.dll</HintPath>
41-
</Reference>
42-
<Reference Include="System" />
43-
<Reference Include="System.Core" />
44-
<Reference Include="System.Drawing.Common, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
45-
<HintPath>..\..\..\src\packages\System.Drawing.Common.5.0.0\lib\net461\System.Drawing.Common.dll</HintPath>
46-
</Reference>
47-
<Reference Include="System.Xml.Linq" />
48-
<Reference Include="System.Data.DataSetExtensions" />
49-
<Reference Include="Microsoft.CSharp" />
50-
<Reference Include="System.Data" />
51-
<Reference Include="System.Deployment" />
52-
<Reference Include="System.Drawing" />
53-
<Reference Include="System.Net.Http" />
54-
<Reference Include="System.Windows.Forms" />
55-
<Reference Include="System.Xml" />
56-
</ItemGroup>
57-
<ItemGroup>
58-
<Compile Include="Form1.cs">
59-
<SubType>Form</SubType>
60-
</Compile>
61-
<Compile Include="Form1.Designer.cs">
62-
<DependentUpon>Form1.cs</DependentUpon>
63-
</Compile>
64-
<Compile Include="Program.cs" />
65-
<Compile Include="Properties\AssemblyInfo.cs" />
66-
<EmbeddedResource Include="Form1.resx">
67-
<DependentUpon>Form1.cs</DependentUpon>
68-
</EmbeddedResource>
69-
<EmbeddedResource Include="Properties\Resources.resx">
70-
<Generator>ResXFileCodeGenerator</Generator>
71-
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
72-
<SubType>Designer</SubType>
73-
</EmbeddedResource>
74-
<Compile Include="Properties\Resources.Designer.cs">
75-
<AutoGen>True</AutoGen>
76-
<DependentUpon>Resources.resx</DependentUpon>
77-
</Compile>
78-
<None Include="packages.config" />
79-
<None Include="Properties\Settings.settings">
80-
<Generator>SettingsSingleFileGenerator</Generator>
81-
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
82-
</None>
83-
<Compile Include="Properties\Settings.Designer.cs">
84-
<AutoGen>True</AutoGen>
85-
<DependentUpon>Settings.settings</DependentUpon>
86-
<DesignTimeSharedInput>True</DesignTimeSharedInput>
87-
</Compile>
88-
</ItemGroup>
899
<ItemGroup>
90-
<None Include="App.config" />
10+
<PackageReference Include="FftSharp" Version="1.0.8" />
11+
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
12+
<PackageReference Include="Spectrogram" Version="1.2.6" />
13+
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
14+
<PackageReference Include="System.Drawing.Common" Version="5.0.0" />
9115
</ItemGroup>
92-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
9316
</Project>

‎src/Spectrogram.MicrophoneDemo/Spectrogram.MicrophoneDemo.csproj

Lines changed: 11 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -1,100 +1,19 @@
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>{D51ABC6A-53F4-4620-88A1-14EA1D779538}</ProjectGuid>
3+
<TargetFramework>net5.0-windows</TargetFramework>
84
<OutputType>WinExe</OutputType>
9-
<RootNamespace>Spectrogram.MicrophoneDemo</RootNamespace>
10-
<AssemblyName>Spectrogram.MicrophoneDemo</AssemblyName>
11-
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
12-
<FileAlignment>512</FileAlignment>
13-
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
14-
<Deterministic>true</Deterministic>
5+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
6+
<UseWindowsForms>true</UseWindowsForms>
7+
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
158
</PropertyGroup>
16-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17-
<PlatformTarget>AnyCPU</PlatformTarget>
18-
<DebugSymbols>true</DebugSymbols>
19-
<DebugType>full</DebugType>
20-
<Optimize>false</Optimize>
21-
<OutputPath>bin\Debug\</OutputPath>
22-
<DefineConstants>DEBUG;TRACE</DefineConstants>
23-
<ErrorReport>prompt</ErrorReport>
24-
<WarningLevel>4</WarningLevel>
25-
</PropertyGroup>
26-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27-
<PlatformTarget>AnyCPU</PlatformTarget>
28-
<DebugType>pdbonly</DebugType>
29-
<Optimize>true</Optimize>
30-
<OutputPath>bin\Release\</OutputPath>
31-
<DefineConstants>TRACE</DefineConstants>
32-
<ErrorReport>prompt</ErrorReport>
33-
<WarningLevel>4</WarningLevel>
34-
</PropertyGroup>
35-
<ItemGroup>
36-
<Reference Include="FftSharp, Version=1.0.8.0, Culture=neutral, processorArchitecture=MSIL">
37-
<HintPath>..\packages\FftSharp.1.0.8\lib\netstandard2.0\FftSharp.dll</HintPath>
38-
</Reference>
39-
<Reference Include="NAudio, Version=1.10.0.0, Culture=neutral, processorArchitecture=MSIL">
40-
<HintPath>..\packages\NAudio.1.10.0\lib\net35\NAudio.dll</HintPath>
41-
</Reference>
42-
<Reference Include="System" />
43-
<Reference Include="System.Core" />
44-
<Reference Include="System.Drawing.Common, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
45-
<HintPath>..\packages\System.Drawing.Common.5.0.0\lib\net461\System.Drawing.Common.dll</HintPath>
46-
</Reference>
47-
<Reference Include="System.Xml.Linq" />
48-
<Reference Include="System.Data.DataSetExtensions" />
49-
<Reference Include="Microsoft.CSharp" />
50-
<Reference Include="System.Data" />
51-
<Reference Include="System.Deployment" />
52-
<Reference Include="System.Drawing" />
53-
<Reference Include="System.Net.Http" />
54-
<Reference Include="System.Windows.Forms" />
55-
<Reference Include="System.Xml" />
56-
</ItemGroup>
57-
<ItemGroup>
58-
<Compile Include="FormMicrophone.cs">
59-
<SubType>Form</SubType>
60-
</Compile>
61-
<Compile Include="FormMicrophone.Designer.cs">
62-
<DependentUpon>FormMicrophone.cs</DependentUpon>
63-
</Compile>
64-
<Compile Include="Listener.cs" />
65-
<Compile Include="Program.cs" />
66-
<Compile Include="Properties\AssemblyInfo.cs" />
67-
<EmbeddedResource Include="FormMicrophone.resx">
68-
<DependentUpon>FormMicrophone.cs</DependentUpon>
69-
</EmbeddedResource>
70-
<EmbeddedResource Include="Properties\Resources.resx">
71-
<Generator>ResXFileCodeGenerator</Generator>
72-
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
73-
<SubType>Designer</SubType>
74-
</EmbeddedResource>
75-
<Compile Include="Properties\Resources.Designer.cs">
76-
<AutoGen>True</AutoGen>
77-
<DependentUpon>Resources.resx</DependentUpon>
78-
</Compile>
79-
<None Include="packages.config" />
80-
<None Include="Properties\Settings.settings">
81-
<Generator>SettingsSingleFileGenerator</Generator>
82-
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
83-
</None>
84-
<Compile Include="Properties\Settings.Designer.cs">
85-
<AutoGen>True</AutoGen>
86-
<DependentUpon>Settings.settings</DependentUpon>
87-
<DesignTimeSharedInput>True</DesignTimeSharedInput>
88-
</Compile>
89-
</ItemGroup>
909
<ItemGroup>
91-
<None Include="App.config" />
10+
<ProjectReference Include="..\Spectrogram\Spectrogram.csproj" />
9211
</ItemGroup>
9312
<ItemGroup>
94-
<ProjectReference Include="..\Spectrogram\Spectrogram.csproj">
95-
<Project>{6ff83edd-e18a-4edd-8d53-d2281515ac47}</Project>
96-
<Name>Spectrogram</Name>
97-
</ProjectReference>
13+
<PackageReference Include="FftSharp" Version="1.0.12" />
14+
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
15+
<PackageReference Include="NAudio" Version="1.10.0" />
16+
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
17+
<PackageReference Include="System.Drawing.Common" Version="5.0.0" />
9818
</ItemGroup>
99-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
10019
</Project>

0 commit comments

Comments
 (0)