Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bulk dependency updates #875

Merged
merged 12 commits into from
Jul 1, 2021
Merged

Bulk dependency updates #875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
2c6f8cc
Bump Microsoft.Diagnostics.Runtime from 2.0.223001 to 2.0.230301
dependabot[bot] Jun 9, 2021
778cc1d
Bump Microsoft.Diagnostics.Runtime.Utilities
dependabot[bot] Jun 9, 2021
7d1b4d6
Bump Microsoft.VisualStudio.Shell.Interop.11.0
dependabot[bot] Jul 1, 2021
3cdc61e
Bump Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime
dependabot[bot] Jul 1, 2021
b351ae4
Bump Nerdbank.GitVersioning from 3.4.205 to 3.4.220
dependabot[bot] Jul 1, 2021
8a2f9ad
Merge remote-tracking branch 'upstream/dependabot/nuget/Microsoft.Vis…
AArnott Jul 1, 2021
8db52fa
Merge remote-tracking branch 'upstream/dependabot/nuget/Microsoft.Dia…
AArnott Jul 1, 2021
cb61266
Merge remote-tracking branch 'upstream/dependabot/nuget/Microsoft.Dia…
AArnott Jul 1, 2021
5f8d2b9
Merge remote-tracking branch 'upstream/dependabot/nuget/Microsoft.Vis…
AArnott Jul 1, 2021
8a3ca41
Update and simplify dependencies
AArnott Jul 1, 2021
5da539f
Merge remote-tracking branch 'upstream/dependabot/nuget/Nerdbank.GitV…
AArnott Jul 1, 2021
b661929
Fix up analyzer tests
AArnott Jul 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="5.0.3" PrivateAssets="all" />
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" PrivateAssets="all" Condition=" '$(MSBuildProjectName)' != 'SosThreadingTools' " />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="all" />
<PackageReference Include="Nerdbank.GitVersioning" Version="3.4.205" PrivateAssets="all" />
<PackageReference Include="Nerdbank.GitVersioning" Version="3.4.220" PrivateAssets="all" />
<PackageReference Include="Microsoft.Net.Compilers.Toolset" Version="3.10.0" PrivateAssets="all" />
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.261" PrivateAssets="all" />
</ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/SosThreadingTools/SosThreadingTools.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
<SignFilesDependsOn Include="DllExportMod" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Diagnostics.Runtime" Version="2.0.223001" />
<PackageReference Include="Microsoft.Diagnostics.Runtime.Utilities" Version="2.0.223001" />
<PackageReference Include="Microsoft.Diagnostics.Runtime" Version="2.0.230301" />
<PackageReference Include="Microsoft.Diagnostics.Runtime.Utilities" Version="2.0.230301" />
<PackageReference Include="DllExport" Version="1.5.2" />
</ItemGroup>
<Import Project="$(PkgDllExport)\tools\net.r_eg.DllExport.targets" Condition="Exists('$(PkgDllExport)\tools\net.r_eg.DllExport.targets')" />
Expand Down
6 changes: 4 additions & 2 deletions test/Microsoft.VisualStudio.Threading.Analyzers.Tests/Helpers/ReferencesHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,15 @@ internal static class ReferencesHelper
"Microsoft.VisualStudio.Shell.Interop.dll",
"Microsoft.VisualStudio.Shell.Interop.11.0.dll",
"Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime.dll",
"Microsoft.VisualStudio.Shell.Immutable.14.0.dll",
"Microsoft.VisualStudio.Shell.14.0.dll",
"Microsoft.VisualStudio.Shell.Framework.dll",
"Microsoft.VisualStudio.Shell.15.0.dll",
});

static ReferencesHelper()
{
#pragma warning disable RS0030 // Do not used banned APIs
ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
#pragma warning restore RS0030 // Do not used banned APIs
}
}
}
4 changes: 2 additions & 2 deletions ...osoft.VisualStudio.Threading.Analyzers.Tests/Helpers/VisualBasicCodeFixVerifier`2+Test.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ public class Test : VisualBasicCodeFixTest<TAnalyzer, TCodeFix, XUnitVerifier>
"Microsoft.VisualStudio.Shell.Interop.dll",
"Microsoft.VisualStudio.Shell.Interop.11.0.dll",
"Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime.dll",
"Microsoft.VisualStudio.Shell.Immutable.14.0.dll",
"Microsoft.VisualStudio.Shell.14.0.dll",
"Microsoft.VisualStudio.Shell.Framework.dll",
"Microsoft.VisualStudio.Shell.15.0.dll",
});

public Test()
Expand Down
9 changes: 3 additions & 6 deletions ...lStudio.Threading.Analyzers.Tests/Microsoft.VisualStudio.Threading.Analyzers.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,10 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit" Version="1.0.1-beta1.21166.1" />
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing.XUnit" Version="1.0.1-beta1.21166.1" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit" Version="1.1.0" />
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing.XUnit" Version="1.1.0" />
Comment on lines +23 to +24
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 We've already made further improvements in newer builds like 1.1.0-beta1.21329.1.

Copy link
Member Author

@AArnott AArnott Jul 1, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Per semver rules, 1.1.0 is newer than 1.1.0-beta1.21329.1, so I'm a bit confused. Does the version number of your latest work need to be bumped to 1.1.1 perhaps? Anyway, that's great to hear of ongoing improvements. Those package versions aren't available on nuget.org by the look of it. Are the improvements worth taking now, or when we need the new features?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jmarolf for the ordering issue.

The updates mainly affect test inputs/outputs involving multiple projects.

<PackageReference Include="Microsoft.CodeAnalysis" Version="3.1.0" />
<PackageReference Include="Microsoft.VisualStudio.OLE.Interop" Version="16.10.31302.24" />
<PackageReference Include="Microsoft.VisualStudio.Shell.14.0" Version="14.3.25407" IncludeAssets="runtime" />
<PackageReference Include="Microsoft.VisualStudio.Shell.Interop.11.0" Version="16.10.31302.24" IncludeAssets="runtime" />
<PackageReference Include="Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime" Version="16.10.31302.24" IncludeAssets="runtime" />
<PackageReference Include="Microsoft.VisualStudio.Shell.15.0" Version="16.10.31321.278" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PrivateAssets>all</PrivateAssets>
Expand Down