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.

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

Jump to bottom

Rename test nupkg assets #7959

Merged
merged 2 commits into from
Sep 25, 2021
Merged

Rename test nupkg assets #7959

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
76fc2a7
Rename test nupkg assets
garath Sep 24, 2021
0483e55
Add overlooked assets
garath Sep 24, 2021
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
72 changes: 36 additions & 36 deletions src/Microsoft.DotNet.NuGetRepack/tests/Microsoft.DotNet.NuGetRepack.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,59 +17,59 @@
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCoreVersion)" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\A.1.0.0-beta-12345-01.nupkg">
<LogicalName>A.1.0.0-beta-12345-01.nupkg</LogicalName>
<EmbeddedResource Include="Resources\TestPackageA.1.0.0-beta-12345-01.nupkg">
<LogicalName>TestPackageA.1.0.0-beta-12345-01.nupkg</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="Resources\B.1.0.0-beta-12345-01.nupkg">
<LogicalName>B.1.0.0-beta-12345-01.nupkg</LogicalName>
<EmbeddedResource Include="Resources\TestPackageB.1.0.0-beta-12345-01.nupkg">
<LogicalName>TestPackageB.1.0.0-beta-12345-01.nupkg</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="Resources\C.1.0.0-beta-12345-01.nupkg">
<LogicalName>C.1.0.0-beta-12345-01.nupkg</LogicalName>
<EmbeddedResource Include="Resources\TestPackageC.1.0.0-beta-12345-01.nupkg">
<LogicalName>TestPackageC.1.0.0-beta-12345-01.nupkg</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="Resources\D.1.0.0-beta-12345-01.nupkg">
<LogicalName>D.1.0.0-beta-12345-01.nupkg</LogicalName>
<EmbeddedResource Include="Resources\TestPackageD.1.0.0-beta-12345-01.nupkg">
<LogicalName>TestPackageD.1.0.0-beta-12345-01.nupkg</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="Resources\E.1.0.0-beta.12345.1.nupkg">
<LogicalName>E.1.0.0-beta.12345.1.nupkg</LogicalName>
<EmbeddedResource Include="Resources\TestPackageE.1.0.0-beta.12345.1.nupkg">
<LogicalName>TestPackageE.1.0.0-beta.12345.1.nupkg</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="Resources\F.1.0.0-beta.12345.1.nupkg">
<LogicalName>F.1.0.0-beta.12345.1.nupkg</LogicalName>
<EmbeddedResource Include="Resources\TestPackageF.1.0.0-beta.12345.1.nupkg">
<LogicalName>TestPackageF.1.0.0-beta.12345.1.nupkg</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="Resources\A.1.0.0-beta-final.nupkg">
<LogicalName>A.1.0.0-beta-final.nupkg</LogicalName>
<EmbeddedResource Include="Resources\TestPackageA.1.0.0-beta-final.nupkg">
<LogicalName>TestPackageA.1.0.0-beta-final.nupkg</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="Resources\B.1.0.0-beta-final.nupkg">
<LogicalName>B.1.0.0-beta-final.nupkg</LogicalName>
<EmbeddedResource Include="Resources\TestPackageB.1.0.0-beta-final.nupkg">
<LogicalName>TestPackageB.1.0.0-beta-final.nupkg</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="Resources\C.1.0.0-beta-final.nupkg">
<LogicalName>C.1.0.0-beta-final.nupkg</LogicalName>
<EmbeddedResource Include="Resources\TestPackageC.1.0.0-beta-final.nupkg">
<LogicalName>TestPackageC.1.0.0-beta-final.nupkg</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="Resources\D.1.0.0-beta-final.nupkg">
<LogicalName>D.1.0.0-beta-final.nupkg</LogicalName>
<EmbeddedResource Include="Resources\TestPackageD.1.0.0-beta-final.nupkg">
<LogicalName>TestPackageD.1.0.0-beta-final.nupkg</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="Resources\E.1.0.0-beta.final.nupkg">
<LogicalName>E.1.0.0-beta.final.nupkg</LogicalName>
<EmbeddedResource Include="Resources\TestPackageE.1.0.0-beta.final.nupkg">
<LogicalName>TestPackageE.1.0.0-beta.final.nupkg</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="Resources\F.1.0.0-beta.final.nupkg">
<LogicalName>F.1.0.0-beta.final.nupkg</LogicalName>
<EmbeddedResource Include="Resources\TestPackageF.1.0.0-beta.final.nupkg">
<LogicalName>TestPackageF.1.0.0-beta.final.nupkg</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="Resources\A.1.0.0.nupkg">
<LogicalName>A.1.0.0.nupkg</LogicalName>
<EmbeddedResource Include="Resources\TestPackageA.1.0.0.nupkg">
<LogicalName>TestPackageA.1.0.0.nupkg</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="Resources\B.1.0.0.nupkg">
<LogicalName>B.1.0.0.nupkg</LogicalName>
<EmbeddedResource Include="Resources\TestPackageB.1.0.0.nupkg">
<LogicalName>TestPackageB.1.0.0.nupkg</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="Resources\C.1.0.0.nupkg">
<LogicalName>C.1.0.0.nupkg</LogicalName>
<EmbeddedResource Include="Resources\TestPackageC.1.0.0.nupkg">
<LogicalName>TestPackageC.1.0.0.nupkg</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="Resources\D.1.0.0.nupkg">
<LogicalName>D.1.0.0.nupkg</LogicalName>
<EmbeddedResource Include="Resources\TestPackageD.1.0.0.nupkg">
<LogicalName>TestPackageD.1.0.0.nupkg</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="Resources\E.1.0.0.nupkg">
<LogicalName>E.1.0.0.nupkg</LogicalName>
<EmbeddedResource Include="Resources\TestPackageE.1.0.0.nupkg">
<LogicalName>TestPackageE.1.0.0.nupkg</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="Resources\F.1.0.0.nupkg">
<LogicalName>F.1.0.0.nupkg</LogicalName>
<EmbeddedResource Include="Resources\TestPackageF.1.0.0.nupkg">
<LogicalName>TestPackageF.1.0.0.nupkg</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="Resources\Signed.1.2.3.nupkg">
<LogicalName>Signed.1.2.3.nupkg</LogicalName>
Expand Down
Binary file removed src/Microsoft.DotNet.NuGetRepack/tests/Resources/A.1.0.0-beta-12345-01.nupkg
View file
Open in desktop
Binary file not shown.
Binary file removed src/Microsoft.DotNet.NuGetRepack/tests/Resources/A.1.0.0-beta-final.nupkg
View file
Open in desktop
Binary file not shown.
Binary file removed src/Microsoft.DotNet.NuGetRepack/tests/Resources/A.1.0.0.nupkg
View file
Open in desktop
Binary file not shown.
Binary file removed src/Microsoft.DotNet.NuGetRepack/tests/Resources/B.1.0.0-beta-12345-01.nupkg
View file
Open in desktop
Binary file not shown.
Binary file removed src/Microsoft.DotNet.NuGetRepack/tests/Resources/B.1.0.0-beta-final.nupkg
View file
Open in desktop
Binary file not shown.
Binary file removed src/Microsoft.DotNet.NuGetRepack/tests/Resources/B.1.0.0.nupkg
View file
Open in desktop
Binary file not shown.
Binary file removed src/Microsoft.DotNet.NuGetRepack/tests/Resources/C.1.0.0-beta-12345-01.nupkg
View file
Open in desktop
Binary file not shown.
Binary file removed src/Microsoft.DotNet.NuGetRepack/tests/Resources/C.1.0.0-beta-final.nupkg
View file
Open in desktop
Binary file not shown.
Binary file removed src/Microsoft.DotNet.NuGetRepack/tests/Resources/C.1.0.0.nupkg
View file
Open in desktop
Binary file not shown.
Binary file removed src/Microsoft.DotNet.NuGetRepack/tests/Resources/D.1.0.0-beta-12345-01.nupkg
View file
Open in desktop
Binary file not shown.
Binary file removed src/Microsoft.DotNet.NuGetRepack/tests/Resources/D.1.0.0-beta-final.nupkg
View file
Open in desktop
Binary file not shown.
Binary file removed src/Microsoft.DotNet.NuGetRepack/tests/Resources/D.1.0.0.nupkg
View file
Open in desktop
Binary file not shown.
Binary file removed src/Microsoft.DotNet.NuGetRepack/tests/Resources/E.1.0.0-beta.12345.1.nupkg
View file
Open in desktop
Binary file not shown.
Binary file removed src/Microsoft.DotNet.NuGetRepack/tests/Resources/E.1.0.0-beta.final.nupkg
View file
Open in desktop
Binary file not shown.
Binary file removed src/Microsoft.DotNet.NuGetRepack/tests/Resources/E.1.0.0.nupkg
View file
Open in desktop
Binary file not shown.
Binary file removed src/Microsoft.DotNet.NuGetRepack/tests/Resources/F.1.0.0-beta.12345.1.nupkg
View file
Open in desktop
Binary file not shown.
Binary file removed src/Microsoft.DotNet.NuGetRepack/tests/Resources/F.1.0.0-beta.final.nupkg
View file
Open in desktop
Binary file not shown.
Binary file removed src/Microsoft.DotNet.NuGetRepack/tests/Resources/F.1.0.0.nupkg
View file
Open in desktop
Binary file not shown.
0 ...tNet.NuGetRepack/tests/Resources/A.nuspec → ...epack/tests/Resources/TestPackageA.nuspec
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...tNet.NuGetRepack/tests/Resources/B.nuspec → ...epack/tests/Resources/TestPackageB.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>B</id>
<id>TestPackageB</id>
<version>1.0.0-beta-12345-01</version>
<authors>Microsoft</authors>
<description>B</description>
Expand Down
4 changes: 2 additions & 2 deletions ...tNet.NuGetRepack/tests/Resources/C.nuspec → ...epack/tests/Resources/TestPackageC.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>C</id>
<id>TestPackageC</id>
<version>1.0.0-beta-12345-01</version>
<authors>Microsoft</authors>
<description>C</description>
<dependencies>
<dependency id="B" version="[1.0.0-beta-12345-01]" />
<dependency id="TestPackageB" version="[1.0.0-beta-12345-01]" />
</dependencies>
</metadata>
<files/>
Expand Down
2 changes: 1 addition & 1 deletion ...tNet.NuGetRepack/tests/Resources/D.nuspec → ...epack/tests/Resources/TestPackageD.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
<metadata>
<id>D</id>
<id>TestPackageD</id>
<version>1.0.0-beta-12345-01</version>
<authors>Microsoft</authors>
<owners>Microsoft</owners>
Expand Down
4 changes: 2 additions & 2 deletions ...tNet.NuGetRepack/tests/Resources/E.nuspec → ...epack/tests/Resources/TestPackageE.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
<metadata>
<id>E</id>
<id>TestPackageE</id>
<version>1.0.0-beta.12345.1+abcdef</version>
<authors>Microsoft</authors>
<owners>Microsoft</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>E</description>
<dependencies>
<dependency id="F" version="1.0.0-beta.12345.1" />
<dependency id="TestPackageF" version="1.0.0-beta.12345.1" />
</dependencies>
</metadata>
<files/>
Expand Down
2 changes: 1 addition & 1 deletion ...tNet.NuGetRepack/tests/Resources/F.nuspec → ...epack/tests/Resources/TestPackageF.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
<metadata>
<id>F</id>
<id>TestPackageF</id>
<version>1.0.0-beta.12345.1+abcdef</version>
<authors>Microsoft</authors>
<owners>Microsoft</owners>
Expand Down
72 changes: 36 additions & 36 deletions src/Microsoft.DotNet.NuGetRepack/tests/TestHelpers/TestResources.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,28 +8,28 @@ public static class ReleasePackages
public const string Version = "1.0.0";

