Skip to content

Commit ea30717

Browse files
authored
Update dependencies for latest versions. (#89)
Fixes #88 * This updates the version of many dependencies to eliminate vulnerabilities - The vulnerability reported ONLY impacts Linux according to the CVE but this package is valid there so it is updated. * Updated tests to resolve new MSTEST* warnings about not using new methods. * Updated for vulnerability in dependent MSBUILD package.
1 parent d23798d commit ea30717

File tree

3 files changed

+19
-10
lines changed

3 files changed

+19
-10
lines changed

Directory.Build.targets

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<Project InitialTargets="VerifyProjectSettings;ShowBuildParameters">
2-
<Target Name="EnsureBuildOutputPaths" Condition="!EXISTS($(PackageOutputPath))" BeforeTargets="Build;Restore">
3-
<MakeDir Directories="$(PackageOutputPath)"/>
1+
<Project InitialTargets="VerifyProjectSettings;ShowBuildParameters;EnsureBuildOutputPaths">
2+
<Target Name="EnsureBuildOutputPaths">
3+
<MakeDir Condition="!EXISTS($(PackageOutputPath))" Directories="$(PackageOutputPath)"/>
44
</Target>
55

66
<Target Name="ShowBuildParameters">
@@ -41,6 +41,6 @@
4141
<Error Condition="'$(ImplicitUsings)'!='disable'" Code="REPO001" Text="$(MSBuildProjectFile) - Projects in this repository MUST NOT have ImplicitUsings enabled!"/>
4242

4343
<!--Verify that GeneratedVersion.props exists; and produce a, hopefully, informative message on how to create it if it doesn't -->
44-
<Error Condition="!Exists('$(GeneratedVersionProps)')" Code="REPO002" Text="$(GeneratedVersionProps) file does not exist, it must be created by `New-GeneratedBersionProps.ps1` BEFORE building in the IDE for consistent results"/>
44+
<Error Condition="!Exists('$(GeneratedVersionProps)')" Code="REPO002" Text="$(GeneratedVersionProps) file does not exist, it must be created by `New-GeneratedVersionProps.ps1` BEFORE building in the IDE for consistent results"/>
4545
</Target>
4646
</Project>

Directory.Packages.props

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
-->
1616
<ItemGroup>
1717
<PackageVersion Include="Microsoft.Bcl.HashCode" Version="6.0.0" />
18-
<PackageVersion Include="Microsoft.Build.Framework" Version="17.14.8" />
19-
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.14.8" />
20-
<PackageVersion Include="MSBuild.ProjectCreation" Version="14.0.5" />
18+
<PackageVersion Include="Microsoft.Build.Framework" Version="17.14.28" />
19+
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.14.28" />
20+
<PackageVersion Include="MSBuild.ProjectCreation" Version="16.1.0" />
2121
<!-- Tests all use the same framework versions -->
22-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
23-
<PackageVersion Include="MSTest.TestAdapter" Version="3.9.3" />
24-
<PackageVersion Include="MSTest.TestFramework" Version="3.9.3" />
22+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
23+
<PackageVersion Include="MSTest.TestAdapter" Version="4.0.1" />
24+
<PackageVersion Include="MSTest.TestFramework" Version="4.0.1" />
2525
<PackageVersion Include="PolySharp" Version="1.15.0" />
2626
<PackageVersion Include="Sprache" Version="2.3.1" />
2727
<PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />

src/Ubiquity.NET.Versioning.Build.Tasks.UT/Support/AssemblyInfo.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
using System.Diagnostics.CodeAnalysis;
99
using System.Runtime.InteropServices;
1010

11+
using Microsoft.VisualStudio.TestTools.UnitTesting;
12+
1113
// In SDK-style projects such as this one, several assembly attributes that were historically
1214
// defined in this file are now automatically added during build and populated with
1315
// values defined in project properties. For details of which attributes are included
@@ -25,3 +27,10 @@
2527

2628
// Code coverage should not apply to a unit test assembly
2729
[assembly: ExcludeFromCodeCoverage]
30+
31+
// parallelization causes problems with concurrent builds
32+
// so it must be disabled. Total test time is still ~15s
33+
// for the first (No JIT caching of hot path). There is
34+
// probably a way to resolve this and allow parallel builds
35+
// or tests but it doesn't currently seem worth it to investigate...
36+
[assembly: DoNotParallelize]

0 commit comments

Comments
 (0)