Skip to content

Use the right version of packages in integration tests. #987

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
tmat merged 2 commits into from
Apr 5, 2023
Merged

Use the right version of packages in integration tests. #987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e077aa8
Use the right version of packages in integration tests.
tmat Apr 4, 2023
2fba322
Update GitLab integration tests
tmat Apr 5, 2023
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
10 changes: 5 additions & 5 deletions src/SourceLink.Git.IntegrationTests/GitLabTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,14 @@ public void FullValidation_Https()
{
NuGetPackageFolders,
ProjectSourceRoot,
$"https://噸.com/test-org/{repoName}/raw/{commitSha}/*",
$"https://噸.com/test-org/{repoName}/-/raw/{commitSha}/*",
s_relativeSourceLinkJsonPath,
$"https://噸.com/test-org/{repoName}",
$"https://噸.com/test-org/{repoName}"
});

AssertEx.AreEqual(
$@"{{""documents"":{{""{ProjectSourceRoot.Replace(@"\", @"\\")}*"":""https://噸.com/test-org/{repoName}/raw/{commitSha}/*""}}}}",
$@"{{""documents"":{{""{ProjectSourceRoot.Replace(@"\", @"\\")}*"":""https://噸.com/test-org/{repoName}/-/raw/{commitSha}/*""}}}}",
File.ReadAllText(Path.Combine(ProjectDir.Path, s_relativeSourceLinkJsonPath)));

TestUtilities.ValidateAssemblyInformationalVersion(
Expand Down Expand Up @@ -109,14 +109,14 @@ public void FullValidation_Ssh()
{
NuGetPackageFolders,
ProjectSourceRoot,
$"https://噸.com/test-org/{repoName}/raw/{commitSha}/*",
$"https://噸.com/test-org/{repoName}/-/raw/{commitSha}/*",
s_relativeSourceLinkJsonPath,
$"https://噸.com/test-org/{repoName}",
$"https://噸.com/test-org/{repoName}"
});

AssertEx.AreEqual(
$@"{{""documents"":{{""{ProjectSourceRoot.Replace(@"\", @"\\")}*"":""https://噸.com/test-org/{repoName}/raw/{commitSha}/*""}}}}",
$@"{{""documents"":{{""{ProjectSourceRoot.Replace(@"\", @"\\")}*"":""https://噸.com/test-org/{repoName}/-/raw/{commitSha}/*""}}}}",
File.ReadAllText(Path.Combine(ProjectDir.Path, s_relativeSourceLinkJsonPath)));

TestUtilities.ValidateAssemblyInformationalVersion(
Expand Down Expand Up @@ -161,7 +161,7 @@ public void ImplicitHost()
},
expectedResults: new[]
{
$"http://噸.com/test-org/{repoName}/raw/{commitSha}/*",
$"http://噸.com/test-org/{repoName}/-/raw/{commitSha}/*",
$"http://噸.com/test-org/{repoName}",
$"http://噸.com/test-org/{repoName}"
});
Expand Down
5 changes: 4 additions & 1 deletion src/TestUtilities/DotNetSdk/DotNetSdkTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,10 +174,13 @@ public DotNetSdkTestBase(params string[] packages)
NuGetCacheDir = RootDir.CreateDirectory(".packages");
NuGetPackageFolders = EnsureTrailingDirectorySeparator(NuGetCacheDir.Path);

// {info-version} = {package-version}+{commit-sha}
var packageVersion = typeof(DotNetSdkTestBase).Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()!.InformationalVersion.Split('+')[0];

RootDir.CreateFile("Directory.Build.props").WriteAllText(
$@"<Project>
<ItemGroup>
{string.Join(Environment.NewLine, packages.Select(packageName => $"<PackageReference Include='{packageName}' Version='1.0.0-*' PrivateAssets='all' />"))}
{string.Join(Environment.NewLine, packages.Select(packageName => $"<PackageReference Include='{packageName}' Version='{packageVersion}' PrivateAssets='all' />"))}
</ItemGroup>
</Project>
");
Expand Down