private static byte[] s_A;
public static byte[] A => ResourceLoader.GetOrCreateResource(ref s_A, NameA);
public const string NameA = nameof(A) + "." + Version + ".nupkg";
public static byte[] TestPackageA => ResourceLoader.GetOrCreateResource(ref s_A, NameA);
public const string NameA = nameof(TestPackageA) + "." + Version + ".nupkg";

private static byte[] s_B;
public static byte[] B => ResourceLoader.GetOrCreateResource(ref s_B, NameB);
public const string NameB = nameof(B) + "." + Version + ".nupkg";
public static byte[] TestPackageB => ResourceLoader.GetOrCreateResource(ref s_B, NameB);
public const string NameB = nameof(TestPackageB) + "." + Version + ".nupkg";

private static byte[] s_C;
public static byte[] C => ResourceLoader.GetOrCreateResource(ref s_C, NameC);
public const string NameC = nameof(C) + "." + Version + ".nupkg";
public static byte[] TestPackageC => ResourceLoader.GetOrCreateResource(ref s_C, NameC);
public const string NameC = nameof(TestPackageC) + "." + Version + ".nupkg";

private static byte[] s_D;
public static byte[] D => ResourceLoader.GetOrCreateResource(ref s_D, NameD);
public const string NameD = nameof(D) + "." + Version + ".nupkg";
public static byte[] TestPackageD => ResourceLoader.GetOrCreateResource(ref s_D, NameD);
public const string NameD = nameof(TestPackageD) + "." + Version + ".nupkg";

