Skip to content

Commit 3779761

Browse files
Enable roslyn tests in VMR (#46767)
1 parent b135dbb commit 3779761

File tree

2 files changed

+43
-3
lines changed

2 files changed

+43
-3
lines changed

src/SourceBuild/content/repo-projects/roslyn.proj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
<PropertyGroup>
44
<LogVerbosityOptOut>true</LogVerbosityOptOut>
55

6-
<!-- Tests are failing to build: https://github.com/dotnet/roslyn/issues/76960 -->
7-
<DotNetBuildTestsOptOut>true</DotNetBuildTestsOptOut>
8-
96
<!-- Roslyn's build.cmd adds -build automatically. On non-windows, use the default -->
107
<BuildActions Condition="'$(BuildOS)' == 'windows'">$(FlagParameterPrefix)restore</BuildActions>
118
<BuildActions Condition="'$(BuildOS)' == 'windows'">$(BuildActions) $(FlagParameterPrefix)pack</BuildActions>
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: "Nikola Milosavljevic (CLR) false" <[email protected]>
3+
Date: Tue, 11 Feb 2025 23:44:46 -0800
4+
Subject: [PATCH] Enable tests in VMR
5+
6+
Backport: https://github.com/dotnet/roslyn/pull/77179
7+
---
8+
eng/Directory.Packages.props | 4 ++--
9+
eng/Versions.props | 8 ++++++++
10+
2 files changed, 10 insertions(+), 2 deletions(-)
11+
12+
diff --git a/eng/Directory.Packages.props b/eng/Directory.Packages.props
13+
index e28bb02fdaa..2d5be90f1cc 100644
14+
--- a/eng/Directory.Packages.props
15+
+++ b/eng/Directory.Packages.props
16+
@@ -142,8 +142,8 @@
17+
-->
18+
<PackageVersion Include="Microsoft.VisualStudio.LanguageServer.Client.Implementation" Version="17.10.72-preview" />
19+
<PackageVersion Include="NuGet.ProjectModel" Version="6.8.0-rc.112" />
20+
- <PackageVersion Include="Microsoft.TestPlatform.TranslationLayer" Version="$(_MicrosoftTestPlatformVersion)" />
21+
- <PackageVersion Include="Microsoft.TestPlatform.ObjectModel" Version="$(_MicrosoftTestPlatformVersion)" />
22+
+ <PackageVersion Include="Microsoft.TestPlatform.TranslationLayer" Version="$(MicrosoftNETTestSdkVersion)" />
23+
+ <PackageVersion Include="Microsoft.TestPlatform.ObjectModel" Version="$(MicrosoftNETTestSdkVersion)" />
24+
<PackageVersion Include="Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace" Version="9.0.0-preview.25064.4" />
25+
26+
<!--
27+
diff --git a/eng/Versions.props b/eng/Versions.props
28+
index 24ca795bf35..a0df3fcf5d9 100644
29+
--- a/eng/Versions.props
30+
+++ b/eng/Versions.props
31+
@@ -107,4 +107,12 @@
32+
<!-- Prohibit the usage of .NET Standard 1.x dependencies. -->
33+
<FlagNetStandard1XDependencies Condition="'$(DotNetBuildSourceOnly)' == 'true'">true</FlagNetStandard1XDependencies>
34+
</PropertyGroup>
35+
+ <PropertyGroup>
36+
+ <!--
37+
+ Test SDK should match the version of TestPlatform packages required by this repo and defined
38+
+ in Directory.Packages.props - Microsoft.TestPlatform.TranslationLayer and Microsoft.TestPlatform.ObjectModel.
39+
+ This version needs to match the Test SDK version consumed by Arcade.
40+
+ -->
41+
+ <MicrosoftNETTestSdkVersion>17.5.0</MicrosoftNETTestSdkVersion>
42+
+ </PropertyGroup>
43+
</Project>

0 commit comments

Comments
 (0)