Skip to content

Commit 236dcd9

Browse files
PilchiePilchie
authored
Revert "Add gRPC interop tests (dotnet#17040)" (dotnet#20047)
This reverts commit 8afb78f.
1 parent dab0296 commit 236dcd9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+10
-2346
lines changed

Diff for: ‎.azure/pipelines/ci.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -674,9 +674,9 @@ stages:
674674
# Build the shared framework
675675
- script: ./build.cmd -ci -all -pack -arch x64 -buildNative /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log /bl:artifacts/log/helix.build.x64.binlog
676676
displayName: Build shared fx
677-
- script: .\restore.cmd -ci /p:BuildInteropProjects=true
677+
- script: .\restore.cmd -ci
678678
displayName: Restore
679-
- script: .\build.cmd -ci -NoRestore -test -projects eng\helix\helix.proj /p:IsRequiredCheck=true /p:IsHelixJob=true /p:BuildAllProjects=true /p:BuildInteropProjects=true /p:BuildNative=true /p:RunTemplateTests=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log -bl
679+
- script: .\build.cmd -ci -NoRestore -test -projects eng\helix\helix.proj /p:IsRequiredCheck=true /p:IsHelixJob=true /p:BuildAllProjects=true /p:BuildNative=true /p:RunTemplateTests=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log -bl
680680
displayName: Run build.cmd helix target
681681
env:
682682
HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues
@@ -701,7 +701,7 @@ stages:
701701
# Build the x86 shared framework
702702
- script: .\restore.cmd -ci
703703
displayName: Restore
704-
- script: .\build.cmd -ci -NoRestore -test -projects eng\helix\helix.proj /p:IsHelixJob=true /p:IsHelixDaily=true /p:BuildAllProjects=true /p:BuildInteropProjects=true /p:BuildNative=true /p:RunTemplateTests=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log -bl
704+
- script: .\build.cmd -ci -NoRestore -test -projects eng\helix\helix.proj /p:IsHelixJob=true /p:IsHelixDaily=true /p:BuildAllProjects=true /p:BuildNative=true /p:RunTemplateTests=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log -bl
705705
displayName: Run build.cmd helix target
706706
env:
707707
HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues

Diff for: ‎.azure/pipelines/quarantined-tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
displayName: Build shared fx
3636
- script: .\restore.cmd -ci
3737
displayName: Restore
38-
- script: .\build.cmd -ci -NoRestore -test -noBuildJava -projects eng\helix\helix.proj /p:RunQuarantinedTests=true /p:IsRequiredCheck=true /p:IsHelixJob=true /p:BuildAllProjects=true /p:BuildInteropProjects=true /p:BuildNative=true /p:RunTemplateTests=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log -bl
38+
- script: .\build.cmd -ci -NoRestore -test -noBuildJava -projects eng\helix\helix.proj /p:RunQuarantinedTests=true /p:IsRequiredCheck=true /p:IsHelixJob=true /p:BuildAllProjects=true /p:BuildNative=true /p:RunTemplateTests=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log -bl
3939
displayName: Run build.cmd helix target
4040
env:
4141
HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues

Diff for: ‎Directory.Build.targets

-2
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,5 @@
167167
<Import Project="eng\targets\Npm.Common.targets" Condition="'$(MSBuildProjectExtension)' == '.npmproj'" />
168168
<Import Project="eng\targets\ReferenceAssembly.targets" Condition=" $(HasReferenceAssembly) " />
169169
<Import Project="eng\targets\Helix.targets" Condition="'$(IsTestProject)' == 'true'" />
170-
<Import Project="eng\targets\FunctionalTestAsset.targets" Condition="'$(IsTestAssetProject)' == 'true'" />
171-
<Import Project="eng\targets\FunctionalTestWithAssets.targets" Condition="'$(ContainsFunctionalTestAssets)' == 'true'" />
172170

173171
</Project>

Diff for: ‎eng/Build.props

-7
Original file line numberDiff line numberDiff line change
@@ -123,13 +123,6 @@
123123
<ProjectToBuild Condition=" '$(BuildJava)' == 'true'" Include="@(JavaProjects)" Exclude="@(ProjectToExclude)" />
124124
<ProjectToExclude Condition=" '$(BuildJava)' != 'true'" Include="@(JavaProjects)" />
125125

126-
<!-- These interop test projects can only be restored and built after the shared framework is built -->
127-
<InteropProjects Include="$(RepoRoot)src\Grpc\**\*.csproj"
128-
Exclude="@(ProjectToExclude)" />
129-
130-
<ProjectToBuild Condition=" '$(BuildInteropProjects)' == 'true'" Include="@(InteropProjects)" Exclude="@(ProjectToExclude)" />
131-
<ProjectToExclude Condition=" '$(BuildInteropProjects)' != 'true'" Include="@(InteropProjects)" />
132-
133126
<!--
134127
Use caution to avoid deep recursion. If the globbing pattern picks up something which exceeds MAX_PATH,
135128
the entire pattern will silently fail to evaluate correctly.

Diff for: ‎eng/Dependencies.props

+1-6
Original file line numberDiff line numberDiff line change
@@ -154,13 +154,8 @@ and are generated based on the last package release.
154154
<ItemGroup Label="External dependencies" Condition="'$(DotNetBuildFromSource)' != 'true'">
155155
<LatestPackageReference Include="AngleSharp" Version="$(AngleSharpPackageVersion)" />
156156
<LatestPackageReference Include="BenchmarkDotNet" Version="$(BenchmarkDotNetPackageVersion)" />
157-
<LatestPackageReference Include="CommandLineParser" Version="$(CommandLineParserPackageVersion)" />
158157
<LatestPackageReference Include="FSharp.Core" Version="$(FSharpCorePackageVersion)" />
159-
<LatestPackageReference Include="Google.Protobuf" Version="$(GoogleProtobufPackageVersion)" />
160-
<LatestPackageReference Include="Grpc.AspNetCore" Version="$(GrpcAspNetCorePackageVersion)" />
161-
<LatestPackageReference Include="Grpc.Auth" Version="$(GrpcAuthPackageVersion)" />
162-
<LatestPackageReference Include="Grpc.Net.Client" Version="$(GrpcNetClientPackageVersion)" />
163-
<LatestPackageReference Include="Grpc.Tools" Version="$(GrpcToolsPackageVersion)" />
158+
<LatestPackageReference Include="Google.ProtoBuf" Version="$(GoogleProtoBufPackageVersion)" />
164159
<LatestPackageReference Include="IdentityServer4" Version="$(IdentityServer4PackageVersion)" />
165160
<LatestPackageReference Include="IdentityServer4.AspNetIdentity" Version="$(IdentityServer4AspNetIdentityPackageVersion)" />
166161
<LatestPackageReference Include="IdentityServer4.EntityFramework" Version="$(IdentityServer4EntityFrameworkPackageVersion)" />

Diff for: ‎eng/Versions.props

+1-5
Original file line numberDiff line numberDiff line change
@@ -217,13 +217,9 @@
217217
<AngleSharpPackageVersion>0.9.9</AngleSharpPackageVersion>
218218
<BenchmarkDotNetPackageVersion>0.12.0</BenchmarkDotNetPackageVersion>
219219
<CastleCorePackageVersion>4.2.1</CastleCorePackageVersion>
220-
<CommandLineParserPackageVersion>2.3.0</CommandLineParserPackageVersion>
221220
<FSharpCorePackageVersion>4.2.1</FSharpCorePackageVersion>
222-
<GoogleProtobufPackageVersion>3.10.0</GoogleProtobufPackageVersion>
221+
<GoogleProtobufPackageVersion>3.8.0</GoogleProtobufPackageVersion>
223222
<GrpcAspNetCorePackageVersion>2.27.0</GrpcAspNetCorePackageVersion>
224-
<GrpcAuthPackageVersion>2.27.0</GrpcAuthPackageVersion>
225-
<GrpcNetClientPackageVersion>2.27.0</GrpcNetClientPackageVersion>
226-
<GrpcToolsPackageVersion>2.27.0</GrpcToolsPackageVersion>
227223
<IdentityServer4AspNetIdentityPackageVersion>3.0.0</IdentityServer4AspNetIdentityPackageVersion>
228224
<IdentityServer4EntityFrameworkPackageVersion>3.0.0</IdentityServer4EntityFrameworkPackageVersion>
229225
<IdentityServer4PackageVersion>3.0.0</IdentityServer4PackageVersion>

Diff for: ‎eng/helix/content/runtests.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ echo "Creating nugetRestore directory: $NUGET_RESTORE"
4141
mkdir $NUGET_RESTORE
4242
mkdir logs
4343

44-
ls -laR
44+
ls -la
4545

4646
RESET="\033[0m"
4747
RED="\033[0;31m"

Diff for: ‎eng/targets/FunctionalTestAsset.targets

-9
This file was deleted.

Diff for: ‎eng/targets/FunctionalTestWithAssets.targets

-27
This file was deleted.

Diff for: ‎src/Grpc/Grpc.sln

-46
This file was deleted.

Diff for: ‎src/Grpc/THIRD-PARTY-NOTICES

-26
This file was deleted.

Diff for: ‎src/Grpc/build.cmd

-3
This file was deleted.

Diff for: ‎src/Grpc/build.sh

-7
This file was deleted.

Diff for: ‎src/Grpc/startvs.cmd

-3
This file was deleted.

Diff for: ‎src/Grpc/test/InteropTests/Helpers/ClientProcess.cs

-62
This file was deleted.

Diff for: ‎src/Grpc/test/InteropTests/Helpers/InteropTestsFixture.cs

-44
This file was deleted.

0 commit comments

Comments
 (0)