private static byte[] s_E;
public static byte[] E => ResourceLoader.GetOrCreateResource(ref s_E, NameE);
public const string NameE = nameof(E) + "." + Version + ".nupkg";
public static byte[] TestPackageE => ResourceLoader.GetOrCreateResource(ref s_E, NameE);
public const string NameE = nameof(TestPackageE) + "." + Version + ".nupkg";

private static byte[] s_F;
public static byte[] F => ResourceLoader.GetOrCreateResource(ref s_F, NameF);
public const string NameF = nameof(F) + "." + Version + ".nupkg";
public static byte[] TestPackageF => ResourceLoader.GetOrCreateResource(ref s_F, NameF);
public const string NameF = nameof(TestPackageF) + "." + Version + ".nupkg";
}

public static class PreReleasePackages
Expand All @@ -38,28 +38,28 @@ public static class PreReleasePackages
public const string SemVer2 = "1.0.0-beta.final";

private static byte[] s_A;
public static byte[] A => ResourceLoader.GetOrCreateResource(ref s_A, NameA);
public const string NameA = nameof(A) + "." + SemVer1 + ".nupkg";
public static byte[] TestPackageA => ResourceLoader.GetOrCreateResource(ref s_A, NameA);
public const string NameA = nameof(TestPackageA) + "." + SemVer1 + ".nupkg";

