diff options
Diffstat (limited to 'csharp')
27 files changed, 0 insertions, 2041 deletions
diff --git a/csharp/msbuild/ice.net45.test.sln b/csharp/msbuild/ice.net45.test.sln index 9744ae92ac2..72a3130e7b8 100644 --- a/csharp/msbuild/ice.net45.test.sln +++ b/csharp/msbuild/ice.net45.test.sln @@ -361,12 +361,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "client", "..\test\Ice\plugi EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "plugin", "..\test\Ice\plugin\msbuild\plugin\net45\plugin.csproj", "{6BB08E6D-971D-4EEA-890F-8EFF41CBF727}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "checksum", "checksum", "{3D18DB62-F823-4812-9B79-CB7616B12A57}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "client", "..\test\Ice\checksum\msbuild\client\net45\client.csproj", "{BC907ED2-6883-4DFB-BDAB-957AFB986073}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "server", "..\test\Ice\checksum\msbuild\server\net45\server.csproj", "{AE7C3036-ADC3-44AB-B6DA-5C40E6E00527}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "escape", "escape", "{9549A2D9-ACA6-4962-8FF6-4170CD5F6C31}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "client", "..\test\Slice\escape\msbuild\client\net45\client.csproj", "{C7242DDD-86A7-43C7-B1F2-F3D60B392375}" @@ -1849,30 +1843,6 @@ Global {6BB08E6D-971D-4EEA-890F-8EFF41CBF727}.Release|x64.Build.0 = Release|x64 {6BB08E6D-971D-4EEA-890F-8EFF41CBF727}.Release|x86.ActiveCfg = Release|Win32 {6BB08E6D-971D-4EEA-890F-8EFF41CBF727}.Release|x86.Build.0 = Release|Win32 - {BC907ED2-6883-4DFB-BDAB-957AFB986073}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BC907ED2-6883-4DFB-BDAB-957AFB986073}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BC907ED2-6883-4DFB-BDAB-957AFB986073}.Debug|x64.ActiveCfg = Debug|x64 - {BC907ED2-6883-4DFB-BDAB-957AFB986073}.Debug|x64.Build.0 = Debug|x64 - {BC907ED2-6883-4DFB-BDAB-957AFB986073}.Debug|x86.ActiveCfg = Debug|Win32 - {BC907ED2-6883-4DFB-BDAB-957AFB986073}.Debug|x86.Build.0 = Debug|Win32 - {BC907ED2-6883-4DFB-BDAB-957AFB986073}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BC907ED2-6883-4DFB-BDAB-957AFB986073}.Release|Any CPU.Build.0 = Release|Any CPU - {BC907ED2-6883-4DFB-BDAB-957AFB986073}.Release|x64.ActiveCfg = Release|x64 - {BC907ED2-6883-4DFB-BDAB-957AFB986073}.Release|x64.Build.0 = Release|x64 - {BC907ED2-6883-4DFB-BDAB-957AFB986073}.Release|x86.ActiveCfg = Release|Win32 - {BC907ED2-6883-4DFB-BDAB-957AFB986073}.Release|x86.Build.0 = Release|Win32 - {AE7C3036-ADC3-44AB-B6DA-5C40E6E00527}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AE7C3036-ADC3-44AB-B6DA-5C40E6E00527}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AE7C3036-ADC3-44AB-B6DA-5C40E6E00527}.Debug|x64.ActiveCfg = Debug|x64 - {AE7C3036-ADC3-44AB-B6DA-5C40E6E00527}.Debug|x64.Build.0 = Debug|x64 - {AE7C3036-ADC3-44AB-B6DA-5C40E6E00527}.Debug|x86.ActiveCfg = Debug|Win32 - {AE7C3036-ADC3-44AB-B6DA-5C40E6E00527}.Debug|x86.Build.0 = Debug|Win32 - {AE7C3036-ADC3-44AB-B6DA-5C40E6E00527}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AE7C3036-ADC3-44AB-B6DA-5C40E6E00527}.Release|Any CPU.Build.0 = Release|Any CPU - {AE7C3036-ADC3-44AB-B6DA-5C40E6E00527}.Release|x64.ActiveCfg = Release|x64 - {AE7C3036-ADC3-44AB-B6DA-5C40E6E00527}.Release|x64.Build.0 = Release|x64 - {AE7C3036-ADC3-44AB-B6DA-5C40E6E00527}.Release|x86.ActiveCfg = Release|Win32 - {AE7C3036-ADC3-44AB-B6DA-5C40E6E00527}.Release|x86.Build.0 = Release|Win32 {C7242DDD-86A7-43C7-B1F2-F3D60B392375}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C7242DDD-86A7-43C7-B1F2-F3D60B392375}.Debug|Any CPU.Build.0 = Debug|Any CPU {C7242DDD-86A7-43C7-B1F2-F3D60B392375}.Debug|x64.ActiveCfg = Debug|x64 @@ -2229,9 +2199,6 @@ Global {795D56E7-49A4-4806-AF94-99BEE8A5DD9D} = {484370F6-E5AC-4355-8667-4E4E79CEF6FE} {86C132FD-A250-4F78-AE7E-8FCDDCFFFDE4} = {795D56E7-49A4-4806-AF94-99BEE8A5DD9D} {6BB08E6D-971D-4EEA-890F-8EFF41CBF727} = {795D56E7-49A4-4806-AF94-99BEE8A5DD9D} - {3D18DB62-F823-4812-9B79-CB7616B12A57} = {484370F6-E5AC-4355-8667-4E4E79CEF6FE} - {BC907ED2-6883-4DFB-BDAB-957AFB986073} = {3D18DB62-F823-4812-9B79-CB7616B12A57} - {AE7C3036-ADC3-44AB-B6DA-5C40E6E00527} = {3D18DB62-F823-4812-9B79-CB7616B12A57} {9549A2D9-ACA6-4962-8FF6-4170CD5F6C31} = {15A93BEB-F659-4C3C-AE6A-C84F9694909C} {C7242DDD-86A7-43C7-B1F2-F3D60B392375} = {9549A2D9-ACA6-4962-8FF6-4170CD5F6C31} {9DFAF661-EDED-4166-89AE-6731D44AB25E} = {484370F6-E5AC-4355-8667-4E4E79CEF6FE} diff --git a/csharp/msbuild/ice.net5.0.test.sln b/csharp/msbuild/ice.net5.0.test.sln index 3f569d0efeb..cfbf04f59c0 100644 --- a/csharp/msbuild/ice.net5.0.test.sln +++ b/csharp/msbuild/ice.net5.0.test.sln @@ -444,18 +444,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "client", "client", "{A313EF EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "client", "..\test\Ice\defaultValue\msbuild\client\net5.0\client.csproj", "{279C3FC6-CCEF-4D75-9DD0-0BC5ABDBD466}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "checksum", "checksum", "{E2F5B97C-9D80-4318-943D-F4D0D6F338C7}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "msbuild", "msbuild", "{8DBB5F22-BA3B-4BF7-9456-FDBD1D803E74}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "client", "client", "{22C308B6-D201-48F0-9606-0A7E16800857}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "client", "..\test\Ice\checksum\msbuild\client\net5.0\client.csproj", "{3B184D55-D349-43ED-BF6E-C624740317FA}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "server", "server", "{87B417E9-D816-4C6D-96E3-DE8B30629161}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "server", "..\test\Ice\checksum\msbuild\server\net5.0\server.csproj", "{DD6B4483-AFC6-4F1B-95AE-4243D0B377A0}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "optional", "optional", "{3EF9C591-5A45-4490-B6AC-119A8FF2DD5B}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "msbuild", "msbuild", "{65E7885D-FA93-412D-822B-DC4510D9AD1B}" @@ -1728,30 +1716,6 @@ Global {279C3FC6-CCEF-4D75-9DD0-0BC5ABDBD466}.Release|x64.Build.0 = Release|Any CPU {279C3FC6-CCEF-4D75-9DD0-0BC5ABDBD466}.Release|x86.ActiveCfg = Release|Any CPU {279C3FC6-CCEF-4D75-9DD0-0BC5ABDBD466}.Release|x86.Build.0 = Release|Any CPU - {3B184D55-D349-43ED-BF6E-C624740317FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3B184D55-D349-43ED-BF6E-C624740317FA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3B184D55-D349-43ED-BF6E-C624740317FA}.Debug|x64.ActiveCfg = Debug|Any CPU - {3B184D55-D349-43ED-BF6E-C624740317FA}.Debug|x64.Build.0 = Debug|Any CPU - {3B184D55-D349-43ED-BF6E-C624740317FA}.Debug|x86.ActiveCfg = Debug|Any CPU - {3B184D55-D349-43ED-BF6E-C624740317FA}.Debug|x86.Build.0 = Debug|Any CPU - {3B184D55-D349-43ED-BF6E-C624740317FA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3B184D55-D349-43ED-BF6E-C624740317FA}.Release|Any CPU.Build.0 = Release|Any CPU - {3B184D55-D349-43ED-BF6E-C624740317FA}.Release|x64.ActiveCfg = Release|Any CPU - {3B184D55-D349-43ED-BF6E-C624740317FA}.Release|x64.Build.0 = Release|Any CPU - {3B184D55-D349-43ED-BF6E-C624740317FA}.Release|x86.ActiveCfg = Release|Any CPU - {3B184D55-D349-43ED-BF6E-C624740317FA}.Release|x86.Build.0 = Release|Any CPU - {DD6B4483-AFC6-4F1B-95AE-4243D0B377A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DD6B4483-AFC6-4F1B-95AE-4243D0B377A0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DD6B4483-AFC6-4F1B-95AE-4243D0B377A0}.Debug|x64.ActiveCfg = Debug|Any CPU - {DD6B4483-AFC6-4F1B-95AE-4243D0B377A0}.Debug|x64.Build.0 = Debug|Any CPU - {DD6B4483-AFC6-4F1B-95AE-4243D0B377A0}.Debug|x86.ActiveCfg = Debug|Any CPU - {DD6B4483-AFC6-4F1B-95AE-4243D0B377A0}.Debug|x86.Build.0 = Debug|Any CPU - {DD6B4483-AFC6-4F1B-95AE-4243D0B377A0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DD6B4483-AFC6-4F1B-95AE-4243D0B377A0}.Release|Any CPU.Build.0 = Release|Any CPU - {DD6B4483-AFC6-4F1B-95AE-4243D0B377A0}.Release|x64.ActiveCfg = Release|Any CPU - {DD6B4483-AFC6-4F1B-95AE-4243D0B377A0}.Release|x64.Build.0 = Release|Any CPU - {DD6B4483-AFC6-4F1B-95AE-4243D0B377A0}.Release|x86.ActiveCfg = Release|Any CPU - {DD6B4483-AFC6-4F1B-95AE-4243D0B377A0}.Release|x86.Build.0 = Release|Any CPU {9F385295-C422-48E2-9184-88773DC979F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9F385295-C422-48E2-9184-88773DC979F5}.Debug|Any CPU.Build.0 = Debug|Any CPU {9F385295-C422-48E2-9184-88773DC979F5}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -2589,12 +2553,6 @@ Global {067AD0E3-7AE3-4175-A84D-BD1C682E6D0C} = {B216E5A3-9285-4B4E-B0FA-86EAAC73929D} {A313EF12-CC3B-4BC1-95F2-1A963369DA3F} = {067AD0E3-7AE3-4175-A84D-BD1C682E6D0C} {279C3FC6-CCEF-4D75-9DD0-0BC5ABDBD466} = {A313EF12-CC3B-4BC1-95F2-1A963369DA3F} - {E2F5B97C-9D80-4318-943D-F4D0D6F338C7} = {85BCFA35-57C4-447A-BBD6-C81D2F12AD25} - {8DBB5F22-BA3B-4BF7-9456-FDBD1D803E74} = {E2F5B97C-9D80-4318-943D-F4D0D6F338C7} - {22C308B6-D201-48F0-9606-0A7E16800857} = {8DBB5F22-BA3B-4BF7-9456-FDBD1D803E74} - {3B184D55-D349-43ED-BF6E-C624740317FA} = {22C308B6-D201-48F0-9606-0A7E16800857} - {87B417E9-D816-4C6D-96E3-DE8B30629161} = {8DBB5F22-BA3B-4BF7-9456-FDBD1D803E74} - {DD6B4483-AFC6-4F1B-95AE-4243D0B377A0} = {87B417E9-D816-4C6D-96E3-DE8B30629161} {3EF9C591-5A45-4490-B6AC-119A8FF2DD5B} = {85BCFA35-57C4-447A-BBD6-C81D2F12AD25} {65E7885D-FA93-412D-822B-DC4510D9AD1B} = {3EF9C591-5A45-4490-B6AC-119A8FF2DD5B} {AE39F912-1A33-45E9-BDAB-39594BFF0CDD} = {65E7885D-FA93-412D-822B-DC4510D9AD1B} diff --git a/csharp/msbuild/ice.netstandard2.0.test.sln b/csharp/msbuild/ice.netstandard2.0.test.sln index c85b0351a5f..a28892f0d77 100644 --- a/csharp/msbuild/ice.netstandard2.0.test.sln +++ b/csharp/msbuild/ice.netstandard2.0.test.sln @@ -444,18 +444,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "client", "client", "{A313EF EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "client", "..\test\Ice\defaultValue\msbuild\client\netstandard2.0\client.csproj", "{279C3FC6-CCEF-4D75-9DD0-0BC5ABDBD466}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "checksum", "checksum", "{E2F5B97C-9D80-4318-943D-F4D0D6F338C7}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "msbuild", "msbuild", "{8DBB5F22-BA3B-4BF7-9456-FDBD1D803E74}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "client", "client", "{22C308B6-D201-48F0-9606-0A7E16800857}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "client", "..\test\Ice\checksum\msbuild\client\netstandard2.0\client.csproj", "{3B184D55-D349-43ED-BF6E-C624740317FA}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "server", "server", "{87B417E9-D816-4C6D-96E3-DE8B30629161}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "server", "..\test\Ice\checksum\msbuild\server\netstandard2.0\server.csproj", "{DD6B4483-AFC6-4F1B-95AE-4243D0B377A0}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "optional", "optional", "{3EF9C591-5A45-4490-B6AC-119A8FF2DD5B}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "msbuild", "msbuild", "{65E7885D-FA93-412D-822B-DC4510D9AD1B}" @@ -1728,30 +1716,6 @@ Global {279C3FC6-CCEF-4D75-9DD0-0BC5ABDBD466}.Release|x64.Build.0 = Release|Any CPU {279C3FC6-CCEF-4D75-9DD0-0BC5ABDBD466}.Release|x86.ActiveCfg = Release|Any CPU {279C3FC6-CCEF-4D75-9DD0-0BC5ABDBD466}.Release|x86.Build.0 = Release|Any CPU - {3B184D55-D349-43ED-BF6E-C624740317FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3B184D55-D349-43ED-BF6E-C624740317FA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3B184D55-D349-43ED-BF6E-C624740317FA}.Debug|x64.ActiveCfg = Debug|Any CPU - {3B184D55-D349-43ED-BF6E-C624740317FA}.Debug|x64.Build.0 = Debug|Any CPU - {3B184D55-D349-43ED-BF6E-C624740317FA}.Debug|x86.ActiveCfg = Debug|Any CPU - {3B184D55-D349-43ED-BF6E-C624740317FA}.Debug|x86.Build.0 = Debug|Any CPU - {3B184D55-D349-43ED-BF6E-C624740317FA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3B184D55-D349-43ED-BF6E-C624740317FA}.Release|Any CPU.Build.0 = Release|Any CPU - {3B184D55-D349-43ED-BF6E-C624740317FA}.Release|x64.ActiveCfg = Release|Any CPU - {3B184D55-D349-43ED-BF6E-C624740317FA}.Release|x64.Build.0 = Release|Any CPU - {3B184D55-D349-43ED-BF6E-C624740317FA}.Release|x86.ActiveCfg = Release|Any CPU - {3B184D55-D349-43ED-BF6E-C624740317FA}.Release|x86.Build.0 = Release|Any CPU - {DD6B4483-AFC6-4F1B-95AE-4243D0B377A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DD6B4483-AFC6-4F1B-95AE-4243D0B377A0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DD6B4483-AFC6-4F1B-95AE-4243D0B377A0}.Debug|x64.ActiveCfg = Debug|Any CPU - {DD6B4483-AFC6-4F1B-95AE-4243D0B377A0}.Debug|x64.Build.0 = Debug|Any CPU - {DD6B4483-AFC6-4F1B-95AE-4243D0B377A0}.Debug|x86.ActiveCfg = Debug|Any CPU - {DD6B4483-AFC6-4F1B-95AE-4243D0B377A0}.Debug|x86.Build.0 = Debug|Any CPU - {DD6B4483-AFC6-4F1B-95AE-4243D0B377A0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DD6B4483-AFC6-4F1B-95AE-4243D0B377A0}.Release|Any CPU.Build.0 = Release|Any CPU - {DD6B4483-AFC6-4F1B-95AE-4243D0B377A0}.Release|x64.ActiveCfg = Release|Any CPU - {DD6B4483-AFC6-4F1B-95AE-4243D0B377A0}.Release|x64.Build.0 = Release|Any CPU - {DD6B4483-AFC6-4F1B-95AE-4243D0B377A0}.Release|x86.ActiveCfg = Release|Any CPU - {DD6B4483-AFC6-4F1B-95AE-4243D0B377A0}.Release|x86.Build.0 = Release|Any CPU {9F385295-C422-48E2-9184-88773DC979F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9F385295-C422-48E2-9184-88773DC979F5}.Debug|Any CPU.Build.0 = Debug|Any CPU {9F385295-C422-48E2-9184-88773DC979F5}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -2589,12 +2553,6 @@ Global {067AD0E3-7AE3-4175-A84D-BD1C682E6D0C} = {B216E5A3-9285-4B4E-B0FA-86EAAC73929D} {A313EF12-CC3B-4BC1-95F2-1A963369DA3F} = {067AD0E3-7AE3-4175-A84D-BD1C682E6D0C} {279C3FC6-CCEF-4D75-9DD0-0BC5ABDBD466} = {A313EF12-CC3B-4BC1-95F2-1A963369DA3F} - {E2F5B97C-9D80-4318-943D-F4D0D6F338C7} = {85BCFA35-57C4-447A-BBD6-C81D2F12AD25} - {8DBB5F22-BA3B-4BF7-9456-FDBD1D803E74} = {E2F5B97C-9D80-4318-943D-F4D0D6F338C7} - {22C308B6-D201-48F0-9606-0A7E16800857} = {8DBB5F22-BA3B-4BF7-9456-FDBD1D803E74} - {3B184D55-D349-43ED-BF6E-C624740317FA} = {22C308B6-D201-48F0-9606-0A7E16800857} - {87B417E9-D816-4C6D-96E3-DE8B30629161} = {8DBB5F22-BA3B-4BF7-9456-FDBD1D803E74} - {DD6B4483-AFC6-4F1B-95AE-4243D0B377A0} = {87B417E9-D816-4C6D-96E3-DE8B30629161} {3EF9C591-5A45-4490-B6AC-119A8FF2DD5B} = {85BCFA35-57C4-447A-BBD6-C81D2F12AD25} {65E7885D-FA93-412D-822B-DC4510D9AD1B} = {3EF9C591-5A45-4490-B6AC-119A8FF2DD5B} {AE39F912-1A33-45E9-BDAB-39594BFF0CDD} = {65E7885D-FA93-412D-822B-DC4510D9AD1B} diff --git a/csharp/msbuild/ice.xamarin.test.sln b/csharp/msbuild/ice.xamarin.test.sln index 4dcefe3f208..8dd3237b743 100644 --- a/csharp/msbuild/ice.xamarin.test.sln +++ b/csharp/msbuild/ice.xamarin.test.sln @@ -33,10 +33,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "binding", "binding", "{3758 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "test", "..\test\Ice\binding\msbuild\test\netstandard2.0\test.csproj", "{723D6742-BFAC-4265-84C5-60EB6AB60A2C}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "checksum", "checksum", "{722AB792-C978-4633-A82A-02781EA97ECD}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "test", "..\test\Ice\checksum\msbuild\test\netstandard2.0\test.csproj", "{0205DBD3-3A5C-4342-B511-79439D4A7801}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "defaultServant", "defaultServant", "{552AB952-499C-4B62-9F09-90BAA194FBE1}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "test", "..\test\Ice\defaultServant\msbuild\test\netstandard2.0\test.csproj", "{3A49DE34-5AA0-4B12-B3E4-01CA99E8EA8E}" @@ -701,54 +697,6 @@ Global {723D6742-BFAC-4265-84C5-60EB6AB60A2C}.Release|x64.Build.0 = Release|Any CPU {723D6742-BFAC-4265-84C5-60EB6AB60A2C}.Release|x86.ActiveCfg = Release|Any CPU {723D6742-BFAC-4265-84C5-60EB6AB60A2C}.Release|x86.Build.0 = Release|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Ad-Hoc|x64.Build.0 = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Ad-Hoc|x86.Build.0 = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.AppStore|Any CPU.Build.0 = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.AppStore|ARM.ActiveCfg = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.AppStore|ARM.Build.0 = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.AppStore|iPhone.ActiveCfg = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.AppStore|iPhone.Build.0 = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.AppStore|x64.ActiveCfg = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.AppStore|x64.Build.0 = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.AppStore|x86.ActiveCfg = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.AppStore|x86.Build.0 = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Debug|ARM.ActiveCfg = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Debug|ARM.Build.0 = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Debug|iPhone.Build.0 = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Debug|x64.ActiveCfg = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Debug|x64.Build.0 = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Debug|x86.ActiveCfg = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Debug|x86.Build.0 = Debug|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Release|Any CPU.Build.0 = Release|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Release|ARM.ActiveCfg = Release|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Release|ARM.Build.0 = Release|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Release|iPhone.ActiveCfg = Release|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Release|iPhone.Build.0 = Release|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Release|x64.ActiveCfg = Release|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Release|x64.Build.0 = Release|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Release|x86.ActiveCfg = Release|Any CPU - {0205DBD3-3A5C-4342-B511-79439D4A7801}.Release|x86.Build.0 = Release|Any CPU {3A49DE34-5AA0-4B12-B3E4-01CA99E8EA8E}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU {3A49DE34-5AA0-4B12-B3E4-01CA99E8EA8E}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU {3A49DE34-5AA0-4B12-B3E4-01CA99E8EA8E}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU @@ -2059,8 +2007,6 @@ Global {F949076A-E4E8-4662-8099-211F47199863} = {38CCD9BB-576F-4DB3-9928-756D4FD73CBE} {3758776C-A23F-4FDA-A406-2354908A3E43} = {484E315B-A0A7-4BB5-8128-02DA7708E3DE} {723D6742-BFAC-4265-84C5-60EB6AB60A2C} = {3758776C-A23F-4FDA-A406-2354908A3E43} - {722AB792-C978-4633-A82A-02781EA97ECD} = {484E315B-A0A7-4BB5-8128-02DA7708E3DE} - {0205DBD3-3A5C-4342-B511-79439D4A7801} = {722AB792-C978-4633-A82A-02781EA97ECD} {552AB952-499C-4B62-9F09-90BAA194FBE1} = {484E315B-A0A7-4BB5-8128-02DA7708E3DE} {3A49DE34-5AA0-4B12-B3E4-01CA99E8EA8E} = {552AB952-499C-4B62-9F09-90BAA194FBE1} {816AF508-01A3-4B01-A699-949F65B25446} = {484E315B-A0A7-4BB5-8128-02DA7708E3DE} diff --git a/csharp/src/Ice/SliceChecksums.cs b/csharp/src/Ice/SliceChecksums.cs deleted file mode 100644 index 6444be3dc8d..00000000000 --- a/csharp/src/Ice/SliceChecksums.cs +++ /dev/null @@ -1,30 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -namespace Ice -{ - using System; - using System.Collections; - using System.Collections.Generic; - using System.Reflection; - - public sealed class SliceChecksums - { - public static Dictionary<string, string> checksums = new Dictionary<string, string>(); - static SliceChecksums() - { - Type[] types = IceInternal.AssemblyUtil.findTypesWithPrefix("IceInternal.SliceChecksums"); - foreach(Type t in types) - { - FieldInfo f = t.GetField("map", BindingFlags.Public | BindingFlags.Static); - Hashtable map = (Hashtable)f.GetValue(null); - foreach(DictionaryEntry entry in map) - { - checksums.Add((string)entry.Key, (string)entry.Value); - } - } - } - } - -} diff --git a/csharp/src/Ice/msbuild/net45/ice.csproj b/csharp/src/Ice/msbuild/net45/ice.csproj index fa776c3cb8d..cb3ccc37e83 100644 --- a/csharp/src/Ice/msbuild/net45/ice.csproj +++ b/csharp/src/Ice/msbuild/net45/ice.csproj @@ -259,9 +259,6 @@ <Compile Include="..\..\ServantManager.cs"> <Link>ServantManager.cs</Link> </Compile> - <Compile Include="..\..\SliceChecksums.cs"> - <Link>SliceChecksums.cs</Link> - </Compile> <Compile Include="..\..\SlicedData.cs"> <Link>SlicedData.cs</Link> </Compile> @@ -372,7 +369,6 @@ <Compile Include="generated\RemoteLogger.cs"/> <Compile Include="generated\Router.cs"/> <Compile Include="generated\ServantLocator.cs"/> - <Compile Include="generated\SliceChecksumDict.cs"/> <Compile Include="generated\ValueFactory.cs"/> <Compile Include="generated\Version.cs"/> </ItemGroup> @@ -446,9 +442,6 @@ <SliceCompile Include="..\..\..\..\..\slice\Ice\ServantLocator.ice"> <Link>ServantLocator.ice</Link> </SliceCompile> - <SliceCompile Include="..\..\..\..\..\slice\Ice\SliceChecksumDict.ice"> - <Link>SliceChecksumDict.ice</Link> - </SliceCompile> <SliceCompile Include="..\..\..\..\..\slice\Ice\ValueFactory.ice"> <Link>ValueFactory.ice</Link> </SliceCompile> diff --git a/csharp/src/IceBox/ServiceManagerI.cs b/csharp/src/IceBox/ServiceManagerI.cs index bd0ef6e72ff..bdb631e0510 100644 --- a/csharp/src/IceBox/ServiceManagerI.cs +++ b/csharp/src/IceBox/ServiceManagerI.cs @@ -48,12 +48,6 @@ class ServiceManagerI : ServiceManagerDisp_ _argv = args; _traceServiceObserver = _communicator.getProperties().getPropertyAsInt("IceBox.Trace.ServiceObserver"); } - - public override Dictionary<string, string> getSliceChecksums(Ice.Current current) - { - return Ice.SliceChecksums.checksums; - } - public override void startService(string name, Ice.Current current) { ServiceInfo info = new ServiceInfo(); diff --git a/csharp/test/Ice/checksum/AllTests.cs b/csharp/test/Ice/checksum/AllTests.cs deleted file mode 100644 index 2c589a61fff..00000000000 --- a/csharp/test/Ice/checksum/AllTests.cs +++ /dev/null @@ -1,82 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -using System; -using System.Collections.Generic; - -namespace Ice -{ - namespace checksum - { - public class AllTests : global::Test.AllTests - { - public static Test.ChecksumPrx - allTests(global::Test.TestHelper helper, bool collocated) - { - var output = helper.getWriter(); - Ice.Communicator communicator = helper.communicator(); - string rf = "test:" + helper.getTestEndpoint(0); - Ice.ObjectPrx baseProxy = communicator.stringToProxy(rf); - test(baseProxy != null); - - Test.ChecksumPrx checksum = Test.ChecksumPrxHelper.checkedCast(baseProxy); - test(checksum != null); - - // - // Verify that no checksums are present for local types. - // - output.Write("testing checksums... "); - output.Flush(); - foreach(KeyValuePair<string, string> entry in Ice.SliceChecksums.checksums) - { - string key = entry.Key; - int pos = key.IndexOf("Local"); - test(pos == -1); - } - - // - // Get server's Slice checksums. - // - Dictionary<string, string> d = checksum.getSliceChecksums(); - - // - // Compare the checksums. For a type FooN whose name ends in an integer N, - // we assume that the server's type does not change for N = 1, and does - // change for N > 1. - // - char[] digits = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9' }; - foreach(KeyValuePair<string, string> entry in d) - { - string key = entry.Key; - int start = key.IndexOfAny(digits); - if(start != -1) - { - int end = start; - while(end < key.Length && char.IsDigit(key[end])) - { - end++; - } - int n = int.Parse(key.Substring(start, end - start)); - - string value = Ice.SliceChecksums.checksums[key]; - test(value != null); - - if(n <= 1) - { - test(value.Equals(entry.Value)); - } - else - { - test(!value.Equals(entry.Value)); - } - } - } - - output.WriteLine("ok"); - - return checksum; - } - } - } -} diff --git a/csharp/test/Ice/checksum/Client.cs b/csharp/test/Ice/checksum/Client.cs deleted file mode 100644 index 01e85a15eaa..00000000000 --- a/csharp/test/Ice/checksum/Client.cs +++ /dev/null @@ -1,28 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -using Test; - -namespace Ice -{ - namespace checksum - { - public class Client : TestHelper - { - public override void run(string[] args) - { - using(var communicator = initialize(ref args)) - { - var checksum = AllTests.allTests(this, false); - checksum.shutdown(); - } - } - - public static int Main(string[] args) - { - return TestDriver.runTest<Client>(args); - } - } - } -} diff --git a/csharp/test/Ice/checksum/ClientTypes.ice b/csharp/test/Ice/checksum/ClientTypes.ice deleted file mode 100644 index a89f7af352a..00000000000 --- a/csharp/test/Ice/checksum/ClientTypes.ice +++ /dev/null @@ -1,618 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -#pragma once - -module Test -{ - -// -// TEST: Same -// -const int IntConst1 = 100; - -// -// TEST: Value changed -// -const int IntConst2 = 100; - -// -// TEST: Type changed -// -const int IntConst3 = 100; - -// -// TEST: Same -// -enum Enum1 { Enum11, Enum12, Enum13 } - -// -// TEST: Add enumerator -// -enum Enum2 { Enum21, Enum22, Enum23 } - -// -// TEST: Remove enumerator -// -enum Enum3 { Enum31, Enum32, Enum33 } - -// -// TEST: Change to a different type -// -enum Enum4 { Enum41, Enum42, Enum43 } - -// -// TEST: Enum with explicit values. -// -enum EnumExplicit0 { EnumExplicit01 = 1, EnumExplicit02 = 2, EnumExplicit03 = 3 } - -// -// TEST: Enum with same explicit values, different order. -// -enum EnumExplicit1 { EnumExplicit11 = 1, EnumExplicit12 = 2, EnumExplicit13 = 3 } - -// -// TEST: Enum with different explicit values. -// -enum EnumExplicit2 { EnumExplicit21 = 1, EnumExplicit22 = 2, EnumExplicit23 = 3} - -// -// TEST: Enum with explicit values, removed enumerator. -// -enum EnumExplicit3 { EnumExplicit31 = 1, EnumExplicit32 = 2, EnumExplicit33 = 3} - -// -// TEST: Same -// -sequence<int> Sequence1; - -// -// TEST: Change sequence type -// -sequence<int> Sequence2; - -// -// TEST: Change to a different type -// -sequence<int> Sequence3; - -// -// TEST: Same -// -dictionary<string, int> Dictionary1; - -// -// TEST: Change key type -// -dictionary<string, int> Dictionary2; - -// -// TEST: Change value type -// -dictionary<string, int> Dictionary3; - -// -// TEST: Change to a different type -// -dictionary<string, int> Dictionary4; - -// -// TEST: Same -// -struct Struct1 -{ - string str; - bool b; -} - -// -// TEST: Add member -// -struct Struct2 -{ - string str; - bool b; -} - -// -// TEST: Change member type -// -struct Struct3 -{ - string str; - bool b; -} - -// -// TEST: Remove member -// -struct Struct4 -{ - string str; - bool b; -} - -// -// TEST: Change to a different type -// -struct Struct5 -{ - string str; - bool b; -} - -// -// TEST: Same -// -interface Interface1 -{ -} - -// -// TEST: Change interface to class -// -interface Interface2 -{ -} - -// -// TEST: Add base interface -// -interface Interface3 -{ -} - -// -// TEST: Add operation -// -interface Interface4 -{ -} - -// -// TEST: Same -// -class EmptyClass1 -{ -} - -// -// TEST: Add data member -// -class EmptyClass2 -{ -} - -// -// TEST: Add operation -// -class EmptyClass3 -{ -} - -// -// TEST: Add base class -// -class EmptyClass4 -{ -} - -// -// TEST: Add interface -// -class EmptyClass5 -{ -} - -// -// TEST: Same -// -class SimpleClass1 -{ - string str; - float f; -} - -// -// TEST: Add operation -// -class SimpleClass2 -{ - string str; - float f; -} - -// -// TEST: Rename member -// -class SimpleClass3 -{ - string str; - float f; -} - -// -// TEST: Add member -// -class SimpleClass4 -{ - string str; - float f; -} - -// -// TEST: Remove member -// -class SimpleClass5 -{ - string str; - float f; -} - -// -// TEST: Reorder members -// -class SimpleClass6 -{ - string str; - float f; -} - -// -// TEST: Change member type -// -class SimpleClass7 -{ - string str; - float f; -} - -// -// TEST: Same -// -exception Exception1 -{ - string str; - bool b; -} - -// -// TEST: Add member -// -exception Exception2 -{ - string str; - bool b; -} - -// -// TEST: Change member type -// -exception Exception3 -{ - string str; - bool b; -} - -// -// TEST: Remove member -// -exception Exception4 -{ - string str; - bool b; -} - -// -// TEST: Add base exception -// -exception Exception5 -{ -} - -// -// TEST: Change to a different type -// -exception Exception6 -{ - string str; - bool b; -} - -// -// TEST: Exception with optional members. -// -exception OptionalEx0 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Exception with optional members, different order, same tags. -// -exception OptionalEx1 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Exception with different optional members. -// -exception OptionalEx2 -{ - string firstName; - string secondName; - optional(1) string emailAddress; -} - -// -// TEST: Exception with different optional members. -// -exception OptionalEx3 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Exception with optional members using different tags. -// -exception OptionalEx4 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Same -// -interface BaseInterface1 -{ - void baseOp1(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Change return type -// -interface BaseInterface2 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Add parameter -// -interface BaseInterface3 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Add exception -// -interface BaseInterface4 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Change out parameter to in parameter -// -interface BaseInterface5 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Remove parameter -// -interface BaseInterface6 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Remove exception -// -interface BaseInterface7 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Remove operation -// -interface BaseInterface8 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Add base interface -// -interface BaseInterface9 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Add interface -// -interface BaseInterface10 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Class with compact id -// -class Compact1(1) -{ - int id; -} - -// -// TEST: Derived from class with compact id -// -class Derived1 extends Compact1 -{ -} - -// -// TEST: Same class names but different compact id -// -class Compact2(2) -{ - int id; -} - -// -// TEST: Class with optional members. -// -class Optional0 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Class with optional members, different order, same tags. -// -class Optional1 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Class with different optional members. -// -class Optional2 -{ - string firstName; - string secondName; - optional(1) string emailAddress; -} - -// -// TEST: Class with different optional members. -// -class Optional3 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Class with optional members using different tags. -// -class Optional4 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Interface with optional parameters. -// -interface OptionalParameters0 -{ - void op1(string firstName, optional(1) string secondName, - optional(2) string emailAddress); -} - -// -// TEST: Interface with optional parameters, different order. -// -interface OptionalParameters1 -{ - void op1(string firstName, optional(1) string secondName, - optional(2) string emailAddress); -} - -// -// TEST: Interface with optional parameters, different tags. -// -interface OptionalParameters2 -{ - void op1(string firstName, optional(1) string emailAddress, - optional(2) string secondName); -} - -// -// TEST: Interface with different optional parameters. -// -interface OptionalParameters3 -{ - void op1(string firstName, optional(1) string emailAddress, - string secondName); -} - -// -// TEST: Interface with optional return type. -// -interface OptionalReturn0 -{ - optional(1) int op(); -} - -// -// TEST: Interface that changes optional return type. -// -interface OptionalReturn2 -{ - optional(1) int op(); -} - -// -// TEST: Local -// -local enum LocalEnum { LocalEnum1, LocalEnum2, LocalEnum3 } - -// -// TEST: Local -// -local sequence<string> LocalSequence; - -// -// TEST: Local -// -local dictionary<string, string> LocalDictionary; - -// -// TEST: Local -// -local struct LocalStruct -{ - string str; -} - -// -// TEST: Local -// -local class LocalClass -{ -} - -} diff --git a/csharp/test/Ice/checksum/Server.cs b/csharp/test/Ice/checksum/Server.cs deleted file mode 100644 index 56d5049d0ba..00000000000 --- a/csharp/test/Ice/checksum/Server.cs +++ /dev/null @@ -1,32 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -using Test; - -namespace Ice -{ - namespace checksum - { - public class Server : TestHelper - { - public override void run(string[] args) - { - using(var communicator = initialize(ref args)) - { - communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0) + " -t 2000"); - Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); - adapter.add(new ChecksumI(), Ice.Util.stringToIdentity("test")); - adapter.activate(); - serverReady(); - communicator.waitForShutdown(); - } - } - - public static int Main(string[] args) - { - return TestDriver.runTest<Server>(args); - } - } - } -} diff --git a/csharp/test/Ice/checksum/ServerTypes.ice b/csharp/test/Ice/checksum/ServerTypes.ice deleted file mode 100644 index 41deb9429af..00000000000 --- a/csharp/test/Ice/checksum/ServerTypes.ice +++ /dev/null @@ -1,617 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -#pragma once - -[["suppress-warning:deprecated"]] // For classes with operations - -module Test -{ - -// -// TEST: Same -// -const int IntConst1 = 100; - -// -// TEST: Value changed -// -const int IntConst2 = 1000; - -// -// TEST: Type changed -// -const short IntConst3 = 100; - -// -// TEST: Same -// -enum Enum1 { Enum11, Enum12, Enum13 } - -// -// TEST: Add enumerator -// -enum Enum2 { Enum21, Enum22, Enum23, Enum24 } - -// -// TEST: Remove enumerator -// -enum Enum3 { Enum32, Enum33 } - -// -// TEST: Enum with explicit values. -// -enum EnumExplicit0 { EnumExplicit01 = 1, EnumExplicit02 = 2, EnumExplicit03 = 3 } - -// -// TEST: Enum with same explicit values, different order. -// -enum EnumExplicit1 { EnumExplicit11 = 1, EnumExplicit13 = 3, EnumExplicit12 = 2 } - -// -// TEST: Enum with different explicit values. -// -enum EnumExplicit2 { EnumExplicit21 = 1, EnumExplicit22 = 3, EnumExplicit23 } - -// -// TEST: Enum with explicit values, removed enumerator. -// -enum EnumExplicit3 { EnumExplicit31 = 1, EnumExplicit32 = 2} - -// -// TEST: Change to a different type -// -class Enum4 {} - -// -// TEST: Same -// -sequence<int> Sequence1; - -// -// TEST: Change sequence type -// -sequence<short> Sequence2; - -// -// TEST: Change to a different type -// -class Sequence3 {} - -// -// TEST: Same -// -dictionary<string, int> Dictionary1; - -// -// TEST: Change key type -// -dictionary<long, int> Dictionary2; - -// -// TEST: Change value type -// -dictionary<string, bool> Dictionary3; - -// -// TEST: Change to a different type -// -class Dictionary4 {} - -// -// TEST: Same -// -struct Struct1 -{ - string str; - bool b; -} - -// -// TEST: Add member -// -struct Struct2 -{ - string str; - bool b; - float f; -} - -// -// TEST: Change member type -// -struct Struct3 -{ - string str; - double b; -} - -// -// TEST: Remove member -// -struct Struct4 -{ - bool b; -} - -// -// TEST: Change to a different type -// -class Struct5 {} - -// -// TEST: Same -// -interface Interface1 -{ -} - -// -// TEST: Change interface to class -// -class Interface2 -{ -} - -// -// TEST: Add base interface -// -interface Interface3 extends Interface1 -{ -} - -// -// TEST: Add operation -// -interface Interface4 -{ - void opInterface4(); -} - -// -// TEST: Same -// -class EmptyClass1 -{ -} - -// -// TEST: Add data member -// -class EmptyClass2 -{ - double d; -} - -// -// TEST: Add operation -// -class EmptyClass3 -{ - void newOp(); -} - -// -// TEST: Add base class -// -class EmptyClass4 extends EmptyClass1 -{ -} - -// -// TEST: Add interface -// -class EmptyClass5 implements Interface1 -{ -} - -// -// TEST: Same -// -class SimpleClass1 -{ - string str; - float f; -} - -// -// TEST: Add operation -// -class SimpleClass2 -{ - string str; - float f; - void newOp(); -} - -// -// TEST: Rename member -// -class SimpleClass3 -{ - string str; - float g; -} - -// -// TEST: Add member -// -class SimpleClass4 -{ - string str; - float f; - bool b; -} - -// -// TEST: Remove member -// -class SimpleClass5 -{ - string str; -} - -// -// TEST: Reorder members -// -class SimpleClass6 -{ - float f; - string str; -} - -// -// TEST: Change member type -// -class SimpleClass7 -{ - string str; - double f; -} - -// -// TEST: Same -// -exception Exception1 -{ - string str; - bool b; -} - -// -// TEST: Add member -// -exception Exception2 -{ - string str; - bool b; - float f; -} - -// -// TEST: Change member type -// -exception Exception3 -{ - string str; - double b; -} - -// -// TEST: Remove member -// -exception Exception4 -{ - bool b; -} - -// -// TEST: Add base exception -// -exception Exception5 extends Exception1 -{ -} - -// -// TEST: Change to a different type -// -class Exception6 {} - -// -// TEST: Exception with optional members. -// -exception OptionalEx0 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Exception with optional members, different order, same tags. -// -exception OptionalEx1 -{ - string firstName; - optional(2) string emailAddress; - optional(1) string secondName; -} - -// -// TEST: Exception with different optional members. -// -exception OptionalEx2 -{ - string firstName; - optional(1) string secondName; - string emailAddress; -} - -// -// TEST: Exception with different optional members. -// -exception OptionalEx3 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; - optional(3) string phoneNumber; -} - -// -// TEST: Exception with optional members using different tags. -// -exception OptionalEx4 -{ - string firstName; - optional(2) string secondName; - optional(1) string emailAddress; -} - -// -// TEST: Same -// -interface BaseInterface1 -{ - void baseOp1(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Change return type -// -interface BaseInterface2 -{ - int baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Add parameter -// -interface BaseInterface3 -{ - void baseOp(Object o); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Add exception -// -interface BaseInterface4 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1, Exception2; -} - -// -// TEST: Change out parameter to in parameter -// -interface BaseInterface5 -{ - void baseOp(); - void baseOp2(int i, string s) throws Exception1; -} - -// -// TEST: Remove parameter -// -interface BaseInterface6 -{ - void baseOp(); - void baseOp2(out string s) throws Exception1; -} - -// -// TEST: Remove exception -// -interface BaseInterface7 -{ - void baseOp(); - void baseOp2(int i, out string s); -} - -// -// TEST: Remove operation -// -interface BaseInterface8 -{ - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Add base interface -// -interface BaseInterface9 extends Interface1 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Add interface -// -interface BaseInterface10 extends Interface1 -{ - void baseOp(); - void baseOp2(int i, out string s) throws Exception1; -} - -// -// TEST: Class with compact id -// -class Compact1(1) -{ - int id; -} - -// -// TEST: Derived from class with compact id -// -class Derived1 extends Compact1 -{ -} - -// -// TEST: Same class names but different compact id -// -class Compact2(3) -{ - int id; -} - -// -// TEST: Class with optional members. -// -class Optional0 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; -} - -// -// TEST: Class with optional members, different order, same tags. -// -class Optional1 -{ - string firstName; - optional(2) string emailAddress; - optional(1) string secondName; -} - -// -// TEST: Class with different optional members. -// -class Optional2 -{ - string firstName; - optional(1) string secondName; - string emailAddress; -} - -// -// TEST: Class with different optional members. -// -class Optional3 -{ - string firstName; - optional(1) string secondName; - optional(2) string emailAddress; - optional(3) string phoneNumber; -} - -// -// TEST: Class with optional members using different tags. -// -class Optional4 -{ - string firstName; - optional(2) string secondName; - optional(1) string emailAddress; -} - -// -// TEST: Interface with optional parameters. -// -interface OptionalParameters0 -{ - void op1(string firstName, optional(1) string secondName, - optional(2) string emailAddress); -} - -// -// TEST: Interface with optional parameters, different order. -// -interface OptionalParameters1 -{ - void op1(string firstName, optional(2) string emailAddress, - optional(1) string secondName); -} - -// -// TEST: Interface with optional parameters, different tags. -// -interface OptionalParameters2 -{ - void op1(string firstName, optional(2) string emailAddress, - optional(1) string secondName); -} - -// -// TEST: Interface with different optional parameters. -// -interface OptionalParameters3 -{ - void op1(string firstName, string emailAddress, - optional(1) string secondName); -} - -// -// TEST: Interface with optional return type. -// -interface OptionalReturn0 -{ - optional(1) int op(); -} - -// -// TEST: Interface that changes optional return type. -// -interface OptionalReturn2 -{ - int op(); -} - -// -// TEST: Local -// -local enum LocalEnum { LocalEnum1, LocalEnum2, LocalEnum3 } - -// -// TEST: Local -// -local sequence<string> LocalSequence; - -// -// TEST: Local -// -local dictionary<string, string> LocalDictionary; - -// -// TEST: Local -// -local struct LocalStruct -{ - string str; -} - -// -// TEST: Local -// -local class LocalClass -{ -} - -} diff --git a/csharp/test/Ice/checksum/Test.ice b/csharp/test/Ice/checksum/Test.ice deleted file mode 100644 index a3d348a6451..00000000000 --- a/csharp/test/Ice/checksum/Test.ice +++ /dev/null @@ -1,20 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -#pragma once - -#include <Ice/SliceChecksumDict.ice> - -["cs:namespace:Ice.checksum"] -module Test -{ - -interface Checksum -{ - idempotent Ice::SliceChecksumDict getSliceChecksums(); - - void shutdown(); -} - -} diff --git a/csharp/test/Ice/checksum/TestI.cs b/csharp/test/Ice/checksum/TestI.cs deleted file mode 100644 index f8560d7eb9d..00000000000 --- a/csharp/test/Ice/checksum/TestI.cs +++ /dev/null @@ -1,29 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -using System.Collections.Generic; - -namespace Ice -{ - namespace checksum - { - - public sealed class ChecksumI : Test.ChecksumDisp_ - { - public ChecksumI() - { - } - - public override Dictionary<string, string> getSliceChecksums(Ice.Current current) - { - return Ice.SliceChecksums.checksums; - } - - public override void shutdown(Ice.Current current) - { - current.adapter.getCommunicator().shutdown(); - } - } - } -} diff --git a/csharp/test/Ice/checksum/msbuild/client/net45/client.csproj b/csharp/test/Ice/checksum/msbuild/client/net45/client.csproj deleted file mode 100644 index fbe826ace5b..00000000000 --- a/csharp/test/Ice/checksum/msbuild/client/net45/client.csproj +++ /dev/null @@ -1,75 +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')" /> - <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.5\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.5\build\zeroc.ice.net.props" /> - <PropertyGroup Label="Globals"> - <NuGetPackageImportStamp> - </NuGetPackageImportStamp> - <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> - </PropertyGroup> - <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" /> - <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProjectGuid>{BC907ED2-6883-4DFB-BDAB-957AFB986073}</ProjectGuid> - <OutputType>Exe</OutputType> - <AppDesignerFolder>Properties</AppDesignerFolder> - <AssemblyName>client</AssemblyName> - <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion> - <FileAlignment>512</FileAlignment> - <OutputPath>$(MSBuildThisFileDirectory)</OutputPath> - <DebugSymbols>true</DebugSymbols> - </PropertyGroup> - <ItemGroup> - <Reference Include="Ice, Version=3.7.5.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL"> - <SpecificVersion>False</SpecificVersion> - <Private>False</Private> - <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath> - </Reference> - <Reference Include="System" /> - <Reference Include="System.Core" /> - <Reference Include="Microsoft.CSharp" /> - </ItemGroup> - <ItemGroup> - <Folder Include="Properties\" /> - </ItemGroup> - <ItemGroup> - <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs"> - <Link>TestHelper.cs</Link> - </Compile> - <Compile Include="..\..\..\AllTests.cs"> - <Link>AllTests.cs</Link> - </Compile> - <Compile Include="..\..\..\Client.cs"> - <Link>Client.cs</Link> - </Compile> - <Compile Include="generated\Test.cs" /> - <Compile Include="generated\ClientTypes.cs" /> - </ItemGroup> - <ItemGroup> - <None Include="client.exe.config" /> - <SliceCompile Include="..\..\..\Test.ice"> - <Link>Test.ice</Link> - </SliceCompile> - <SliceCompile Include="..\..\..\ClientTypes.ice"> - <Link>ClientTypes.ice</Link> - </SliceCompile> - <None Include="packages.config" /> - </ItemGroup> - <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> - <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" /> - <ItemDefinitionGroup Label="IceBuilder"> - <SliceCompile> - <AdditionalOptions>--checksum</AdditionalOptions> - </SliceCompile> - </ItemDefinitionGroup> - <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports"> - <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.ice.net.3.7.5\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.5\build\zeroc.ice.net.props'))" /> - <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>
\ No newline at end of file diff --git a/csharp/test/Ice/checksum/msbuild/client/net45/client.exe.config b/csharp/test/Ice/checksum/msbuild/client/net45/client.exe.config deleted file mode 100644 index 418bdc2f8b2..00000000000 --- a/csharp/test/Ice/checksum/msbuild/client/net45/client.exe.config +++ /dev/null @@ -1,5 +0,0 @@ -<configuration> - <runtime> - <developmentMode developerInstallation="true"/> - </runtime> -</configuration> diff --git a/csharp/test/Ice/checksum/msbuild/client/net45/packages.config b/csharp/test/Ice/checksum/msbuild/client/net45/packages.config deleted file mode 100644 index 7f20c0c71e3..00000000000 --- a/csharp/test/Ice/checksum/msbuild/client/net45/packages.config +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="zeroc.ice.net" version="3.7.5" targetFramework="net452" /> - <package id="zeroc.icebuilder.msbuild" version="5.0.6" targetFramework="net451" /> -</packages>
\ No newline at end of file diff --git a/csharp/test/Ice/checksum/msbuild/client/net5.0/client.csproj b/csharp/test/Ice/checksum/msbuild/client/net5.0/client.csproj deleted file mode 100644 index c03deaa1efd..00000000000 --- a/csharp/test/Ice/checksum/msbuild/client/net5.0/client.csproj +++ /dev/null @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project Sdk="Microsoft.NET.Sdk"> - <Import Project="../../../../../../msbuild/ice.common.props" /> - <PropertyGroup> - <AssemblyName>client</AssemblyName> - <OutputType>Exe</OutputType> - <TargetFramework>net5.0</TargetFramework> - <GenerateAssemblyInfo>false</GenerateAssemblyInfo> - <EnableDefaultCompileItems>false</EnableDefaultCompileItems> - <OutputPath>.</OutputPath> - <UseAppHost>true</UseAppHost> - <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath> - </PropertyGroup> - <ItemDefinitionGroup Label="IceBuilder"> - <SliceCompile> - <AdditionalOptions>--checksum</AdditionalOptions> - </SliceCompile> - </ItemDefinitionGroup> - <ItemGroup> - <Compile Include="../../../../../TestCommon/TestHelper.cs" /> - <Compile Include="../../../AllTests.cs" /> - <Compile Include="../../../Client.cs" /> - <Compile Include="generated\ClientTypes.cs"> - <SliceCompileSource>../../../ClientTypes.ice</SliceCompileSource> - </Compile> - <Compile Include="generated\Test.cs"> - <SliceCompileSource>../../../Test.ice</SliceCompileSource> - </Compile> - <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.6" /> - <SliceCompile Include="../../../Test.ice" /> - <SliceCompile Include="../../../ClientTypes.ice" /> - </ItemGroup> - <Choose> - <When Condition="'$(ICE_BIN_DIST)' == 'all'"> - <ItemGroup> - <PackageReference Include="zeroc.ice.net" Version="3.7.5" /> - </ItemGroup> - </When> - <Otherwise> - <ItemGroup> - <Reference Include="../../../../../../lib/net5.0/Ice.dll" /> - </ItemGroup> - </Otherwise> - </Choose> -</Project> diff --git a/csharp/test/Ice/checksum/msbuild/client/netstandard2.0/client.csproj b/csharp/test/Ice/checksum/msbuild/client/netstandard2.0/client.csproj deleted file mode 100644 index 8037a7ec838..00000000000 --- a/csharp/test/Ice/checksum/msbuild/client/netstandard2.0/client.csproj +++ /dev/null @@ -1,46 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project Sdk="Microsoft.NET.Sdk"> - <Import Project="../../../../../../msbuild/ice.common.props" /> - <PropertyGroup> - <AssemblyName>client</AssemblyName> - <OutputType>Exe</OutputType> - <TargetFramework>$(AppTargetFramework)</TargetFramework> - <GenerateAssemblyInfo>false</GenerateAssemblyInfo> - <EnableDefaultCompileItems>false</EnableDefaultCompileItems> - <OutputPath>.</OutputPath> - </PropertyGroup> - <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> - <UseAppHost>true</UseAppHost> - </PropertyGroup> - <ItemDefinitionGroup Label="IceBuilder"> - <SliceCompile> - <AdditionalOptions>--checksum</AdditionalOptions> - </SliceCompile> - </ItemDefinitionGroup> - <ItemGroup> - <Compile Include="../../../../../TestCommon/TestHelper.cs" /> - <Compile Include="../../../AllTests.cs" /> - <Compile Include="../../../Client.cs" /> - <Compile Include="generated\ClientTypes.cs"> - <SliceCompileSource>../../../ClientTypes.ice</SliceCompileSource> - </Compile> - <Compile Include="generated\Test.cs"> - <SliceCompileSource>../../../Test.ice</SliceCompileSource> - </Compile> - <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.6" /> - <SliceCompile Include="../../../Test.ice" /> - <SliceCompile Include="../../../ClientTypes.ice" /> - </ItemGroup> - <Choose> - <When Condition="'$(ICE_BIN_DIST)' == 'all'"> - <ItemGroup> - <PackageReference Include="zeroc.ice.net" Version="3.7.5" /> - </ItemGroup> - </When> - <Otherwise> - <ItemGroup> - <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" /> - </ItemGroup> - </Otherwise> - </Choose> -</Project> diff --git a/csharp/test/Ice/checksum/msbuild/server/net45/packages.config b/csharp/test/Ice/checksum/msbuild/server/net45/packages.config deleted file mode 100644 index 7f20c0c71e3..00000000000 --- a/csharp/test/Ice/checksum/msbuild/server/net45/packages.config +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="zeroc.ice.net" version="3.7.5" targetFramework="net452" /> - <package id="zeroc.icebuilder.msbuild" version="5.0.6" targetFramework="net451" /> -</packages>
\ No newline at end of file diff --git a/csharp/test/Ice/checksum/msbuild/server/net45/server.csproj b/csharp/test/Ice/checksum/msbuild/server/net45/server.csproj deleted file mode 100644 index 0ca9ca76287..00000000000 --- a/csharp/test/Ice/checksum/msbuild/server/net45/server.csproj +++ /dev/null @@ -1,75 +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')" /> - <Import Condition="Exists('..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.5\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.net.3.7.5\build\zeroc.ice.net.props" /> - <PropertyGroup Label="Globals"> - <NuGetPackageImportStamp> - </NuGetPackageImportStamp> - <ProjectTypeGuids>{28993779-3132-408A-BCB0-1D78225F4824};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> - </PropertyGroup> - <Import Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" /> - <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProjectGuid>{AE7C3036-ADC3-44AB-B6DA-5C40E6E00527}</ProjectGuid> - <OutputType>Exe</OutputType> - <AppDesignerFolder>Properties</AppDesignerFolder> - <AssemblyName>server</AssemblyName> - <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion> - <FileAlignment>512</FileAlignment> - <OutputPath>$(MSBuildThisFileDirectory)</OutputPath> - <DebugSymbols>true</DebugSymbols> - </PropertyGroup> - <ItemGroup> - <Reference Include="Ice, Version=3.7.5.0, Culture=neutral, PublicKeyToken=0c5ebb72d74932c6, processorArchitecture=MSIL"> - <SpecificVersion>False</SpecificVersion> - <Private>False</Private> - <HintPath>$(IceAssembliesDir)\net45\Ice.dll</HintPath> - </Reference> - <Reference Include="System" /> - <Reference Include="System.Core" /> - <Reference Include="Microsoft.CSharp" /> - </ItemGroup> - <ItemGroup> - <Folder Include="Properties\" /> - </ItemGroup> - <ItemGroup> - <Compile Include="..\..\..\..\..\TestCommon\TestHelper.cs"> - <Link>TestHelper.cs</Link> - </Compile> - <Compile Include="..\..\..\Server.cs"> - <Link>Server.cs</Link> - </Compile> - <Compile Include="..\..\..\TestI.cs"> - <Link>TestI.cs</Link> - </Compile> - <Compile Include="generated\Test.cs" /> - <Compile Include="generated\ServerTypes.cs" /> - </ItemGroup> - <ItemGroup> - <SliceCompile Include="..\..\..\Test.ice"> - <Link>Test.ice</Link> - </SliceCompile> - <SliceCompile Include="..\..\..\ServerTypes.ice"> - <Link>ServerTypes.ice</Link> - </SliceCompile> - <None Include="packages.config" /> - <None Include="server.exe.config" /> - </ItemGroup> - <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> - <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\..\msbuild\ice.test.props" /> - <ItemDefinitionGroup Label="IceBuilder"> - <SliceCompile> - <AdditionalOptions>--checksum</AdditionalOptions> - </SliceCompile> - </ItemDefinitionGroup> - <Target BeforeTargets="PrepareForBuild" Name="EnsureNuGetPackageBuildImports"> - <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.ice.net.3.7.5\build\zeroc.ice.net.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\\packages\zeroc.ice.net.3.7.5\build\zeroc.ice.net.props'))" /> - <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>
\ No newline at end of file diff --git a/csharp/test/Ice/checksum/msbuild/server/net45/server.exe.config b/csharp/test/Ice/checksum/msbuild/server/net45/server.exe.config deleted file mode 100644 index 418bdc2f8b2..00000000000 --- a/csharp/test/Ice/checksum/msbuild/server/net45/server.exe.config +++ /dev/null @@ -1,5 +0,0 @@ -<configuration> - <runtime> - <developmentMode developerInstallation="true"/> - </runtime> -</configuration> diff --git a/csharp/test/Ice/checksum/msbuild/server/net5.0/server.csproj b/csharp/test/Ice/checksum/msbuild/server/net5.0/server.csproj deleted file mode 100644 index a6c1ff1d7fe..00000000000 --- a/csharp/test/Ice/checksum/msbuild/server/net5.0/server.csproj +++ /dev/null @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project Sdk="Microsoft.NET.Sdk"> - <Import Project="../../../../../../msbuild/ice.common.props" /> - <PropertyGroup> - <AssemblyName>server</AssemblyName> - <OutputType>Exe</OutputType> - <TargetFramework>net5.0</TargetFramework> - <GenerateAssemblyInfo>false</GenerateAssemblyInfo> - <EnableDefaultCompileItems>false</EnableDefaultCompileItems> - <OutputPath>.</OutputPath> - <UseAppHost>true</UseAppHost> - <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath> - </PropertyGroup> - <ItemDefinitionGroup Label="IceBuilder"> - <SliceCompile> - <AdditionalOptions>--checksum</AdditionalOptions> - </SliceCompile> - </ItemDefinitionGroup> - <ItemGroup> - <Compile Include="../../../../../TestCommon/TestHelper.cs" /> - <Compile Include="../../../TestI.cs" /> - <Compile Include="../../../Server.cs" /> - <Compile Include="generated\ServerTypes.cs"> - <SliceCompileSource>../../../ServerTypes.ice</SliceCompileSource> - </Compile> - <Compile Include="generated\Test.cs"> - <SliceCompileSource>../../../Test.ice</SliceCompileSource> - </Compile> - <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.6" /> - <SliceCompile Include="../../../Test.ice" /> - <SliceCompile Include="../../../ServerTypes.ice" /> - </ItemGroup> - <Choose> - <When Condition="'$(ICE_BIN_DIST)' == 'all'"> - <ItemGroup> - <PackageReference Include="zeroc.ice.net" Version="3.7.5" /> - </ItemGroup> - </When> - <Otherwise> - <ItemGroup> - <Reference Include="../../../../../../lib/net5.0/Ice.dll" /> - </ItemGroup> - </Otherwise> - </Choose> -</Project> diff --git a/csharp/test/Ice/checksum/msbuild/server/netstandard2.0/server.csproj b/csharp/test/Ice/checksum/msbuild/server/netstandard2.0/server.csproj deleted file mode 100644 index e6e4c499910..00000000000 --- a/csharp/test/Ice/checksum/msbuild/server/netstandard2.0/server.csproj +++ /dev/null @@ -1,46 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project Sdk="Microsoft.NET.Sdk"> - <Import Project="../../../../../../msbuild/ice.common.props" /> - <PropertyGroup> - <AssemblyName>server</AssemblyName> - <OutputType>Exe</OutputType> - <TargetFramework>$(AppTargetFramework)</TargetFramework> - <GenerateAssemblyInfo>false</GenerateAssemblyInfo> - <EnableDefaultCompileItems>false</EnableDefaultCompileItems> - <OutputPath>.</OutputPath> - </PropertyGroup> - <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> - <UseAppHost>true</UseAppHost> - </PropertyGroup> - <ItemDefinitionGroup Label="IceBuilder"> - <SliceCompile> - <AdditionalOptions>--checksum</AdditionalOptions> - </SliceCompile> - </ItemDefinitionGroup> - <ItemGroup> - <Compile Include="../../../../../TestCommon/TestHelper.cs" /> - <Compile Include="../../../TestI.cs" /> - <Compile Include="../../../Server.cs" /> - <Compile Include="generated\ServerTypes.cs"> - <SliceCompileSource>../../../ServerTypes.ice</SliceCompileSource> - </Compile> - <Compile Include="generated\Test.cs"> - <SliceCompileSource>../../../Test.ice</SliceCompileSource> - </Compile> - <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.6" /> - <SliceCompile Include="../../../Test.ice" /> - <SliceCompile Include="../../../ServerTypes.ice" /> - </ItemGroup> - <Choose> - <When Condition="'$(ICE_BIN_DIST)' == 'all'"> - <ItemGroup> - <PackageReference Include="zeroc.ice.net" Version="3.7.5" /> - </ItemGroup> - </When> - <Otherwise> - <ItemGroup> - <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" /> - </ItemGroup> - </Otherwise> - </Choose> -</Project> diff --git a/csharp/test/Ice/checksum/msbuild/test/netstandard2.0/test.csproj b/csharp/test/Ice/checksum/msbuild/test/netstandard2.0/test.csproj deleted file mode 100644 index 182dbb1587e..00000000000 --- a/csharp/test/Ice/checksum/msbuild/test/netstandard2.0/test.csproj +++ /dev/null @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project Sdk="Microsoft.NET.Sdk"> - <Import Project="../../../../../../msbuild/ice.common.props" /> - <PropertyGroup> - <AssemblyName>Ice.checksum</AssemblyName> - <TargetFramework>netstandard2.0</TargetFramework> - <GenerateAssemblyInfo>false</GenerateAssemblyInfo> - <EnableDefaultCompileItems>false</EnableDefaultCompileItems> - <OutputPath>.</OutputPath> - </PropertyGroup> - <PropertyGroup Condition="'$(AppTargetFramework)' == 'netcoreapp3.1'"> - <UseAppHost>true</UseAppHost> - </PropertyGroup> - <ItemGroup> - <Compile Include="../../../AllTests.cs" /> - <Compile Include="../../../Client.cs" /> - <Compile Include="../../../TestI.cs" /> - <Compile Include="../../../Server.cs" /> - <Compile Include="generated\Test.cs"> - <SliceCompileSource>../../../Test.ice</SliceCompileSource> - </Compile> - <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.6" /> - <ProjectReference Include="..\..\..\..\..\TestCommon\msbuild\testcommon\netstandard2.0\testcommon.csproj" /> - <SliceCompile Include="../../../Test.ice" /> - </ItemGroup> - <Choose> - <When Condition="'$(ICE_BIN_DIST)' == 'all'"> - <ItemGroup> - <PackageReference Include="zeroc.ice.net" Version="3.7.5" /> - </ItemGroup> - </When> - <Otherwise> - <ItemGroup> - <Reference Include="../../../../../../lib/netstandard2.0/Ice.dll" /> - </ItemGroup> - </Otherwise> - </Choose> -</Project> diff --git a/csharp/test/xamarin/controller/MainPage.xaml.cs b/csharp/test/xamarin/controller/MainPage.xaml.cs index 3cd2fdf60d5..7f0d345b7a8 100644 --- a/csharp/test/xamarin/controller/MainPage.xaml.cs +++ b/csharp/test/xamarin/controller/MainPage.xaml.cs @@ -77,16 +77,6 @@ namespace controller { return new Ice.binding.Client(); } - - else if(type.Equals("Ice.checksum.Server")) - { - return new Ice.checksum.Server(); - } - else if(type.Equals("Ice.checksum.Client")) - { - return new Ice.checksum.Client(); - } - else if(type.Equals("Ice.defaultServant.Client")) { return new Ice.defaultServant.Client(); diff --git a/csharp/test/xamarin/controller/controller.csproj b/csharp/test/xamarin/controller/controller.csproj index 0b0b8d43bb2..8d8dc92b86e 100644 --- a/csharp/test/xamarin/controller/controller.csproj +++ b/csharp/test/xamarin/controller/controller.csproj @@ -60,7 +60,6 @@ <ProjectReference Include="..\..\Ice\admin\msbuild\test\netstandard2.0\test.csproj" /> <ProjectReference Include="..\..\Ice\ami\msbuild\test\netstandard2.0\test.csproj" /> <ProjectReference Include="..\..\Ice\binding\msbuild\test\netstandard2.0\test.csproj" /> - <ProjectReference Include="..\..\Ice\checksum\msbuild\test\netstandard2.0\test.csproj" /> <ProjectReference Include="..\..\Ice\defaultServant\msbuild\test\netstandard2.0\test.csproj" /> <ProjectReference Include="..\..\Ice\defaultValue\msbuild\test\netstandard2.0\test.csproj" /> <ProjectReference Include="..\..\Ice\dictMapping\msbuild\test\netstandard2.0\test.csproj" /> |