Skip to content

Commit

Permalink
Fixed project file
Browse files Browse the repository at this point in the history
  • Loading branch information
Code-Artist committed Aug 13, 2022
1 parent 864e69a commit 307206a
Show file tree
Hide file tree
Showing 7 changed files with 51 additions and 275 deletions.
2 changes: 2 additions & 0 deletions .hgtags
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,5 @@ d4af04d7f347a4b7a8742e98109c66260aac7374 V-03-05-01
3d4b62086afd81325a2343d23c1b146aa53871ec V-04-00-01
ceab5dd04915b7bec524a5ef634bfae9a4e98f8f V-04-00-02
324827aee2852462c6d1fdd4c025dc1129d3bf3a V-04-01-00
324827aee2852462c6d1fdd4c025dc1129d3bf3a V-04-01-00
42ee62d456994b93a10e5b4e23f778965d7f94f1 V-04-01-00

This file was deleted.

83 changes: 12 additions & 71 deletions CodeArtEng.Diagnostics.Tests/CodeArtEng.Diagnostics.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,77 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\NUnit.3.12.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">

<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{2F6C3625-704E-4E6E-BF12-E88FEE340477}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>CodeArtEng.Diagnostics.Tests</RootNamespace>
<AssemblyName>CodeArtEng.Diagnostics.Tests</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<TargetFrameworks>net48;net6.0-Windows</TargetFrameworks>
<UseWindowsForms>True</UseWindowsForms>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="nunit.framework, Version=3.12.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\packages\NUnit.3.12.0\lib\net45\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="ProcessExecutorTests.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="TraceFileWriterTests.cs" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\CodeArtEng.Diagnostics\CodeArtEng.Diagnostics.csproj">
<Project>{14E4F0B2-0B87-426B-9297-68C86A657CA8}</Project>
<Name>CodeArtEng.Diagnostics</Name>
</ProjectReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
<PackageReference Include="NUnit" Version="3.13.1" />
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
</ItemGroup>

<ItemGroup>
<None Include="packages.config" />
<ProjectReference Include="..\CodeArtEng.Diagnostics\CodeArtEng.Diagnostics.csproj" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.12.0\build\NUnit.props'))" />
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>

</Project>
39 changes: 0 additions & 39 deletions CodeArtEng.Diagnostics/CodeArtEng - Backup.Diagnostics.csproj

This file was deleted.

111 changes: 30 additions & 81 deletions CodeArtEng.Diagnostics/CodeArtEng.Diagnostics.csproj
Original file line number Diff line number Diff line change
@@ -1,90 +1,39 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">

<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{14E4F0B2-0B87-426B-9297-68C86A657CA8}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>CodeArtEng.Diagnostics</RootNamespace>
<TargetFrameworks>net48;net6.0-Windows</TargetFrameworks>
<AssemblyName>CodeArtEng.Diagnostics</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Debug\CodeArtEng.Diagnostics.XML</DocumentationFile>
<CodeAnalysisRuleSet>CodeArtEng.Diagnostics.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Release\CodeArtEng.Diagnostics.XML</DocumentationFile>
<CodeAnalysisRuleSet>CodeArtEng.Diagnostics.ruleset</CodeAnalysisRuleSet>
<RootNamespace>CodeArtEng.Diagnostics</RootNamespace>
<UseWindowsForms>True</UseWindowsForms>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>Code Artist</Authors>
<Version>4.1.0</Version>
<Company>Code Art Engineering</Company>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/Code-Artist/CodeArtEng.Diagnostics</PackageProjectUrl>
<RepositoryUrl>https://github.com/Code-Artist/CodeArtEng.Diagnostics</RepositoryUrl>
<RepositoryType>GitHub</RepositoryType>
<Copyright>Copyright © CodeArtEng 2022</Copyright>
<PackageReleaseNotes>Upgraded to .NET 4.9 and .NET Core 6.0</PackageReleaseNotes>
<AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
<Description>Windows Form Diagnostics Tools</Description>
<PackageTags>C#, WinForms</PackageTags>
<PackageIcon>CAELogoSmall.png</PackageIcon>
</PropertyGroup>

<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Management" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Classes\CodeProfiler.cs" />
<Compile Include="Classes\ProcessExecutor.cs" />
<Compile Include="Classes\TextBoxThemeManager.cs" />
<Compile Include="Classes\TraceFileWriter.cs" />
<Compile Include="Classes\TraceLogger.cs" />
<Compile Include="Classes\TraceTimeStampStyle.cs" />
<Compile Include="Classes\Utility.cs" />
<Compile Include="Controls\DiagnosticsRichTextBox.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Controls\DiagnosticsTextBox.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Controls\TextEventArgs.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<PackageReference Include="System.Management" Version="5.0.0" Condition="'$(TargetFramework)' != 'net45'" />
</ItemGroup>

<ItemGroup>
<EmbeddedResource Include="Controls\DiagnosticsRichTextBox.resx">
<DependentUpon>DiagnosticsRichTextBox.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Controls\DiagnosticsTextBox.resx">
<DependentUpon>DiagnosticsTextBox.cs</DependentUpon>
</EmbeddedResource>
<Reference Include="System.Management" Condition="'$(TargetFramework)' == 'net45'" />
</ItemGroup>

<ItemGroup>
<None Include="CodeArtEng.Diagnostics.ruleset" />
<None Include="packages.config" />
<None Include="..\..\..\..\..\Projects\CodeArtEng\03 Art\Icons\CAELogoSmall.png">
<Pack>True</Pack>
<PackagePath></PackagePath>
</None>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\NuPack.3.4.2\build\NuPack.targets" Condition="Exists('..\packages\NuPack.3.4.2\build\NuPack.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\NuPack.3.4.2\build\NuPack.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NuPack.3.4.2\build\NuPack.targets'))" />
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>

</Project>
12 changes: 0 additions & 12 deletions IsAdminCheck/IsAdminCheck - Backup.csproj

This file was deleted.

61 changes: 7 additions & 54 deletions IsAdminCheck/IsAdminCheck.csproj
Original file line number Diff line number Diff line change
@@ -1,59 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{730A517C-2178-42EE-9DA3-D8366285D131}</ProjectGuid>
<OutputType>Exe</OutputType>
<RootNamespace>IsAdminCheck</RootNamespace>
<AssemblyName>IsAdminCheck</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Deterministic>true</Deterministic>
<TargetFrameworks>net48;net6.0-Windows</TargetFrameworks>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\CodeArtEng.Diagnostics\CodeArtEng.Diagnostics.csproj">
<Project>{14e4f0b2-0b87-426b-9297-68c86a657ca8}</Project>
<Name>CodeArtEng.Diagnostics</Name>
</ProjectReference>
<ProjectReference Include="..\CodeArtEng.Diagnostics\CodeArtEng.Diagnostics.csproj" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

</Project>

0 comments on commit 307206a

Please sign in to comment.