mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Addressing review comments

Browse source
This commit is contained in:
Nikola Milosavljevic 2023-02-27 18:53:02 +00:00
parent 582fe0f4ea
commit 9392ef3352
1 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs
View file

@ -28,15 +28,15 @@ public class SdkContentTests : SmokeTests
{ {
const string msftFileListingFileName = "msftSdkFiles.txt"; const string msftFileListingFileName = "msftSdkFiles.txt";
const string sbFileListingFileName = "sbSdkFiles.txt"; const string sbFileListingFileName = "sbSdkFiles.txt";
WriteTarballFileList(Config.MsftSdkTarballPath, msftFileListingFileName, isPortable: true); WriteTarballFileList(Config.MsftSdkTarballPath, msftFileListingFileName, isPortable: true, "msft");
WriteTarballFileList(Config.SdkTarballPath, sbFileListingFileName, isPortable: false); WriteTarballFileList(Config.SdkTarballPath, sbFileListingFileName, isPortable: false, "sb");
string diff = BaselineHelper.DiffFiles(msftFileListingFileName, sbFileListingFileName, OutputHelper); string diff = BaselineHelper.DiffFiles(msftFileListingFileName, sbFileListingFileName, OutputHelper);
diff = RemoveDiffMarkers(diff); diff = RemoveDiffMarkers(diff);
BaselineHelper.CompareContents("MsftToSbSdk.diff", diff, OutputHelper, Config.WarnOnSdkContentDiffs); BaselineHelper.CompareContents("MsftToSbSdk.diff", diff, OutputHelper, Config.WarnOnSdkContentDiffs);
} }
private void WriteTarballFileList(string? tarballPath, string outputFileName, bool isPortable) private void WriteTarballFileList(string? tarballPath, string outputFileName, bool isPortable, string sdkType)
{ {
if (!File.Exists(tarballPath)) if (!File.Exists(tarballPath))
{ {
@ -47,26 +47,23 @@ public class SdkContentTests : SmokeTests
fileListing = BaselineHelper.RemoveRids(fileListing, isPortable); fileListing = BaselineHelper.RemoveRids(fileListing, isPortable);
fileListing = BaselineHelper.RemoveVersions(fileListing); fileListing = BaselineHelper.RemoveVersions(fileListing);
IEnumerable<string> files = fileListing.Split(Environment.NewLine).OrderBy(path => path); IEnumerable<string> files = fileListing.Split(Environment.NewLine).OrderBy(path => path);
files = FilteredFileList( files = RemoveExclusions(
files, files,
GetExclusionFilters( GetExclusionFilters(
Path.Combine(BaselineHelper.GetAssetsDirectory(), "SdkDiffExclusions.txt"), Path.Combine(BaselineHelper.GetAssetsDirectory(), "SdkDiffExclusions.txt"),
tarballPath == Config.MsftSdkTarballPath ? "msft" : "sb")); sdkType));
File.WriteAllLines(outputFileName, files); File.WriteAllLines(outputFileName, files);
} }
private static IEnumerable<string> FilteredFileList(IEnumerable<string> files, IEnumerable<string> exclusions) private static IEnumerable<string> RemoveExclusions(IEnumerable<string> files, IEnumerable<string> exclusions) =>
{ files.Where(item => !exclusions.Any(p => FileSystemName.MatchesSimpleExpression(p, item)));
return files
.Where(item => !exclusions.Any(p => FileSystemName.MatchesSimpleExpression(p, item)));
}
private static IEnumerable<string> GetExclusionFilters(string exceptionFilePath, string sdkType) private static IEnumerable<string> GetExclusionFilters(string exceptionFilePath, string sdkType)
{ {
var text = File.ReadAllText(exceptionFilePath); string[] lines = File.ReadAllLines(exceptionFilePath);
int prefixSkip = sdkType.Length + 1; int prefixSkip = sdkType.Length + 1;
return text.Split(new char[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries) return lines
.Where(line => line.StartsWith(sdkType + ",")) // process only specific sdk exclusions .Where(line => line.StartsWith(sdkType + ",")) // process only specific sdk exclusions
.Select(line => .Select(line =>
{ {