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

Jump to bottom

[release/8.0.2xx] Update dependencies from dotnet/roslyn #2161

Merged
merged 8 commits into from May 7, 2024
Merged

[release/8.0.2xx] Update dependencies from dotnet/roslyn #2161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
591908d
Update dependencies from https://github.com/dotnet/roslyn build
dotnet-maestro[bot] Mar 25, 2024
7b4b547
Update dependencies from https://github.com/dotnet/roslyn build 20240…
dotnet-maestro[bot] Apr 8, 2024
0f52693
Update dependencies from https://github.com/dotnet/roslyn build 20240…
dotnet-maestro[bot] Apr 15, 2024
aeaa873
Update dependencies from https://github.com/dotnet/roslyn build 20240…
dotnet-maestro[bot] Apr 22, 2024
3c153d5
Update dependencies from https://github.com/dotnet/roslyn build 20240…
dotnet-maestro[bot] Apr 29, 2024
ef65f1a
Update dependencies from https://github.com/dotnet/roslyn build 20240…
dotnet-maestro[bot] May 6, 2024
6156720
Check if MSBuild can be registered during test runs
JoeRobich May 7, 2024
b3a44b9
Fix encoding
JoeRobich May 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions NuGet.config
View file
Open in desktop
Expand Up @@ -10,4 +10,5 @@
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
</packageSources>
<disabledPackageSources />
</configuration>
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
View file
Open in desktop
Expand Up @@ -5,9 +5,9 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis" Version="4.8.0-7.24067.24">
<Dependency Name="Microsoft.CodeAnalysis" Version="4.9.2-3.24171.17">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>263571123fc3dc4a638e071234ac9fbf91913962</Sha>
<Sha>a74310032037a8df19d3516256edb6738be9e817</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.23502.1">
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Expand Up @@ -31,7 +31,7 @@
<!-- In order tests against the same version of NuGet as the SDK. We have to set this to match. -->
<NuGetVersion>6.8.0-rc.122</NuGetVersion>
<!-- roslyn -->
<MicrosoftCodeAnalysisVersion>4.8.0-7.24067.24</MicrosoftCodeAnalysisVersion>
<MicrosoftCodeAnalysisVersion>4.9.2-3.24171.17</MicrosoftCodeAnalysisVersion>
<!-- roslyn-sdk -->
<MicrosoftCodeAnalysisAnalyzerTestingVersion>1.1.2-beta1.22216.1</MicrosoftCodeAnalysisAnalyzerTestingVersion>
<!-- runtime -->
Expand Down
17 changes: 12 additions & 5 deletions tests/Utilities/MSBuildRegistrar.cs
View file
Open in desktop
Expand Up @@ -21,11 +21,18 @@ public static string RegisterInstance()
{
if (Interlocked.Exchange(ref s_registered, 1) == 0)
{
var msBuildInstance = Build.Locator.MSBuildLocator.QueryVisualStudioInstances().First();
s_msBuildPath = Path.EndsInDirectorySeparator(msBuildInstance.MSBuildPath)
? msBuildInstance.MSBuildPath
: msBuildInstance.MSBuildPath + Path.DirectorySeparatorChar;
Build.Locator.MSBuildLocator.RegisterMSBuildPath(s_msBuildPath);
if (Build.Locator.MSBuildLocator.CanRegister)
{
var msBuildInstance = Build.Locator.MSBuildLocator.QueryVisualStudioInstances().First();
s_msBuildPath = Path.EndsInDirectorySeparator(msBuildInstance.MSBuildPath)
? msBuildInstance.MSBuildPath
: msBuildInstance.MSBuildPath + Path.DirectorySeparatorChar;
Build.Locator.MSBuildLocator.RegisterMSBuildPath(s_msBuildPath);
}
else
{
s_msBuildPath = "MSBuild could not be registered.";
}
}

return s_msBuildPath!;
Expand Down