Skip to content

Commit 58ea803

Browse files
committed
Merge branch 'v16.4' into v16.5
2 parents c601589 + 1f83d89 commit 58ea803

File tree

2 files changed

+6
-11
lines changed

2 files changed

+6
-11
lines changed

global.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
{
22
"sdk": {
3-
"version": "3.0.100"
3+
"version": "3.0.100",
4+
"rollForward": "latestPatch",
5+
"allowPrerelease": false
46
},
57
"msbuild-sdks": {
68
"MSBuild.Sdk.Extras": "2.0.54"

src/Microsoft.VisualStudio.Threading/Microsoft.VisualStudio.Threading.csproj

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,9 @@
4747
<PackageReference Include="XliffTasks" Version="1.0.0-beta.19253.2" PrivateAssets="all" />
4848
</ItemGroup>
4949
<ItemGroup>
50-
<!-- Don't consume the analyzers in this library itself,
51-
but have a package dependency so users of this library will automatically get the analyzers.
52-
This requires an MSBuild workaround as documented here: https://github.com/Microsoft/msbuild/issues/2661#issuecomment-338808137
53-
-->
54-
<ProjectReference Include="..\Microsoft.VisualStudio.Threading.Analyzers.CodeFixes\Microsoft.VisualStudio.Threading.Analyzers.CodeFixes.csproj">
55-
<PrivateAssets>none</PrivateAssets>
56-
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
57-
<SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
58-
<UndefineProperties>TargetFramework</UndefineProperties>
59-
</ProjectReference>
50+
<!-- We don't consume the analyzers in this library itself,
51+
but we reference the project to add a package dependency so users of this library will automatically get the analyzers. -->
52+
<ProjectReference Include="..\Microsoft.VisualStudio.Threading.Analyzers.CodeFixes\Microsoft.VisualStudio.Threading.Analyzers.CodeFixes.csproj" PrivateAssets="none" />
6053
</ItemGroup>
6154
<Import Project="OptProf.targets" Condition=" '$(TargetFramework)' == 'net472' " />
6255
</Project>

0 commit comments

Comments
 (0)