Skip to content

Converting projects to new SDK format #69

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.

Sign up for GitHub

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

Merged
suwatch merged 1 commit into from
Sep 5, 2023
Merged

Converting projects to new SDK format #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
101 changes: 13 additions & 88 deletions AADClient.Console/AADClient.Console.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,110 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" 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>{7C204270-8911-4E04-B3FE-417381128D34}</ProjectGuid>
<OutputType>Exe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>AADClient</RootNamespace>
<AssemblyName>AADClient</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<TargetFrameworkProfile />
</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>
<TargetFramework>net461</TargetFramework>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory">
<HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.14.201151115\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
</Reference>
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms">
<HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.14.201151115\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\packages\Newtonsoft.Json.6.0.6\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
</Reference>
<Reference Include="System.Core" />
<Reference Include="System.IdentityModel" />
<Reference Include="System.IdentityModel.Tokens.Jwt, Version=4.0.20622.1351, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\System.IdentityModel.Tokens.Jwt.4.0.2.206221351\lib\net45\System.IdentityModel.Tokens.Jwt.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
</Reference>
<Reference Include="System.Net.Http.WinHttpHandler, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Net.Http.WinHttpHandler.5.0.0\lib\net461\System.Net.Http.WinHttpHandler.dll</HintPath>
</Reference>
<Reference Include="System.Numerics" />
<Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<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" />
<PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" />
<PackageReference Include="Newtonsoft.Json" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" />
<PackageReference Include="System.Net.Http.WinHttpHandler" />
<PackageReference Include="System.Numerics.Vectors" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\ARMClient.Authentication\Properties\AssemblyInfo.cs">
<Link>Properties\AssemblyInfo.cs</Link>
</Compile>
<Compile Include="..\ARMClient.Console\CommandLineParameters.cs">
<Link>CommandLineParameters.cs</Link>
</Compile>
<Compile Include="..\ARMClient.Console\HttpLoggingHandler.cs">
<Link>HttpLoggingHandler.cs</Link>
</Compile>
<Compile Include="AADHelper.cs" />
<Compile Include="Program.cs" />
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
<None Include="packages.config">
<SubType>Designer</SubType>
</None>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ARMClient.Authentication\ARMClient.Authentication.csproj">
<Project>{2824485e-0ead-4f72-b897-ffdaff346528}</Project>
<Name>ARMClient.Authentication</Name>
</ProjectReference>
<ProjectReference Include="..\ARMClient.Authentication\ARMClient.Authentication.csproj" />
</ItemGroup>
<ItemGroup>
<Reference Include="System.IdentityModel" />
<Reference Include="System.Windows.Forms" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- 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>
55 changes: 55 additions & 0 deletions AADClient.Console/AADClient.Console.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
Microsoft Visual Studio Solution File, Format Version 12.00
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AADClient.Console", "AADClient.Console.csproj", "{7A00DD39-B2CD-45F4-9D8F-B548E1618280}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ARMClient.Authentication", "..\ARMClient.Authentication\ARMClient.Authentication.csproj", "{76DC78F7-DE22-40BA-ACFD-633FAB90E89A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ARMClient.Console", "..\ARMClient.Console\ARMClient.Console.csproj", "{F2AA4D25-1C99-4C7D-8830-43AF5C24233A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RDFEClient.Console", "..\RDFEClient.Console\RDFEClient.Console.csproj", "{18D8901C-6EB7-4A19-BA38-39FABE75241E}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ARMClient.Authentication", "..\ARMClient.Authentication", "{7DB482F0-7259-425A-AD9C-869D663FE756}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ARMClient.Console", "..\ARMClient.Console", "{AB889D73-3F4B-4998-BDE6-0715B8F7C176}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "RDFEClient.Console", "..\RDFEClient.Console", "{576663A5-9F73-415E-A3E4-B5A9CC6B89B3}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ARMClient", "..\..\ARMClient", "{130D6684-8B92-40F3-A35F-EC7D53AE03B9}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{7A00DD39-B2CD-45F4-9D8F-B548E1618280}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7A00DD39-B2CD-45F4-9D8F-B548E1618280}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7A00DD39-B2CD-45F4-9D8F-B548E1618280}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7A00DD39-B2CD-45F4-9D8F-B548E1618280}.Release|Any CPU.Build.0 = Release|Any CPU
{76DC78F7-DE22-40BA-ACFD-633FAB90E89A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{76DC78F7-DE22-40BA-ACFD-633FAB90E89A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{76DC78F7-DE22-40BA-ACFD-633FAB90E89A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{76DC78F7-DE22-40BA-ACFD-633FAB90E89A}.Release|Any CPU.Build.0 = Release|Any CPU
{F2AA4D25-1C99-4C7D-8830-43AF5C24233A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F2AA4D25-1C99-4C7D-8830-43AF5C24233A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F2AA4D25-1C99-4C7D-8830-43AF5C24233A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F2AA4D25-1C99-4C7D-8830-43AF5C24233A}.Release|Any CPU.Build.0 = Release|Any CPU
{18D8901C-6EB7-4A19-BA38-39FABE75241E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{18D8901C-6EB7-4A19-BA38-39FABE75241E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{18D8901C-6EB7-4A19-BA38-39FABE75241E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{18D8901C-6EB7-4A19-BA38-39FABE75241E}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{76DC78F7-DE22-40BA-ACFD-633FAB90E89A} = {7DB482F0-7259-425A-AD9C-869D663FE756}
{7DB482F0-7259-425A-AD9C-869D663FE756} = {130D6684-8B92-40F3-A35F-EC7D53AE03B9}
{F2AA4D25-1C99-4C7D-8830-43AF5C24233A} = {AB889D73-3F4B-4998-BDE6-0715B8F7C176}
{AB889D73-3F4B-4998-BDE6-0715B8F7C176} = {130D6684-8B92-40F3-A35F-EC7D53AE03B9}
{18D8901C-6EB7-4A19-BA38-39FABE75241E} = {576663A5-9F73-415E-A3E4-B5A9CC6B89B3}
{576663A5-9F73-415E-A3E4-B5A9CC6B89B3} = {130D6684-8B92-40F3-A35F-EC7D53AE03B9}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {41830BF1-7E9E-407B-806E-3F7C2B5C2F9F}
EndGlobalSection
EndGlobal
12 changes: 0 additions & 12 deletions AADClient.Console/packages.config
View file
Open in desktop

This file was deleted.

151 changes: 20 additions & 131 deletions ARMClient.Authentication/ARMClient.Authentication.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,134 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{2824485E-0EAD-4F72-B897-FFDAFF346528}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ARMClient.Authentication</RootNamespace>
<AssemblyName>ARMClient.Authentication</AssemblyName>
<TargetFrameworkVersion>v4.6.1</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>
</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="Brotli.Core, Version=2.0.4.2, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Brotli.NET.2.0.4.2\lib\net45\Brotli.Core.dll</HintPath>
</Reference>
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.14.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.14.201151115\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
</Reference>
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms, Version=2.14.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.14.201151115\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Newtonsoft.Json.6.0.6\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.configuration" />
<Reference Include="System.Core" />
<Reference Include="System.IdentityModel" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Net.Http.Formatting, Version=5.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.2\lib\net45\System.Net.Http.Formatting.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
</Reference>
<Reference Include="System.Security" />
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="AADAuthentication\AuthHelper.cs" />
<Compile Include="AADAuthentication\BaseAuthHelper.cs" />
<Compile Include="AADAuthentication\PersistentAuthHelper.cs" />
<Compile Include="ARMConfiguration.cs" />
<Compile Include="Constants.cs" />
<Compile Include="Contracts\AzAccessToken.cs" />
<Compile Include="Contracts\ResultOf.cs" />
<Compile Include="Contracts\SubscriptionCacheInfo.cs" />
<Compile Include="Contracts\SubscriptionInfo.cs" />
<Compile Include="Contracts\TenantCacheInfo.cs" />
<Compile Include="Contracts\TenantDetails.cs" />
<Compile Include="Contracts\TenantInfo.cs" />
<Compile Include="Contracts\CustomTokenCache.cs" />
<Compile Include="Contracts\TokenCacheInfo.cs" />
<Compile Include="Contracts\VerifiedDomain.cs" />
<Compile Include="EnvironmentStorage\FileEnvironmentStorage.cs" />
<Compile Include="EnvironmentStorage\IEnvironmentStorage.cs" />
<Compile Include="EnvironmentStorage\MemoryEnvironmentStorage.cs" />
<Compile Include="IAuthHelper.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="TenantStorage\FileTenantStorage.cs" />
<Compile Include="TenantStorage\ITenantStorage.cs" />
<Compile Include="TenantStorage\MemoryTenantStorage.cs" />
<Compile Include="TokenStorage\FileTokenStorage.cs" />
<Compile Include="TokenStorage\ITokenStorage.cs" />
<Compile Include="TokenStorage\MemoryTokenStorage.cs" />
<Compile Include="Utilities\JwtHelper.cs" />
<Compile Include="Utilities\ProtectedFile.cs" />
<Compile Include="Utilities\Utils.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Content Include="..\packages\Brotli.NET.2.0.4.2\runtimes\win\native\brolib_x64.dll">
<Link>brolib_x64.dll</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="..\packages\Brotli.NET.2.0.4.2\runtimes\win\native\brolib_x86.dll">
<Link>brolib_x86.dll</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!--
<Import Project="..\packages\Brotli.NET.2.0.4.2\build\Brotli.NET.targets" Condition="Exists('..\packages\Brotli.NET.2.0.4.2\build\Brotli.NET.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<Project Sdk="Microsoft.NET.Sdk">
<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>
<OutputType>Library</OutputType>
<RootNamespace>ARMClient.Authentication</RootNamespace>
<AssemblyName>ARMClient.Authentication</AssemblyName>
<TargetFramework>net461</TargetFramework>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Brotli.NET.2.0.4.2\build\Brotli.NET.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Brotli.NET.2.0.4.2\build\Brotli.NET.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>
-->
<ItemGroup>
<PackageReference Include="Brotli.NET" />
<PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" />
<PackageReference Include="Newtonsoft.Json" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" />
<PackageReference Include="System.Net.Http" />
<PackageReference Include="System.Net.Http.Formatting.Extension" />
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" />
</ItemGroup>
<ItemGroup>
<Reference Include="System.Configuration" />
<Reference Include="System.IdentityModel" />
<Reference Include="System.Security" />
<Reference Include="System.Web.Extensions" />
</ItemGroup>
</Project>
Loading