Merge pull request #15 from mishamyte/bump-dependencies

Bump dependencies to fix security vulnerabilities
jbogard · Aug 30, 2022 · d82ab5e · d82ab5e
2 parents 16b1ee5 + 9a78a27
commit d82ab5e
Show file tree

Hide file tree

Showing 5 changed files with 96 additions and 102 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,7 +3,7 @@ name: CI
 on:
   push:
     branches:
-    - master
+      - master
   pull_request:
     branches:
       - master
@@ -13,29 +13,25 @@ jobs:
       fail-fast: false
     runs-on: ubuntu-latest
     steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
-    - name: Setup dotnet 5.0
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: '5.0.100'
-    - name: Setup dotnet 3.1
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: '3.1.x'
-    - name: Build and Test
-      run: ./Build.ps1
-      shell: pwsh
-    - name: Push to MyGet
-      env:
-        NUGET_URL: https://www.myget.org/F/jbogard-ci/api/v3/index.json
-        NUGET_API_KEY: ${{ secrets.MYGET_JBOGARD_CI_API_KEY }}
-      run: ./Push.ps1
-      shell: pwsh
-    - name: Artifacts
-      uses: actions/upload-artifact@v2
-      with:
-        name: artifacts
-        path: artifacts/**/*
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Setup dotnet SDK 6.0
+        uses: actions/setup-dotnet@v2
+        with:
+          dotnet-version: 6.0.x
+      - name: Build and Test
+        run: ./Build.ps1
+        shell: pwsh
+      - name: Push to MyGet
+        env:
+          NUGET_URL: https://www.myget.org/F/jbogard-ci/api/v3/index.json
+          NUGET_API_KEY: ${{ secrets.MYGET_JBOGARD_CI_API_KEY }}
+        run: ./Push.ps1
+        shell: pwsh
+      - name: Artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: artifacts
+          path: artifacts/**/*
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -3,42 +3,38 @@ name: Release
 on:
   push:
     tags:
-    - '*.*.*'
+      - '*.*.*'
 jobs:
   build:
     strategy:
       fail-fast: false
     runs-on: ubuntu-latest
     steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
