Skip to content

Commit 41e8be1

Browse files
authored
[in-proc] Backport #10503 -- remove unused Microsoft.Azure.Cosmos.Tables package (#11435)
* remove unused DocumentDD.Core package (#10503) * remove unused DocumentDD.Core package * update release_notes.md * Update deps.json * Explicitly reference STJ in WebHost * Publish deps.json as artifact * Always copy deps.json artifact * Fix copy deps.json task * Update deps.json * Copy net6/8 deps.json separately
1 parent 83e822b commit 41e8be1

File tree

6 files changed

+267
-1168
lines changed

6 files changed

+267
-1168
lines changed

eng/ci/templates/jobs/run-unit-tests.yml

Lines changed: 49 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,60 @@ jobs:
22
- job: RunUnitTests
33
displayName: Run Unit Tests
44

5+
variables:
6+
- name: test_projects
7+
value: |
8+
**/ExtensionsMetadataGeneratorTests.csproj
9+
**/WebJobs.Script.Tests.csproj
10+
11+
templateContext:
12+
outputParentDirectory: $(Build.ArtifactStagingDirectory)
13+
outputs:
14+
# We publish this deps.json as differences in exact dotnet SDK version between dev and CI may make it impossible to generate locally.
15+
- output: pipelineArtifact
16+
displayName: Publish deps.json
17+
path: $(Build.ArtifactStagingDirectory)
18+
artifact: WebHost_Deps
19+
condition: failed()
20+
521
steps:
622
- template: /eng/ci/templates/install-dotnet.yml@self
723

24+
- task: DotNetCoreCLI@2
25+
displayName: Restore
26+
inputs:
27+
command: custom
28+
custom: restore
29+
arguments: -v m
30+
projects: $(test_projects)
31+
32+
- task: DotNetCoreCLI@2
33+
displayName: Build
34+
inputs:
35+
command: build
36+
arguments: -v m -c release --no-restore
37+
projects: $(test_projects)
38+
839
- task: DotNetCoreCLI@2
940
displayName: Unit Tests
1041
inputs:
1142
command: test
1243
testRunTitle: Unit Tests
13-
arguments: -v n
14-
projects: |
15-
**\ExtensionsMetadataGeneratorTests.csproj
16-
**\WebJobs.Script.Tests.csproj
44+
arguments: -v m -c release --no-build
45+
projects: $(test_projects)
46+
47+
- task: CopyFiles@2
48+
displayName: Copy deps.json (net6.0)
49+
condition: failed()
50+
inputs:
51+
SourceFolder: out/bin/WebJobs.Script.WebHost/release_net6.0
52+
Contents: '**/Microsoft.Azure.WebJobs.Script.WebHost.deps.json'
53+
TargetFolder: $(Build.ArtifactStagingDirectory)/net6.0
54+
55+
- task: CopyFiles@2
56+
displayName: Copy deps.json (net8.0)
57+
condition: failed()
58+
inputs:
59+
SourceFolder: out/bin/WebJobs.Script.WebHost/release_net8.0
60+
Contents: '**/Microsoft.Azure.WebJobs.Script.WebHost.deps.json'
61+
TargetFolder: $(Build.ArtifactStagingDirectory)/net8.0

release_notes.md

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
### Release notes
2-
3-
<!-- Please add your release notes in the following format:
4-
- My change description (#PR)
5-
-->
6-
- Add JitTrace files for v4.44
7-
- Updated to version 1.5.8 of Microsoft.Azure.AppService.Middleware.Functions for .NET 8 only (#11416)
8-
- Enabling worker indexing for Logic Apps behind an enviornment setting (#11377)
1+
### Release notes
2+
3+
<!-- Please add your release notes in the following format:
4+
- My change description (#PR)
5+
-->
6+
- Add JitTrace files for v4.44
7+
- Updated to version 1.5.8 of Microsoft.Azure.AppService.Middleware.Functions for .NET 8 only (#11416)
8+
- Enabling worker indexing for Logic Apps behind an enviornment setting (#11377)
9+
- Remove packages `Microsoft.Azure.Cosmos.Table` and `Microsoft.Azure.DocumentDB.Core` (#11435)

src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
<PackageReference Include="Microsoft.ApplicationInsights.WindowsServer" Version="2.21.0" />
5353
<PackageReference Include="Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel" Version="2.21.0" />
5454
<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.8" />
55-
<PackageReference Include="Microsoft.Azure.Cosmos.Table" Version="1.0.8" />
5655
<PackageReference Include="Microsoft.Azure.Functions.Platform.Metrics.LinuxConsumption" Version="1.0.5" />
5756
<PackageReference Include="Microsoft.Azure.Storage.File" Version="11.1.7" />
5857
<PackageReference Include="Microsoft.Azure.WebJobs" Version="3.0.42" />
@@ -66,7 +65,6 @@
6665
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="$(IdentityDependencyVersion)" />
6766
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="$(IdentityDependencyVersion)" />
6867

69-
7068
<!--
7169
System.IO.FileSystem.AccessControl/5.0.0 pinned to avoid an unintented downgrade to 4.7.0.
7270
See https://github.com/Azure/azure-functions-host/pull/10002

test/WebJobs.Script.Tests/DependencyTests.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ public void Verify_DepsJsonChanges()
6464
Assert.True(File.Exists(oldDepsJson), $"{oldDepsJson} not found.");
6565
Assert.True(File.Exists(newDepsJson), $"{newDepsJson} not found.");
6666

67-
IEnumerable<RuntimeFile> oldAssets = GetRuntimeFiles(oldDepsJson);
68-
IEnumerable<RuntimeFile> newAssets = GetRuntimeFiles(newDepsJson);
67+
IEnumerable<RuntimeFile> oldAssets = GetRuntimeFiles(oldDepsJson).ToList();
68+
IEnumerable<RuntimeFile> newAssets = GetRuntimeFiles(newDepsJson).ToList();
6969

7070
var comparer = new RuntimeFileComparer();
7171

@@ -166,8 +166,7 @@ public bool Equals([AllowNull] RuntimeFile x, [AllowNull] RuntimeFile y)
166166

167167
public int GetHashCode([DisallowNull] RuntimeFile obj)
168168
{
169-
string code = obj.Path + obj.AssemblyVersion + obj.FileVersion;
170-
return code.GetHashCode();
169+
return HashCode.Combine(obj.Path, obj.AssemblyVersion, obj.FileVersion);
171170
}
172171
}
173172
}

0 commit comments

Comments
 (0)