diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Microsoft.DotNet.NuGetRepack.Tests.csproj b/src/Microsoft.DotNet.NuGetRepack/tests/Microsoft.DotNet.NuGetRepack.Tests.csproj index 8cf795a5854..ad1d93e7128 100644 --- a/src/Microsoft.DotNet.NuGetRepack/tests/Microsoft.DotNet.NuGetRepack.Tests.csproj +++ b/src/Microsoft.DotNet.NuGetRepack/tests/Microsoft.DotNet.NuGetRepack.Tests.csproj @@ -17,59 +17,59 @@ - - A.1.0.0-beta-12345-01.nupkg + + TestPackageA.1.0.0-beta-12345-01.nupkg - - B.1.0.0-beta-12345-01.nupkg + + TestPackageB.1.0.0-beta-12345-01.nupkg - - C.1.0.0-beta-12345-01.nupkg + + TestPackageC.1.0.0-beta-12345-01.nupkg - - D.1.0.0-beta-12345-01.nupkg + + TestPackageD.1.0.0-beta-12345-01.nupkg - - E.1.0.0-beta.12345.1.nupkg + + TestPackageE.1.0.0-beta.12345.1.nupkg - - F.1.0.0-beta.12345.1.nupkg + + TestPackageF.1.0.0-beta.12345.1.nupkg - - A.1.0.0-beta-final.nupkg + + TestPackageA.1.0.0-beta-final.nupkg - - B.1.0.0-beta-final.nupkg + + TestPackageB.1.0.0-beta-final.nupkg - - C.1.0.0-beta-final.nupkg + + TestPackageC.1.0.0-beta-final.nupkg - - D.1.0.0-beta-final.nupkg + + TestPackageD.1.0.0-beta-final.nupkg - - E.1.0.0-beta.final.nupkg + + TestPackageE.1.0.0-beta.final.nupkg - - F.1.0.0-beta.final.nupkg + + TestPackageF.1.0.0-beta.final.nupkg - - A.1.0.0.nupkg + + TestPackageA.1.0.0.nupkg - - B.1.0.0.nupkg + + TestPackageB.1.0.0.nupkg - - C.1.0.0.nupkg + + TestPackageC.1.0.0.nupkg - - D.1.0.0.nupkg + + TestPackageD.1.0.0.nupkg - - E.1.0.0.nupkg + + TestPackageE.1.0.0.nupkg - - F.1.0.0.nupkg + + TestPackageF.1.0.0.nupkg Signed.1.2.3.nupkg diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/A.1.0.0-beta-12345-01.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/A.1.0.0-beta-12345-01.nupkg deleted file mode 100644 index a2e3ef151bf..00000000000 Binary files a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/A.1.0.0-beta-12345-01.nupkg and /dev/null differ diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/A.1.0.0-beta-final.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/A.1.0.0-beta-final.nupkg deleted file mode 100644 index a3c92f002a2..00000000000 Binary files a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/A.1.0.0-beta-final.nupkg and /dev/null differ diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/A.1.0.0.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/A.1.0.0.nupkg deleted file mode 100644 index 63d2d6be922..00000000000 Binary files a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/A.1.0.0.nupkg and /dev/null differ diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/B.1.0.0-beta-12345-01.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/B.1.0.0-beta-12345-01.nupkg deleted file mode 100644 index e21edfc8917..00000000000 Binary files a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/B.1.0.0-beta-12345-01.nupkg and /dev/null differ diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/B.1.0.0-beta-final.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/B.1.0.0-beta-final.nupkg deleted file mode 100644 index 637db00b52c..00000000000 Binary files a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/B.1.0.0-beta-final.nupkg and /dev/null differ diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/B.1.0.0.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/B.1.0.0.nupkg deleted file mode 100644 index cbfb9f546b2..00000000000 Binary files a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/B.1.0.0.nupkg and /dev/null differ diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/C.1.0.0-beta-12345-01.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/C.1.0.0-beta-12345-01.nupkg deleted file mode 100644 index 120efff7730..00000000000 Binary files a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/C.1.0.0-beta-12345-01.nupkg and /dev/null differ diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/C.1.0.0-beta-final.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/C.1.0.0-beta-final.nupkg deleted file mode 100644 index e5a0ea88689..00000000000 Binary files a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/C.1.0.0-beta-final.nupkg and /dev/null differ diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/C.1.0.0.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/C.1.0.0.nupkg deleted file mode 100644 index deb0a83f316..00000000000 Binary files a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/C.1.0.0.nupkg and /dev/null differ diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/D.1.0.0-beta-final.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/D.1.0.0-beta-final.nupkg deleted file mode 100644 index a6abf5ad54f..00000000000 Binary files a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/D.1.0.0-beta-final.nupkg and /dev/null differ diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/D.1.0.0.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/D.1.0.0.nupkg deleted file mode 100644 index 2bf6d1b97ae..00000000000 Binary files a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/D.1.0.0.nupkg and /dev/null differ diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/E.1.0.0-beta.12345.1.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/E.1.0.0-beta.12345.1.nupkg deleted file mode 100644 index 496961df29f..00000000000 Binary files a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/E.1.0.0-beta.12345.1.nupkg and /dev/null differ diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/E.1.0.0-beta.final.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/E.1.0.0-beta.final.nupkg deleted file mode 100644 index 236d751762e..00000000000 Binary files a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/E.1.0.0-beta.final.nupkg and /dev/null differ diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/E.1.0.0.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/E.1.0.0.nupkg deleted file mode 100644 index 89c8ebc0d36..00000000000 Binary files a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/E.1.0.0.nupkg and /dev/null differ diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/F.1.0.0-beta.12345.1.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/F.1.0.0-beta.12345.1.nupkg deleted file mode 100644 index 61beec88f0d..00000000000 Binary files a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/F.1.0.0-beta.12345.1.nupkg and /dev/null differ diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/F.1.0.0-beta.final.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/F.1.0.0-beta.final.nupkg deleted file mode 100644 index 61d6966a103..00000000000 Binary files a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/F.1.0.0-beta.final.nupkg and /dev/null differ diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/F.1.0.0.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/F.1.0.0.nupkg deleted file mode 100644 index 067a6628796..00000000000 Binary files a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/F.1.0.0.nupkg and /dev/null differ diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageA.1.0.0-beta-12345-01.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageA.1.0.0-beta-12345-01.nupkg new file mode 100644 index 00000000000..b29de22c148 Binary files /dev/null and b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageA.1.0.0-beta-12345-01.nupkg differ diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageA.1.0.0-beta-final.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageA.1.0.0-beta-final.nupkg new file mode 100644 index 00000000000..264246e25d8 Binary files /dev/null and b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageA.1.0.0-beta-final.nupkg differ diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageA.1.0.0.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageA.1.0.0.nupkg new file mode 100644 index 00000000000..8a18159ef66 Binary files /dev/null and b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageA.1.0.0.nupkg differ diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/A.nuspec b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageA.nuspec similarity index 100% rename from src/Microsoft.DotNet.NuGetRepack/tests/Resources/A.nuspec rename to src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageA.nuspec diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageB.1.0.0-beta-12345-01.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageB.1.0.0-beta-12345-01.nupkg new file mode 100644 index 00000000000..be1d2e6ca87 Binary files /dev/null and b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageB.1.0.0-beta-12345-01.nupkg differ diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageB.1.0.0-beta-final.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageB.1.0.0-beta-final.nupkg new file mode 100644 index 00000000000..92b4838a3dc Binary files /dev/null and b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageB.1.0.0-beta-final.nupkg differ diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageB.1.0.0.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageB.1.0.0.nupkg new file mode 100644 index 00000000000..986b8475ad3 Binary files /dev/null and b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageB.1.0.0.nupkg differ diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/B.nuspec b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageB.nuspec similarity index 97% rename from src/Microsoft.DotNet.NuGetRepack/tests/Resources/B.nuspec rename to src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageB.nuspec index 4a4623ef80f..c539d9a04b6 100644 --- a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/B.nuspec +++ b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageB.nuspec @@ -1,7 +1,7 @@ - B + TestPackageB 1.0.0-beta-12345-01 Microsoft B diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageC.1.0.0-beta-12345-01.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageC.1.0.0-beta-12345-01.nupkg new file mode 100644 index 00000000000..542115db341 Binary files /dev/null and b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageC.1.0.0-beta-12345-01.nupkg differ diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageC.1.0.0-beta-final.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageC.1.0.0-beta-final.nupkg new file mode 100644 index 00000000000..4eeb80d214b Binary files /dev/null and b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageC.1.0.0-beta-final.nupkg differ diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageC.1.0.0.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageC.1.0.0.nupkg new file mode 100644 index 00000000000..70f339197a2 Binary files /dev/null and b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageC.1.0.0.nupkg differ diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/C.nuspec b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageC.nuspec similarity index 75% rename from src/Microsoft.DotNet.NuGetRepack/tests/Resources/C.nuspec rename to src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageC.nuspec index f0af0e95a34..f103ca36638 100644 --- a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/C.nuspec +++ b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageC.nuspec @@ -1,12 +1,12 @@ - C + TestPackageC 1.0.0-beta-12345-01 Microsoft C - + diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/D.1.0.0-beta-12345-01.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageD.1.0.0-beta-12345-01.nupkg similarity index 52% rename from src/Microsoft.DotNet.NuGetRepack/tests/Resources/D.1.0.0-beta-12345-01.nupkg rename to src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageD.1.0.0-beta-12345-01.nupkg index 733f0104b88..d9da05951bb 100644 Binary files a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/D.1.0.0-beta-12345-01.nupkg and b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageD.1.0.0-beta-12345-01.nupkg differ diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageD.1.0.0-beta-final.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageD.1.0.0-beta-final.nupkg new file mode 100644 index 00000000000..1ab385c9760 Binary files /dev/null and b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageD.1.0.0-beta-final.nupkg differ diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageD.1.0.0.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageD.1.0.0.nupkg new file mode 100644 index 00000000000..3d1cc80b76e Binary files /dev/null and b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageD.1.0.0.nupkg differ diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/D.nuspec b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageD.nuspec similarity index 94% rename from src/Microsoft.DotNet.NuGetRepack/tests/Resources/D.nuspec rename to src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageD.nuspec index 74e7d79486e..d2ae177685e 100644 --- a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/D.nuspec +++ b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageD.nuspec @@ -1,7 +1,7 @@ - D + TestPackageD 1.0.0-beta-12345-01 Microsoft Microsoft diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageE.1.0.0-beta.12345.1.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageE.1.0.0-beta.12345.1.nupkg new file mode 100644 index 00000000000..bb87ec205e1 Binary files /dev/null and b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageE.1.0.0-beta.12345.1.nupkg differ diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageE.1.0.0-beta.final.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageE.1.0.0-beta.final.nupkg new file mode 100644 index 00000000000..a9e1659ebab Binary files /dev/null and b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageE.1.0.0-beta.final.nupkg differ diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageE.1.0.0.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageE.1.0.0.nupkg new file mode 100644 index 00000000000..d22ced5cf64 Binary files /dev/null and b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageE.1.0.0.nupkg differ diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/E.nuspec b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageE.nuspec similarity index 81% rename from src/Microsoft.DotNet.NuGetRepack/tests/Resources/E.nuspec rename to src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageE.nuspec index a5de09b9f5f..5c4c9eebd18 100644 --- a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/E.nuspec +++ b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageE.nuspec @@ -1,14 +1,14 @@ - E + TestPackageE 1.0.0-beta.12345.1+abcdef Microsoft Microsoft false E - + diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageF.1.0.0-beta.12345.1.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageF.1.0.0-beta.12345.1.nupkg new file mode 100644 index 00000000000..9c0ae331719 Binary files /dev/null and b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageF.1.0.0-beta.12345.1.nupkg differ diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageF.1.0.0-beta.final.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageF.1.0.0-beta.final.nupkg new file mode 100644 index 00000000000..cad51365635 Binary files /dev/null and b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageF.1.0.0-beta.final.nupkg differ diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageF.1.0.0.nupkg b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageF.1.0.0.nupkg new file mode 100644 index 00000000000..4694a53d0b8 Binary files /dev/null and b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageF.1.0.0.nupkg differ diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/F.nuspec b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageF.nuspec similarity index 94% rename from src/Microsoft.DotNet.NuGetRepack/tests/Resources/F.nuspec rename to src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageF.nuspec index 3c7f4db748e..a624831c797 100644 --- a/src/Microsoft.DotNet.NuGetRepack/tests/Resources/F.nuspec +++ b/src/Microsoft.DotNet.NuGetRepack/tests/Resources/TestPackageF.nuspec @@ -1,7 +1,7 @@ - F + TestPackageF 1.0.0-beta.12345.1+abcdef Microsoft Microsoft diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/TestHelpers/TestResources.cs b/src/Microsoft.DotNet.NuGetRepack/tests/TestHelpers/TestResources.cs index bcc990b8220..82ef8e8fe9d 100644 --- a/src/Microsoft.DotNet.NuGetRepack/tests/TestHelpers/TestResources.cs +++ b/src/Microsoft.DotNet.NuGetRepack/tests/TestHelpers/TestResources.cs @@ -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 @@ -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 @@ -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 diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/VersionUpdaterTests.cs b/src/Microsoft.DotNet.NuGetRepack/tests/VersionUpdaterTests.cs index 3a2a3667e77..900c55775a1 100644 --- a/src/Microsoft.DotNet.NuGetRepack/tests/VersionUpdaterTests.cs +++ b/src/Microsoft.DotNet.NuGetRepack/tests/VersionUpdaterTests.cs @@ -60,10 +60,10 @@ public void TestPackagesSemVer1() Directory.CreateDirectory(dir); string a_daily, b_daily, c_daily, d_daily; - File.WriteAllBytes(a_daily = Path.Combine(dir, TestResources.DailyBuildPackages.NameA), TestResources.DailyBuildPackages.A); - File.WriteAllBytes(b_daily = Path.Combine(dir, TestResources.DailyBuildPackages.NameB), TestResources.DailyBuildPackages.B); - File.WriteAllBytes(c_daily = Path.Combine(dir, TestResources.DailyBuildPackages.NameC), TestResources.DailyBuildPackages.C); - File.WriteAllBytes(d_daily = Path.Combine(dir, TestResources.DailyBuildPackages.NameD), TestResources.DailyBuildPackages.D); + File.WriteAllBytes(a_daily = Path.Combine(dir, TestResources.DailyBuildPackages.NameA), TestResources.DailyBuildPackages.TestPackageA); + File.WriteAllBytes(b_daily = Path.Combine(dir, TestResources.DailyBuildPackages.NameB), TestResources.DailyBuildPackages.TestPackageB); + File.WriteAllBytes(c_daily = Path.Combine(dir, TestResources.DailyBuildPackages.NameC), TestResources.DailyBuildPackages.TestPackageC); + File.WriteAllBytes(d_daily = Path.Combine(dir, TestResources.DailyBuildPackages.NameD), TestResources.DailyBuildPackages.TestPackageD); var a_pre = Path.Combine(dir, TestResources.PreReleasePackages.NameA); var b_pre = Path.Combine(dir, TestResources.PreReleasePackages.NameB); @@ -78,15 +78,15 @@ public void TestPackagesSemVer1() NuGetVersionUpdater.Run(new[] { a_daily, b_daily, c_daily, d_daily }, dir, VersionTranslation.Release, exactVersions: false); NuGetVersionUpdater.Run(new[] { a_daily, b_daily, c_daily, d_daily }, dir, VersionTranslation.PreRelease, exactVersions: false); - AssertPackagesEqual(TestResources.ReleasePackages.A, File.ReadAllBytes(a_rel)); - AssertPackagesEqual(TestResources.ReleasePackages.B, File.ReadAllBytes(b_rel)); - AssertPackagesEqual(TestResources.ReleasePackages.C, File.ReadAllBytes(c_rel)); - AssertPackagesEqual(TestResources.ReleasePackages.D, File.ReadAllBytes(d_rel)); + AssertPackagesEqual(TestResources.ReleasePackages.TestPackageA, File.ReadAllBytes(a_rel)); + AssertPackagesEqual(TestResources.ReleasePackages.TestPackageB, File.ReadAllBytes(b_rel)); + AssertPackagesEqual(TestResources.ReleasePackages.TestPackageC, File.ReadAllBytes(c_rel)); + AssertPackagesEqual(TestResources.ReleasePackages.TestPackageD, File.ReadAllBytes(d_rel)); - AssertPackagesEqual(TestResources.PreReleasePackages.A, File.ReadAllBytes(a_pre)); - AssertPackagesEqual(TestResources.PreReleasePackages.B, File.ReadAllBytes(b_pre)); - AssertPackagesEqual(TestResources.PreReleasePackages.C, File.ReadAllBytes(c_pre)); - AssertPackagesEqual(TestResources.PreReleasePackages.D, File.ReadAllBytes(d_pre)); + AssertPackagesEqual(TestResources.PreReleasePackages.TestPackageA, File.ReadAllBytes(a_pre)); + AssertPackagesEqual(TestResources.PreReleasePackages.TestPackageB, File.ReadAllBytes(b_pre)); + AssertPackagesEqual(TestResources.PreReleasePackages.TestPackageC, File.ReadAllBytes(c_pre)); + AssertPackagesEqual(TestResources.PreReleasePackages.TestPackageD, File.ReadAllBytes(d_pre)); Directory.Delete(dir, recursive: true); } @@ -98,8 +98,8 @@ public void TestPackagesSemVer2() Directory.CreateDirectory(dir); string e_daily, f_daily; - File.WriteAllBytes(e_daily = Path.Combine(dir, TestResources.DailyBuildPackages.NameE), TestResources.DailyBuildPackages.E); - File.WriteAllBytes(f_daily = Path.Combine(dir, TestResources.DailyBuildPackages.NameF), TestResources.DailyBuildPackages.F); + File.WriteAllBytes(e_daily = Path.Combine(dir, TestResources.DailyBuildPackages.NameE), TestResources.DailyBuildPackages.TestPackageE); + File.WriteAllBytes(f_daily = Path.Combine(dir, TestResources.DailyBuildPackages.NameF), TestResources.DailyBuildPackages.TestPackageF); var e_pre = Path.Combine(dir, TestResources.PreReleasePackages.NameE); var f_pre = Path.Combine(dir, TestResources.PreReleasePackages.NameF); @@ -110,11 +110,11 @@ public void TestPackagesSemVer2() NuGetVersionUpdater.Run(new[] { e_daily, f_daily }, dir, VersionTranslation.Release, exactVersions: true); NuGetVersionUpdater.Run(new[] { e_daily, f_daily }, dir, VersionTranslation.PreRelease, exactVersions: true); - AssertPackagesEqual(TestResources.ReleasePackages.E, File.ReadAllBytes(e_rel)); - AssertPackagesEqual(TestResources.ReleasePackages.F, File.ReadAllBytes(f_rel)); + AssertPackagesEqual(TestResources.ReleasePackages.TestPackageE, File.ReadAllBytes(e_rel)); + AssertPackagesEqual(TestResources.ReleasePackages.TestPackageF, File.ReadAllBytes(f_rel)); - AssertPackagesEqual(TestResources.PreReleasePackages.E, File.ReadAllBytes(e_pre)); - AssertPackagesEqual(TestResources.PreReleasePackages.F, File.ReadAllBytes(f_pre)); + AssertPackagesEqual(TestResources.PreReleasePackages.TestPackageE, File.ReadAllBytes(e_pre)); + AssertPackagesEqual(TestResources.PreReleasePackages.TestPackageF, File.ReadAllBytes(f_pre)); Directory.Delete(dir, recursive: true); } @@ -126,33 +126,33 @@ public void TestValidation() Directory.CreateDirectory(dir); string a_daily, b_daily, c_daily; - File.WriteAllBytes(a_daily = Path.Combine(dir, TestResources.DailyBuildPackages.NameA), TestResources.DailyBuildPackages.A); - File.WriteAllBytes(b_daily = Path.Combine(dir, TestResources.DailyBuildPackages.NameB), TestResources.DailyBuildPackages.B); - File.WriteAllBytes(c_daily = Path.Combine(dir, TestResources.DailyBuildPackages.NameC), TestResources.DailyBuildPackages.C); + File.WriteAllBytes(a_daily = Path.Combine(dir, TestResources.DailyBuildPackages.NameA), TestResources.DailyBuildPackages.TestPackageA); + File.WriteAllBytes(b_daily = Path.Combine(dir, TestResources.DailyBuildPackages.NameB), TestResources.DailyBuildPackages.TestPackageB); + File.WriteAllBytes(c_daily = Path.Combine(dir, TestResources.DailyBuildPackages.NameC), TestResources.DailyBuildPackages.TestPackageC); var e1 = Assert.Throws(() => NuGetVersionUpdater.Run(new[] { c_daily }, outDirectoryOpt: null, VersionTranslation.Release, exactVersions: false)); - AssertEx.AreEqual("Package 'C' depends on a pre-release package 'B, [1.0.0-beta-12345-01]'", e1.Message); + AssertEx.AreEqual("Package 'TestPackageC' depends on a pre-release package 'TestPackageB, [1.0.0-beta-12345-01]'", e1.Message); var e2 = Assert.Throws(() => NuGetVersionUpdater.Run(new[] { a_daily }, outDirectoryOpt: null, VersionTranslation.Release, exactVersions: false)); AssertEx.Equal(new[] { - "System.InvalidOperationException: Package 'A' depends on a pre-release package 'B, 1.0.0-beta-12345-01'", - "System.InvalidOperationException: Package 'A' depends on a pre-release package 'C, (, 1.0.0-beta-12345-01]'", - "System.InvalidOperationException: Package 'A' depends on a pre-release package 'C, 1.0.0-beta-12345-01'" + "System.InvalidOperationException: Package 'TestPackageA' depends on a pre-release package 'TestPackageB, 1.0.0-beta-12345-01'", + "System.InvalidOperationException: Package 'TestPackageA' depends on a pre-release package 'TestPackageC, (, 1.0.0-beta-12345-01]'", + "System.InvalidOperationException: Package 'TestPackageA' depends on a pre-release package 'TestPackageC, 1.0.0-beta-12345-01'" }, e2.InnerExceptions.Select(i => i.ToString())); var e3 = Assert.Throws(() => NuGetVersionUpdater.Run(new[] { a_daily, b_daily }, outDirectoryOpt: null, VersionTranslation.Release, exactVersions: false)); AssertEx.Equal(new[] { - "System.InvalidOperationException: Package 'A' depends on a pre-release package 'C, (, 1.0.0-beta-12345-01]'", - "System.InvalidOperationException: Package 'A' depends on a pre-release package 'C, 1.0.0-beta-12345-01'" + "System.InvalidOperationException: Package 'TestPackageA' depends on a pre-release package 'TestPackageC, (, 1.0.0-beta-12345-01]'", + "System.InvalidOperationException: Package 'TestPackageA' depends on a pre-release package 'TestPackageC, 1.0.0-beta-12345-01'" }, e3.InnerExceptions.Select(i => i.ToString())); var e4 = Assert.Throws(() => NuGetVersionUpdater.Run(new[] { a_daily, c_daily }, outDirectoryOpt: null, VersionTranslation.Release, exactVersions: false)); AssertEx.Equal(new[] { - "System.InvalidOperationException: Package 'A' depends on a pre-release package 'B, 1.0.0-beta-12345-01'", - "System.InvalidOperationException: Package 'C' depends on a pre-release package 'B, [1.0.0-beta-12345-01]'" + "System.InvalidOperationException: Package 'TestPackageA' depends on a pre-release package 'TestPackageB, 1.0.0-beta-12345-01'", + "System.InvalidOperationException: Package 'TestPackageC' depends on a pre-release package 'TestPackageB, [1.0.0-beta-12345-01]'" }, e4.InnerExceptions.Select(i => i.ToString())); Directory.Delete(dir, recursive: true); @@ -168,12 +168,12 @@ public void TestDotnetToolValidation() string dotnet_tool; File.WriteAllBytes(dotnet_tool = Path.Combine(dir, TestResources.MiscPackages.NameDotnetTool), TestResources.MiscPackages.DotnetTool); string normal_package_b_daily; - File.WriteAllBytes(normal_package_b_daily = Path.Combine(dir, TestResources.DailyBuildPackages.NameB), TestResources.DailyBuildPackages.B); + File.WriteAllBytes(normal_package_b_daily = Path.Combine(dir, TestResources.DailyBuildPackages.NameB), TestResources.DailyBuildPackages.TestPackageB); NuGetVersionUpdater.Run(new[] { dotnet_tool, normal_package_b_daily }, outDirectoryOpt: outputDir, VersionTranslation.Release, exactVersions: false); // Only contain normal package. dotnet tool package is skipped - Assert.Single(Directory.EnumerateFiles(outputDir), fullPath => Path.GetFileNameWithoutExtension(fullPath) == "B.1.0.0"); + Assert.Single(Directory.EnumerateFiles(outputDir), fullPath => Path.GetFileNameWithoutExtension(fullPath) == "TestPackageB.1.0.0"); Directory.Delete(dir, recursive: true); Directory.Delete(outputDir, recursive: true);