private static byte[] s_B;
public static byte[] B => ResourceLoader.GetOrCreateResource(ref s_B, NameB);
public const string NameB = nameof(B) + "." + SemVer1 + ".nupkg";
public static byte[] TestPackageB => ResourceLoader.GetOrCreateResource(ref s_B, NameB);
public const string NameB = nameof(TestPackageB) + "." + SemVer1 + ".nupkg";

private static byte[] s_C;
public static byte[] C => ResourceLoader.GetOrCreateResource(ref s_C, NameC);
public const string NameC = nameof(C) + "." + SemVer1 + ".nupkg";
public static byte[] TestPackageC => ResourceLoader.GetOrCreateResource(ref s_C, NameC);
public const string NameC = nameof(TestPackageC) + "." + SemVer1 + ".nupkg";

private static byte[] s_D;
public static byte[] D => ResourceLoader.GetOrCreateResource(ref s_D, NameD);
public const string NameD = nameof(D) + "." + SemVer1 + ".nupkg";
public static byte[] TestPackageD => ResourceLoader.GetOrCreateResource(ref s_D, NameD);
public const string NameD = nameof(TestPackageD) + "." + SemVer1 + ".nupkg";

private static byte[] s_E;
public static byte[] E => ResourceLoader.GetOrCreateResource(ref s_E, NameE);
public const string NameE = nameof(E) + "." + SemVer2 + ".nupkg";
public static byte[] TestPackageE => ResourceLoader.GetOrCreateResource(ref s_E, NameE);
public const string NameE = nameof(TestPackageE) + "." + SemVer2 + ".nupkg";

