Skip to content

Fix SDL checks for main #14226

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

Merged
merged 3 commits into from
Nov 3, 2022
Merged

Fix SDL checks for main #14226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b29ddbc
Fix for #14201
vzarytovskii Nov 3, 2022
fdaed10
Merge branch 'main' into fix-14201
vzarytovskii Nov 3, 2022
867754f
Apply suggestions from code review
vzarytovskii Nov 3, 2022
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
4 changes: 2 additions & 2 deletions tests/projects/SelfContained_Trimming_Test/NuGet.Config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<packageSources>
<clear />
<add key="localPackages" value="../../../artifacts/packages/Release/Release"/>
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
<add key="remote" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
</packageSources>
<disabledPackageSources>
<clear />
Expand All @@ -18,7 +18,7 @@
<packageSource key="localPackages">
<package pattern="FSharp.Core" />
</packageSource>
<packageSource key="nuget.org">
<packageSource key="remote">
<package pattern="*" />
</packageSource>
</packageSourceMapping>
Expand Down
7 changes: 0 additions & 7 deletions tests/projects/SelfContained_Trimming_Test/SelfContained_Trimming_Test.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,6 @@

<Import Project="$(MSBuildThisFileDirectory)../../../eng/Versions.props" />

<PropertyGroup>
<RestoreSources>
$(MSBuildThisFileDirectory)/../../../artifacts/packages/Release/Release;
https://api.nuget.org/v3/index.json;
</RestoreSources>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="FSharp.Core" Version="$(FSCoreProductVersion).*"/>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion tests/projects/SelfContained_Trimming_Test/check.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ $file = Get-Item .\bin\Release\net7.0\win-x64\publish\FSharp.Core.dll
$file_len = $file.Length
if (-not ($file_len -eq $expected_len))
{
Write-Error "Test failed with unexpected FSharp.Core length:`nExpected:`n`t${expected_len} Bytes`nActual:`n`t${file_len} Bytes" -ErrorAction Stop
Write-Error "Test failed with unexpected FSharp.Core length:`nExpected:`n`t${expected_len} Bytes`nActual:`n`t${file_len} Bytes`nEither codegen or trimming logic have changed. Please investigate and update expected dll size or report an issue." -ErrorAction Stop
}