sln: clean up proxy project files.

Clean up the proxy project files by adding a 'proxy.props' file to the root of the repository with common properties for proxy projects. Update all proxy projects to reference the common 'proxy.props' file and remove the common properties from the individual project files.
2018-07-27 23:51:46 -04:00 · 2018-07-27 23:51:46 -04:00 · 40cac28aec
--- a/GitCredentialManager.sln
+++ b/GitCredentialManager.sln
@ -18,7 +18,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Files", "Files", "{D6456F11
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Cli-Shared", "Shared\Cli\Cli-Shared.shproj", "{19770407-94D5-49D3-8ED1-C72637BA7D90}"
 EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Gui-Shared", "Shared\Gui\Gui-Shared.shproj", "{19770407-7166-4799-BC7C-D5882637CF7A}"
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Gui-Shared", "Shared\Gui\Gui-Shared.shproj", "{4A4F5ADA-7166-4799-BC7C-D5882637CF7A}"
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Microsoft.Alm.Win32", "Shared\Win32\Microsoft.Alm.Win32.shproj", "{19770407-37CD-41AC-B50C-CF885BBCE344}"
 EndProject
@ -46,11 +46,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.Authentication.Test"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GcmParentWindowTest", "GcmParentWindowTest\GcmParentWindowTest.csproj", "{2F110EEF-14BA-4324-9DA4-C7D16469B064}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Alm.Authentication.Proxy", "Microsoft.Alm.Authentication\Proxy\Microsoft.Alm.Authentication.Proxy.csproj", "{19781214-FE04-4A05-943A-54EB952CEA62}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Alm.Authentication.Proxy", "Microsoft.Alm.Authentication\Proxy\Microsoft.Alm.Authentication.Proxy.csproj", "{04151231-FE04-4A05-943A-54EB952CEA62}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisualStudioTeamServices.Authentication.Proxy", "VisualStudioTeamServices.Authentication\Proxy\VisualStudioTeamServices.Authentication.Proxy.csproj", "{19781214-4FA4-49B2-AE6D-EBDBA36B1169}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisualStudioTeamServices.Authentication.Proxy", "VisualStudioTeamServices.Authentication\Proxy\VisualStudioTeamServices.Authentication.Proxy.csproj", "{04151231-4FA4-49B2-AE6D-EBDBA36B1169}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.Authentication.Proxy", "GitHub.Authentication\Proxy\GitHub.Authentication.Proxy.csproj", "{F24E0E80-4DF4-4312-8F35-72BAD788F741}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.Authentication.Proxy", "GitHub.Authentication\Proxy\GitHub.Authentication.Proxy.csproj", "{04151231-4DF4-4312-8F35-72BAD788F741}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{FFD83274-AA49-445A-ABE3-ED487B35A4A6}"
 	ProjectSection(SolutionItems) = preProject
@ -58,6 +58,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{FFD83274
 		build-docs.cmd = build-docs.cmd
 		build.props = build.props
 		build.targets = build.targets
+		proxy.props = proxy.props
 		test.props = test.props
 		test.targets = test.targets
 		vsts-ci.yml = vsts-ci.yml
@ -69,10 +70,10 @@ Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		Shared\Win32\Microsoft.Alm.Win32.projitems*{19770407-37cd-41ac-b50c-cf885bbce344}*SharedItemsImports = 13
 		Shared\Cli\Cli-Shared.projitems*{19770407-63d4-40a8-a9df-f1c4b473308a}*SharedItemsImports = 4
-		Shared\Gui\Gui-Shared.projitems*{19770407-7166-4799-bc7c-d5882637cf7a}*SharedItemsImports = 13
 		Shared\Cli\Cli-Shared.projitems*{19770407-94d5-49d3-8ed1-c72637ba7d90}*SharedItemsImports = 13
 		Shared\Cli\Cli-Shared.projitems*{19770407-b33a-4ebe-92b8-04c93f43cae0}*SharedItemsImports = 4
 		Shared\Win32\Microsoft.Alm.Win32.projitems*{19770407-b493-459d-bb4f-04fbefb1ba13}*SharedItemsImports = 4
+		Shared\Gui\Gui-Shared.projitems*{4a4f5ada-7166-4799-bc7c-d5882637cf7a}*SharedItemsImports = 13
 		Shared\Gui\Gui-Shared.projitems*{cf306116-bbf0-4cc7-afce-a506ac4752cb}*SharedItemsImports = 4
 		Shared\Gui\Gui-Shared.projitems*{ee663736-5bad-4ca6-a4f8-99978925ad8a}*SharedItemsImports = 4
 	EndGlobalSection
@ -129,18 +130,18 @@ Global
 		{2F110EEF-14BA-4324-9DA4-C7D16469B064}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2F110EEF-14BA-4324-9DA4-C7D16469B064}.Release|Any CPU.ActiveCfg = Debug|Any CPU
 		{2F110EEF-14BA-4324-9DA4-C7D16469B064}.Release|Any CPU.Build.0 = Debug|Any CPU
-		{19781214-FE04-4A05-943A-54EB952CEA62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{19781214-FE04-4A05-943A-54EB952CEA62}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{19781214-FE04-4A05-943A-54EB952CEA62}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{19781214-FE04-4A05-943A-54EB952CEA62}.Release|Any CPU.Build.0 = Release|Any CPU
-		{19781214-4FA4-49B2-AE6D-EBDBA36B1169}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{19781214-4FA4-49B2-AE6D-EBDBA36B1169}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{19781214-4FA4-49B2-AE6D-EBDBA36B1169}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{19781214-4FA4-49B2-AE6D-EBDBA36B1169}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F24E0E80-4DF4-4312-8F35-72BAD788F741}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F24E0E80-4DF4-4312-8F35-72BAD788F741}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F24E0E80-4DF4-4312-8F35-72BAD788F741}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F24E0E80-4DF4-4312-8F35-72BAD788F741}.Release|Any CPU.Build.0 = Release|Any CPU
+		{04151231-FE04-4A05-943A-54EB952CEA62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{04151231-FE04-4A05-943A-54EB952CEA62}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{04151231-FE04-4A05-943A-54EB952CEA62}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{04151231-FE04-4A05-943A-54EB952CEA62}.Release|Any CPU.Build.0 = Release|Any CPU
+		{04151231-4FA4-49B2-AE6D-EBDBA36B1169}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{04151231-4FA4-49B2-AE6D-EBDBA36B1169}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{04151231-4FA4-49B2-AE6D-EBDBA36B1169}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{04151231-4FA4-49B2-AE6D-EBDBA36B1169}.Release|Any CPU.Build.0 = Release|Any CPU
+		{04151231-4DF4-4312-8F35-72BAD788F741}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{04151231-4DF4-4312-8F35-72BAD788F741}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{04151231-4DF4-4312-8F35-72BAD788F741}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{04151231-4DF4-4312-8F35-72BAD788F741}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/GitHub.Authentication/Proxy/GitHub.Authentication.Proxy.csproj
+++ b/GitHub.Authentication/Proxy/GitHub.Authentication.Proxy.csproj
@ -3,37 +3,16 @@
  <Import Project="..\..\packages\Microsoft.Net.Compilers.2.8.0\build\Microsoft.Net.Compilers.props" Condition="Exists('..\..\packages\Microsoft.Net.Compilers.2.8.0\build\Microsoft.Net.Compilers.props')" />
  <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>{F24E0E80-4DF4-4312-8F35-72BAD788F741}</ProjectGuid>
-    <OutputType>Library</OutputType>
+    <ProjectGuid>{04151231-4DF4-4312-8F35-72BAD788F741}</ProjectGuid>
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>GitHub.Authentication.Test</RootNamespace>
    <AssemblyName>GitHub.Authentication.Proxy</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
    <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>
+  <Import Project="..\..\Proxy.props" />
  <ItemGroup>
    <ProjectReference Include="..\..\Microsoft.Alm.Authentication\Proxy\Microsoft.Alm.Authentication.Proxy.csproj">
-      <Project>{f24e0e80-fe04-4a05-943a-54eb952cea62}</Project>
+      <Project>{04151231-fe04-4a05-943a-54eb952cea62}</Project>
      <Name>Microsoft.Alm.Authentication.Proxy</Name>
    </ProjectReference>
    <ProjectReference Include="..\..\Microsoft.Alm.Authentication\Src\Microsoft.Alm.Authentication.csproj">
@ -97,4 +76,4 @@
    </PropertyGroup>
    <Error Condition="!Exists('..\..\packages\Microsoft.Net.Compilers.2.8.0\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Net.Compilers.2.8.0\build\Microsoft.Net.Compilers.props'))" />
  </Target>
-</Project>
+</Project>
--- a/Microsoft.Alm.Authentication/Proxy/Microsoft.Alm.Authentication.Proxy.csproj
+++ b/Microsoft.Alm.Authentication/Proxy/Microsoft.Alm.Authentication.Proxy.csproj
@ -3,34 +3,13 @@
  <Import Project="..\..\packages\Microsoft.Net.Compilers.2.8.0\build\Microsoft.Net.Compilers.props" Condition="Exists('..\..\packages\Microsoft.Net.Compilers.2.8.0\build\Microsoft.Net.Compilers.props')" />
  <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>{19781214-FE04-4A05-943A-54EB952CEA62}</ProjectGuid>
-    <OutputType>Library</OutputType>
+    <ProjectGuid>{04151231-FE04-4A05-943A-54EB952CEA62}</ProjectGuid>
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>Microsoft.Alm.Authentication.Test</RootNamespace>
    <AssemblyName>Microsoft.Alm.Authentication.Proxy</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
    <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>
+  <Import Project="..\..\Proxy.props" />
  <ItemGroup>
    <ProjectReference Include="..\Src\Microsoft.Alm.Authentication.csproj">
      <Project>{19770407-b493-459d-bb4f-04fbefb1ba13}</Project>
@ -100,4 +79,4 @@
    </PropertyGroup>
    <Error Condition="!Exists('..\..\packages\Microsoft.Net.Compilers.2.8.0\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Net.Compilers.2.8.0\build\Microsoft.Net.Compilers.props'))" />
  </Target>
-</Project>
+</Project>
--- a/Shared/Gui/Gui-Shared.shproj
+++ b/Shared/Gui/Gui-Shared.shproj
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup Label="Globals">
-    <ProjectGuid>19770407-7166-4799-bc7c-d5882637cf7a</ProjectGuid>
+    <ProjectGuid>{4A4F5ADA-7166-4799-BC7C-D5882637CF7A}</ProjectGuid>
    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
  </PropertyGroup>
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
@ -10,4 +10,4 @@
  <PropertyGroup />
  <Import Project="Gui-Shared.projitems" Label="Shared" />
  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
-</Project>
+</Project>
--- a/VisualStudioTeamServices.Authentication/Proxy/VisualStudioTeamServices.Authentication.Proxy.csproj
+++ b/VisualStudioTeamServices.Authentication/Proxy/VisualStudioTeamServices.Authentication.Proxy.csproj
@ -3,36 +3,13 @@
  <Import Project="..\..\packages\Microsoft.Net.Compilers.2.8.0\build\Microsoft.Net.Compilers.props" Condition="Exists('..\..\packages\Microsoft.Net.Compilers.2.8.0\build\Microsoft.Net.Compilers.props')" />
  <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>{19781214-4FA4-49B2-AE6D-EBDBA36B1169}</ProjectGuid>
-    <OutputType>Library</OutputType>
+    <ProjectGuid>{04151231-4FA4-49B2-AE6D-EBDBA36B1169}</ProjectGuid>
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>VisualStudioTeamServices.Authentication.Test</RootNamespace>
    <AssemblyName>VisualStudioTeamServices.Authentication.Proxy</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <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>
    <NuGetPackageImportStamp />
  </PropertyGroup>
+  <Import Project="..\..\Proxy.props" />
  <ItemGroup>
    <ProjectReference Include="..\..\Microsoft.Alm.Authentication\Proxy\Microsoft.Alm.Authentication.Proxy.csproj">
      <Project>{04151231-fe04-4a05-943a-54eb952cea62}</Project>
--- a/build.props
+++ b/build.props
@ -36,4 +36,4 @@
    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
    <WarningsAsErrors />
  </PropertyGroup>
-</Project>
+</Project>
--- a/proxy.props
+++ b/proxy.props
@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="Build.props" />
+  <PropertyGroup>
+    <ProjectName>Proxy</ProjectName>
+    <ProjectUrl>https://github.com/Microsoft/Git-Credential-Manager-for-Windows</ProjectUrl>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup>
+    <TargetFrameworkProfile />
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <RunCodeAnalysis>false</RunCodeAnalysis>
+  </PropertyGroup>
+  <PropertyGroup>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+</Project>
--- a/test.props
+++ b/test.props
@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="Build.props" />
  <PropertyGroup>
    <ProjectName>Test</ProjectName>
    <ProjectUrl>https://github.com/Microsoft/Git-Credential-Manager-for-Windows</ProjectUrl>
@ -12,7 +13,6 @@
    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
  </PropertyGroup>
-  <Import Project="Build.props" />
  <PropertyGroup>
    <TargetFrameworkProfile />
    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
@ -33,4 +33,4 @@
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </None>
  </ItemGroup>
-</Project>
+</Project>