private static byte[] s_F;
public static byte[] F => ResourceLoader.GetOrCreateResource(ref s_F, NameF);
public const string NameF = nameof(F) + "." + SemVer2 + ".nupkg";
public static byte[] TestPackageF => ResourceLoader.GetOrCreateResource(ref s_F, NameF);
public const string NameF = nameof(TestPackageF) + "." + SemVer2 + ".nupkg";
}

public static class DailyBuildPackages
Expand All @@ -68,28 +68,28 @@ public static class DailyBuildPackages
public const string SemVer2 = "1.0.0-beta.12345.1";

private static byte[] s_A;
public static byte[] A => ResourceLoader.GetOrCreateResource(ref s_A, NameA);
public const string NameA = nameof(A) + "." + SemVer1 + ".nupkg";
public static byte[] TestPackageA => ResourceLoader.GetOrCreateResource(ref s_A, NameA);
public const string NameA = nameof(TestPackageA) + "." + SemVer1 + ".nupkg";

private static byte[] s_B;
public static byte[] B => ResourceLoader.GetOrCreateResource(ref s_B, NameB);
public const string NameB = nameof(B) + "." + SemVer1 + ".nupkg";
public static byte[] TestPackageB => ResourceLoader.GetOrCreateResource(ref s_B, NameB);
public const string NameB = nameof(TestPackageB) + "." + SemVer1 + ".nupkg";

private static byte[] s_C;
public static byte[] C => ResourceLoader.GetOrCreateResource(ref s_C, NameC);
public const string NameC = nameof(C) + "." + SemVer1 + ".nupkg";
public static byte[] TestPackageC => ResourceLoader.GetOrCreateResource(ref s_C, NameC);
public const string NameC = nameof(TestPackageC) + "." + SemVer1 + ".nupkg";

private static byte[] s_D;
public static byte[] D => ResourceLoader.GetOrCreateResource(ref s_D, NameD);
public const string NameD = nameof(D) + "." + SemVer1 + ".nupkg";
public static byte[] TestPackageD => ResourceLoader.GetOrCreateResource(ref s_D, NameD);
public const string NameD = nameof(TestPackageD) + "." + SemVer1 + ".nupkg";

private static byte[] s_E;
public static byte[] E => ResourceLoader.GetOrCreateResource(ref s_E, NameE);
public const string NameE = nameof(E) + "." + SemVer2 + ".nupkg";
public static byte[] TestPackageE => ResourceLoader.GetOrCreateResource(ref s_E, NameE);
public const string NameE = nameof(TestPackageE) + "." + SemVer2 + ".nupkg";

private static byte[] s_F;
public static byte[] F => ResourceLoader.GetOrCreateResource(ref s_F, NameF);
public const string NameF = nameof(F) + "." + SemVer2 + ".nupkg";
public static byte[] TestPackageF => ResourceLoader.GetOrCreateResource(ref s_F, NameF);
public const string NameF = nameof(TestPackageF) + "." + SemVer2 + ".nupkg";
}

public static class MiscPackages
Expand Down
Loading