Skip to content

Verify new roslyn changes don't break us #36850

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.

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

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
<!-- Warnings and errors -->
<PropertyGroup>
<!-- Ensure API docs are available. -->
<NoWarn>$(NoWarn.Replace('1591', ''))</NoWarn>
<NoWarn>$(NoWarn.Replace('1591', ''));NETSDK1023</NoWarn>
<NoWarn Condition=" '$(BuildingInsideVisualStudio)' == 'true' ">$(NoWarn);0105</NoWarn>

<!-- For local builds, don't make missing XML docs a fatal build error, but still surface so we have visibility into undocumented APIs. -->
Expand Down
7 changes: 7 additions & 0 deletions Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -191,4 +191,11 @@
<Import Project="eng\targets\FunctionalTestAsset.targets" Condition="'$(IsTestAssetProject)' == 'true'" />
<Import Project="eng\targets\FunctionalTestWithAssets.targets" Condition="'$(ContainsFunctionalTestAssets)' == 'true'" />

<ItemGroup>
<PackageReference Include="Microsoft.Net.Compilers.Toolset"
Version="4.0.0-ci.final"
PrivateAssets="all"
IsImplicitlyDefined="true" />
</ItemGroup>

</Project>
1 change: 1 addition & 0 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<configuration>
<packageSources>
<clear />
<add key="local" value="./packages" />
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
<add key="dotnet5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json" />
Expand Down
5 changes: 3 additions & 2 deletions eng/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -433,6 +433,7 @@ try {
/p:Restore=$RunRestore `
/p:Build=true `
/clp:NoSummary `
/nowarn:NETSDK1023 `
@ToolsetBuildArguments
}

Expand All @@ -441,15 +442,15 @@ try {
Remove-Item variable:global:_BuildTool -ErrorAction Ignore
$msbuildEngine = 'vs'

MSBuild $toolsetBuildProj /p:RepoRoot=$RepoRoot @MSBuildArguments
MSBuild $toolsetBuildProj /p:RepoRoot=$RepoRoot /nowarn:NETSDK1023 @MSBuildArguments
}

if ($performDotnetBuild) {
Write-Host
Remove-Item variable:global:_BuildTool -ErrorAction Ignore
$msbuildEngine = 'dotnet'

MSBuild $toolsetBuildProj /p:RepoRoot=$RepoRoot @dotnetBuildArguments
MSBuild $toolsetBuildProj /p:RepoRoot=$RepoRoot /nowarn:NETSDK1023 @dotnetBuildArguments
}
}
catch {
Expand Down
3 changes: 2 additions & 1 deletion eng/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -369,13 +369,14 @@ if [ "$build_repo_tasks" = true ]; then
-p:Restore=$run_restore \
-p:Build=true \
-clp:NoSummary \
-nowarn:NETSDK1023 \
${toolset_build_args[@]+"${toolset_build_args[@]}"}
fi

if [ "$only_build_repo_tasks" != true ]; then
# This incantation avoids unbound variable issues if msbuild_args is empty
# https://stackoverflow.com/questions/7577052/bash-empty-array-expansion-with-set-u
MSBuild $_InitializeToolset -p:RepoRoot="$repo_root" ${msbuild_args[@]+"${msbuild_args[@]}"}
MSBuild $_InitializeToolset -p:RepoRoot="$repo_root" -nowarn:NETSDK1023 ${msbuild_args[@]+"${msbuild_args[@]}"}
fi

ExitWithExitCode 0
5 changes: 5 additions & 0 deletions eng/tools/GenerateFiles/Directory.Build.targets.in
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,11 @@
Condition=" '$(IsServicingBuild)' != 'true' ">${MicrosoftAspNetCoreAppRefVersion}</TargetingPackVersion>
</KnownFrameworkReference>

<PackageReference Include="Microsoft.Net.Compilers.Toolset"
Version="4.0.0-ci.final"
PrivateAssets="all"
IsImplicitlyDefined="true" />

</ItemGroup>

<!-- Warn if the "just-built" ASP.NET Core shared framework does not exist. -->
Expand Down
Binary file not shown.