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.

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

Test fix #533

Merged
merged 21 commits into from
Dec 4, 2024
Merged
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
025bda7
Update Microsoft.Build.Sql.csproj
zijchen Apr 19, 2024
66d9790
Merge branch 'main' of https://github.com/microsoft/DacFx into internal
zijchen Jun 6, 2024
96c061e
Update ScriptDom to 161.9123.0
zijchen Jul 29, 2024
f3e1dd3
Merge branch 'main' of https://github.com/microsoft/DacFx into internal
zijchen Aug 5, 2024
cb620a6
Merge branch 'main' of https://github.com/microsoft/DacFx into internal
zijchen Sep 17, 2024
8b17b67
Add target to remove included files via :r from build
zijchen Sep 24, 2024
d35a1a7
Merge branch 'main' of https://github.com/microsoft/DacFx into internal
zijchen Nov 12, 2024
cc4b6d7
Update System.IO.Packaging to 8.0.1
zijchen Nov 12, 2024
098996a
Merge branch 'main' of https://github.com/microsoft/DacFx into internal
zijchen Nov 13, 2024
039ec1a
Fix test VerifyCodeAnalyzerFromPackageReference
zijchen Nov 15, 2024
d49a631
Merge branch 'zijchen/ca-test-version' into internal
zijchen Nov 15, 2024
a716535
Merge branch 'main' of https://github.com/microsoft/DacFx into internal
zijchen Nov 19, 2024
cdb4445
Update DacFx to 162.5.57
zijchen Nov 21, 2024
ff1295e
Merge branch 'main' of https://github.com/microsoft/DacFx into zijche…
zijchen Nov 21, 2024
ffe8ead
Merge branch 'zijchen/162.5.57' of https://github.com/microsoft/DacFx…
zijchen Nov 21, 2024
9ab4532
Fix merge conflict
zijchen Nov 21, 2024
04167ac
Merge branch 'main' of https://github.com/microsoft/DacFx into zijche…
zijchen Nov 21, 2024
eece430
Clean up extra space
zijchen Nov 21, 2024
3b0d5ab
Merge branch 'main' of https://github.com/microsoft/DacFx into internal
zijchen Nov 22, 2024
1512710
Merge branch 'zijchen/issue103' of https://github.com/microsoft/DacFx…
zijchen Nov 22, 2024
b30e981
Merge branch 'main' of https://github.com/microsoft/DacFx into internal
zijchen Nov 22, 2024
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
8 changes: 4 additions & 4 deletions test/Microsoft.Build.Sql.Tests/CodeAnalysisTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -47,19 +47,19 @@ public void VerifyCodeAnalyzerFromPackageReference()
// Set up and create the analyzer package
string tempFolder = TestUtils.CreateTempDirectory();
TestUtils.CopyDirectoryRecursive(Path.Combine(CommonTestDataDirectory, "CodeAnalyzerSample"), tempFolder);
RunGenericDotnetCommand($"pack {Path.Combine(tempFolder, "CodeAnalyzerSample.csproj")} -o {tempFolder}", out _, out _);
RunGenericDotnetCommand($"pack {Path.Combine(tempFolder, "CodeAnalyzerSample.csproj")} -o {tempFolder} -p:Version=1.1.1-test", out _, out _);

// Copy analyzer package to local Nuget source
string analyzerPackagePath = Path.Combine(tempFolder, "CodeAnalyzerSample.1.0.0.nupkg");
string analyzerPackagePath = Path.Combine(tempFolder, "CodeAnalyzerSample.1.1.1-test.nupkg");
FileAssert.Exists(analyzerPackagePath);
File.Copy(analyzerPackagePath, Path.Combine(WorkingDirectory, "pkg", "CodeAnalyzerSample.1.0.0.nupkg"));
File.Copy(analyzerPackagePath, Path.Combine(WorkingDirectory, "pkg", "CodeAnalyzerSample.1.1.1-test.nupkg"));

// Add the analyzer package as a PackageReference to the test sqlproj
ProjectUtils.AddItemGroup(this.GetProjectFilePath(), "PackageReference",
new string[] { "CodeAnalyzerSample" },
item =>
{
item.AddMetadata("Version", "1.0.0");
item.AddMetadata("Version", "1.1.1-test");
});

// Set up code analysis properties
Expand Down
Loading