Remove IcePatch2 (#602)

Removed IcePatch2 and the corresponding distrib and patching features in IceGrid and IceGridGUI.

6 files changed, 1 insertions, 208 deletions

diff --git a/csharp/src/Ice/PropertyNames.cs b/csharp/src/Ice/PropertyNames.cs
index d8926852333..d56ee2fbcfd 100644
--- a/csharp/src/Ice/PropertyNames.cs
+++ b/csharp/src/Ice/PropertyNames.cs
@@ -1,7 +1,7 @@
 //
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// Generated by makeprops.py from file ./config/PropertyNames.xml, Thu Jul  2 14:55:02 2020
+// Generated by makeprops.py from file ./config/PropertyNames.xml, Fri Jan 29 15:05:58 2021
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
@@ -1031,60 +1031,6 @@ namespace IceInternal
              null
         };
 
-        public static Property[] IcePatch2Props =
-        {
-             new Property(@"^IcePatch2\.ACM\.Timeout$", false, null),
-             new Property(@"^IcePatch2\.ACM\.Heartbeat$", false, null),
-             new Property(@"^IcePatch2\.ACM\.Close$", false, null),
-             new Property(@"^IcePatch2\.ACM$", false, null),
-             new Property(@"^IcePatch2\.AdapterId$", false, null),
-             new Property(@"^IcePatch2\.Endpoints$", false, null),
-             new Property(@"^IcePatch2\.Locator\.EndpointSelection$", false, null),
-             new Property(@"^IcePatch2\.Locator\.ConnectionCached$", false, null),
-             new Property(@"^IcePatch2\.Locator\.PreferSecure$", false, null),
-             new Property(@"^IcePatch2\.Locator\.LocatorCacheTimeout$", false, null),
-             new Property(@"^IcePatch2\.Locator\.InvocationTimeout$", false, null),
-             new Property(@"^IcePatch2\.Locator\.Locator$", false, null),
-             new Property(@"^IcePatch2\.Locator\.Router$", false, null),
-             new Property(@"^IcePatch2\.Locator\.CollocationOptimized$", false, null),
-             new Property(@"^IcePatch2\.Locator\.Context\.[^\s]+$", false, null),
-             new Property(@"^IcePatch2\.Locator$", false, null),
-             new Property(@"^IcePatch2\.PublishedEndpoints$", false, null),
-             new Property(@"^IcePatch2\.ReplicaGroupId$", false, null),
-             new Property(@"^IcePatch2\.Router\.EndpointSelection$", false, null),
-             new Property(@"^IcePatch2\.Router\.ConnectionCached$", false, null),
-             new Property(@"^IcePatch2\.Router\.PreferSecure$", false, null),
-             new Property(@"^IcePatch2\.Router\.LocatorCacheTimeout$", false, null),
-             new Property(@"^IcePatch2\.Router\.InvocationTimeout$", false, null),
-             new Property(@"^IcePatch2\.Router\.Locator$", false, null),
-             new Property(@"^IcePatch2\.Router\.Router$", false, null),
-             new Property(@"^IcePatch2\.Router\.CollocationOptimized$", false, null),
-             new Property(@"^IcePatch2\.Router\.Context\.[^\s]+$", false, null),
-             new Property(@"^IcePatch2\.Router$", false, null),
-             new Property(@"^IcePatch2\.ProxyOptions$", false, null),
-             new Property(@"^IcePatch2\.ThreadPool\.Size$", false, null),
-             new Property(@"^IcePatch2\.ThreadPool\.SizeMax$", false, null),
-             new Property(@"^IcePatch2\.ThreadPool\.SizeWarn$", false, null),
-             new Property(@"^IcePatch2\.ThreadPool\.StackSize$", false, null),
-             new Property(@"^IcePatch2\.ThreadPool\.Serialize$", false, null),
-             new Property(@"^IcePatch2\.ThreadPool\.ThreadIdleTime$", false, null),
-             new Property(@"^IcePatch2\.ThreadPool\.ThreadPriority$", false, null),
-             new Property(@"^IcePatch2\.MessageSizeMax$", false, null),
-             new Property(@"^IcePatch2\.Directory$", false, null),
-             new Property(@"^IcePatch2\.InstanceName$", false, null),
-             null
-        };
-
-        public static Property[] IcePatch2ClientProps =
-        {
-             new Property(@"^IcePatch2Client\.ChunkSize$", false, null),
-             new Property(@"^IcePatch2Client\.Directory$", false, null),
-             new Property(@"^IcePatch2Client\.Proxy$", false, null),
-             new Property(@"^IcePatch2Client\.Remove$", false, null),
-             new Property(@"^IcePatch2Client\.Thorough$", false, null),
-             null
-        };
-
         public static Property[] IceSSLProps =
         {
              new Property(@"^IceSSL\.Alias$", false, null),
@@ -1344,8 +1290,6 @@ namespace IceInternal
             IceBridgeProps,
             IceGridAdminProps,
             IceGridProps,
-            IcePatch2Props,
-            IcePatch2ClientProps,
             IceSSLProps,
             IceStormAdminProps,
             IceBTProps,
@@ -1366,8 +1310,6 @@ namespace IceInternal
             "IceBridge",
             "IceGridAdmin",
             "IceGrid",
-            "IcePatch2",
-            "IcePatch2Client",
             "IceSSL",
             "IceStormAdmin",
             "IceBT",
diff --git a/csharp/src/IcePatch2/AssemblyInfo.cs b/csharp/src/IcePatch2/AssemblyInfo.cs
deleted file mode 100644
index a0d30967b4e..00000000000
--- a/csharp/src/IcePatch2/AssemblyInfo.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-using System;
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-[assembly: CLSCompliant(true)]
-
-[assembly: AssemblyTitle("IcePatch2 .NET Client Library")]
-[assembly: AssemblyDescription("IcePatch2 .NET Client Library")]
-[assembly: AssemblyCompany("ZeroC, Inc.")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyProduct("Ice")]
-[assembly: AssemblyCopyright("© ZeroC, Inc.")]
-[assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("3.7.5.0")]
-
-[assembly: ComVisible(false)]
diff --git a/csharp/src/IcePatch2/msbuild/icepatch2.csproj b/csharp/src/IcePatch2/msbuild/icepatch2.csproj
deleted file mode 100644
index 89820f5a93e..00000000000
--- a/csharp/src/IcePatch2/msbuild/icepatch2.csproj
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0" DefaultTargets="Build">
-  <Import Project="..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.props')"/>
-  <PropertyGroup Label="Globals">
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-  </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')"/>
-  <PropertyGroup>
-    <ProjectGuid>{6479EE9D-5730-44BC-B564-97211E1B54C5}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AssemblyName>IcePatch2</AssemblyName>
-    <DocumentationFile>..\..\..\Assemblies\IcePatch2.XML</DocumentationFile>
-    <NoWarn>1591;618</NoWarn>
-  </PropertyGroup>
-  <Import Project="$(MSBuildThisFileDirectory)..\..\..\msbuild\ice.common.props"/>
-  <ItemGroup>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\"/>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\AssemblyInfo.cs">
-      <Link>AssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="generated\FileInfo.cs"/>
-    <Compile Include="generated\FileServer.cs"/>
-  </ItemGroup>
-  <ItemGroup>
-    <SliceCompile Include="..\..\..\..\slice\IcePatch2\FileInfo.ice">
-      <Link>FileInfo.ice</Link>
-    </SliceCompile>
-    <SliceCompile Include="..\..\..\..\slice\IcePatch2\FileServer.ice">
-      <Link>FileServer.ice</Link>
-    </SliceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Ice\msbuild\ice.csproj">
-      <Project>{7cb4715e-dd8b-48f8-b478-27b8bd4008c7}</Project>
-      <Name>ice</Name>
-      <Private>False</Private>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config"/>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)..\..\..\msbuild\ice.sign.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('..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.targets'))"/>
-  </Target>
-  <Import Project="..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
diff --git a/csharp/src/IcePatch2/msbuild/net45/icepatch2.csproj b/csharp/src/IcePatch2/msbuild/net45/icepatch2.csproj
deleted file mode 100644
index 96b24118477..00000000000
--- a/csharp/src/IcePatch2/msbuild/net45/icepatch2.csproj
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="14.0">
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.props')"/>
-  <PropertyGroup Label="Globals">
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-  </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"/>
-  <PropertyGroup>
-    <ProjectGuid>{6479EE9D-5730-44BC-B564-97211E1B54C5}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AssemblyName>IcePatch2</AssemblyName>
-    <DocumentationFile>..\..\..\..\lib\net45\IcePatch2.XML</DocumentationFile>
-    <OutputPath>..\..\..\..\lib\net45\</OutputPath>
-    <NoWarn>1591;618</NoWarn>
-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.common.props"/>
-  <ItemGroup>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="Microsoft.CSharp"/>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\"/>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\..\AssemblyInfo.cs">
-      <Link>AssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="generated\FileInfo.cs"/>
-    <Compile Include="generated\FileServer.cs"/>
-  </ItemGroup>
-  <ItemGroup>
-    <SliceCompile Include="..\..\..\..\..\slice\IcePatch2\FileInfo.ice">
-      <Link>FileInfo.ice</Link>
-    </SliceCompile>
-    <SliceCompile Include="..\..\..\..\..\slice\IcePatch2\FileServer.ice">
-      <Link>FileServer.ice</Link>
-    </SliceCompile>
-    <None Include="packages.config"/>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\Ice\msbuild\net45\ice.csproj">
-      <Project>{7cb4715e-dd8b-48f8-b478-27b8bd4008c7}</Project>
-      <Name>ice</Name>
-      <Private>False</Private>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-  <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.sign.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('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.props'))"/>
-    <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.targets'))"/>
-  </Target>
-  <Import Project="..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.targets')"/>
-</Project>
diff --git a/csharp/src/IcePatch2/msbuild/net45/packages.config b/csharp/src/IcePatch2/msbuild/net45/packages.config
deleted file mode 100644
index 3494416e546..00000000000
--- a/csharp/src/IcePatch2/msbuild/net45/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="zeroc.icebuilder.msbuild" version="5.0.6" targetFramework="net451" />
-</packages>
\ No newline at end of file
diff --git a/csharp/src/IcePatch2/msbuild/packages.config b/csharp/src/IcePatch2/msbuild/packages.config
deleted file mode 100644
index 3494416e546..00000000000
--- a/csharp/src/IcePatch2/msbuild/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="zeroc.icebuilder.msbuild" version="5.0.6" targetFramework="net451" />
-</packages>
\ No newline at end of file