-    - name: Setup dotnet 5.0
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: '5.0.100'
-    - name: Setup dotnet 3.1
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: '3.1.x'
-    - name: Build and Test
-      run: ./Build.ps1
-      shell: pwsh
-    - name: Push to MyGet
-      env:
-        NUGET_URL: https://www.myget.org/F/jbogard-ci/api/v3/index.json
-        NUGET_API_KEY: ${{ secrets.MYGET_JBOGARD_CI_API_KEY }}
-      run: ./Push.ps1
-      shell: pwsh
-    - name: Push to NuGet
-      env:
-        NUGET_URL: https://api.nuget.org/v3/index.json
-        NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}
-      run: ./Push.ps1
-      shell: pwsh
-    - name: Artifacts
-      uses: actions/upload-artifact@v2
-      with:
-        name: artifacts
-        path: artifacts/**/*
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Setup dotnet SDK 6.0
+        uses: actions/setup-dotnet@v2
+        with:
+          dotnet-version: 6.0.x
+      - name: Build and Test
+        run: ./Build.ps1
+        shell: pwsh
+      - name: Push to MyGet
+        env:
+          NUGET_URL: https://www.myget.org/F/jbogard-ci/api/v3/index.json
+          NUGET_API_KEY: ${{ secrets.MYGET_JBOGARD_CI_API_KEY }}
+        run: ./Push.ps1
+        shell: pwsh
+      - name: Push to NuGet
+        env:
+          NUGET_URL: https://api.nuget.org/v3/index.json
+          NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}
+        run: ./Push.ps1
+        shell: pwsh
+      - name: Artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: artifacts
+          path: artifacts/**/*
diff --git a/README.md b/README.md
@@ -43,5 +43,5 @@ This package exposes an [`ActivitySource`](https://docs.microsoft.com/en-us/dotn
 
 All the available [OpenTelemetry semantic tags](https://github.com/open-telemetry/opentelemetry-specification/blob/master/specification/trace/semantic_conventions/database.md) are set.
 
-This package supports MongoDB C# Driver versions 2.3 to 3.0.
+This package supports MongoDB C# Driver versions 2.17.1 to 3.0.
 
diff --git a/...Core.Extensions.DiagnosticSources/MongoDB.Driver.Core.Extensions.DiagnosticSources.csproj b/...Core.Extensions.DiagnosticSources/MongoDB.Driver.Core.Extensions.DiagnosticSources.csproj
@@ -1,24 +1,24 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <PropertyGroup>
+        <TargetFramework>netstandard2.0</TargetFramework>
+        <NoWarn>NU5100</NoWarn>
+        <Authors>Jimmy Bogard</Authors>
+        <Copyright>Jimmy Bogard</Copyright>
+        <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
+        <PublishRepositoryUrl>true</PublishRepositoryUrl>
+        <IncludeSymbols>true</IncludeSymbols>
+        <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+        <EmbedUntrackedSources>true</EmbedUntrackedSources>
+        <Deterministic>true</Deterministic>
+        <ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true'">true</ContinuousIntegrationBuild>
+    </PropertyGroup>
 
-    <Authors>Jimmy Bogard</Authors>
-    <Copyright>Jimmy Bogard</Copyright>
-    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <IncludeSymbols>true</IncludeSymbols>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <EmbedUntrackedSources>true</EmbedUntrackedSources>
-    <Deterministic>true</Deterministic>
-    <ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true'">true</ContinuousIntegrationBuild>
-  </PropertyGroup>
+    <ItemGroup>
+        <PackageReference Include="MongoDB.Driver.Core" Version="[2.17.1,3.0)" />
+        <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="6.0.0" />
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+        <PackageReference Include="MinVer" Version="4.2.0" PrivateAssets="All" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="MongoDB.Driver.Core" Version="[2.3,3.0)" />
-    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="5.0.0" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-    <PackageReference Include="MinVer" Version="2.3.1" PrivateAssets="All" />
-  </ItemGroup>
-
-</Project>
+</Project>
diff --git a/...ons.DiagnosticSources.Tests/MongoDB.Driver.Core.Extensions.DiagnosticSources.Tests.csproj b/...ons.DiagnosticSources.Tests/MongoDB.Driver.Core.Extensions.DiagnosticSources.Tests.csproj
@@ -1,27 +1,29 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <PropertyGroup>
+        <TargetFramework>net6.0</TargetFramework>
+        <IsPackable>false</IsPackable>
+    </PropertyGroup>
 
-    <IsPackable>false</IsPackable>
-  </PropertyGroup>
+    <ItemGroup>
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+        <PackageReference Include="Shouldly" Version="4.1.0" />
+        <PackageReference Include="System.Net.Http" Version="4.3.4" />
+        <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
+        <PackageReference Include="xunit" Version="2.4.2" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+        <PackageReference Include="coverlet.collector" Version="3.1.2">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+    </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
-    <PackageReference Include="Shouldly" Version="3.0.2" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.2">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="1.3.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\MongoDB.Driver.Core.Extensions.DiagnosticSources\MongoDB.Driver.Core.Extensions.DiagnosticSources.csproj" />
-  </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\..\src\MongoDB.Driver.Core.Extensions.DiagnosticSources\MongoDB.Driver.Core.Extensions.DiagnosticSources.csproj" />
+    </ItemGroup>
 
 </Project>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -43,5 +43,5 @@ This package exposes an [`ActivitySource`](https://docs.microsoft.com/en-us/dotn

		All the available [OpenTelemetry semantic tags](https://github.com/open-telemetry/opentelemetry-specification/blob/master/specification/trace/semantic_conventions/database.md) are set.

		This package supports MongoDB C# Driver versions 2.3 to 3.0.
		This package supports MongoDB C# Driver versions 2.17.1 to 3.0.