author
int64 658
755k
| date
stringlengths 19
19
| timezone
int64 -46,800
43.2k
| hash
stringlengths 40
40
| message
stringlengths 5
490
| mods
list | language
stringclasses 20
values | license
stringclasses 3
values | repo
stringlengths 5
68
| original_message
stringlengths 12
491
|
|---|---|---|---|---|---|---|---|---|---|
455,776 |
17.03.2017 14:31:42
| 25,200 |
dbbab3eee0d630976ba5bbae1c6746a427f30bf7
|
Fix typo of "publically"
* fixed ReleasedInPublicByAccident reason
publicly
* publicly privacy policy
* publicly INT privacy policy
|
[
{
"change_type": "MODIFY",
"old_path": "content/INT/Privacy-Policy.md",
"new_path": "content/INT/Privacy-Policy.md",
"diff": "@@ -41,7 +41,7 @@ Outercurve may use non-personal data that is aggregated for reporting about the\n### Information Sharing\nOutercurve does not sell, rent, or lease any individual's personal information or lists of email addresses to anyone for marketing purposes, and we take commercially reasonable steps to maintain the security of this information. However, Outercurve reserves the right to supply any such information to any organization into which Outercurve may merge in the future or to which it may make any transfer in order to enable a third party to continue part or all of the Council's mission. We also reserve the right to release personal information to protect our systems or business, when we reasonably believe you to be in violation of our Terms of Use or if we reasonably believe you to have initiated or participated in any illegal activity. In addition, please be aware that in certain circumstances, Outercurve may be obligated to release your personal information pursuant to judicial or other government subpoenas, warrants, or other orders.\n-In keeping with our open process, Outercurve may maintain publicly accessible archives for Web site activities. For example, submitting the report abuse form may result in your description of the abuse becoming part of the publically accessible archives. In all such cases, we will ensure to the greatest degree possible, that personal information is protected.\n+In keeping with our open process, Outercurve may maintain publicly accessible archives for Web site activities. For example, submitting the report abuse form may result in your description of the abuse becoming part of the publicly accessible archives. In all such cases, we will ensure to the greatest degree possible, that personal information is protected.\nPlease remember that any information (including personal information) that you disclose in public areas of the Web site, such as NuGet package uploads, discussions, and social networking features, becomes public information that others may collect, circulate, and use. Because we cannot and do not control the acts of others, you should exercise caution when deciding to disclose information about yourself or others in public forums such as these.\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Data/Files/Content/Privacy-Policy.md",
"new_path": "src/NuGetGallery/App_Data/Files/Content/Privacy-Policy.md",
"diff": "@@ -41,7 +41,7 @@ The .NET Foundation may use non-personal data that is aggregated for reporting a\n### Information Sharing\nThe .NET Foundation does not sell, rent, or lease any individual's personal information or lists of email addresses to anyone for marketing purposes, and we take commercially reasonable steps to maintain the security of this information. However, the .NET Foundation reserves the right to supply any such information to any organization into which the .NET Foundation may merge in the future or to which it may make any transfer in order to enable a third party to continue part or all of the Council's mission. We also reserve the right to release personal information to protect our systems or business, when we reasonably believe you to be in violation of our Terms of Use or if we reasonably believe you to have initiated or participated in any illegal activity. In addition, please be aware that in certain circumstances, the .NET Foundation may be obligated to release your personal information pursuant to judicial or other government subpoenas, warrants, or other orders.\n-In keeping with our open process, the .NET Foundation may maintain publicly accessible archives for Web site activities. For example, submitting the report abuse form may result in your description of the abuse becoming part of the publically accessible archives. In all such cases, we will ensure to the greatest degree possible, that personal information is protected.\n+In keeping with our open process, the .NET Foundation may maintain publicly accessible archives for Web site activities. For example, submitting the report abuse form may result in your description of the abuse becoming part of the publicly accessible archives. In all such cases, we will ensure to the greatest degree possible, that personal information is protected.\nPlease remember that any information (including personal information) that you disclose in public areas of the Web site, such as NuGet package uploads, discussions, and social networking features, becomes public information that others may collect, circulate, and use. Because we cannot and do not control the acts of others, you should exercise caution when deciding to disclose information about yourself or others in public forums such as these.\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/ReportPackageReason.cs",
"new_path": "src/NuGetGallery/ViewModels/ReportPackageReason.cs",
"diff": "@@ -25,7 +25,7 @@ public enum ReportPackageReason\n[Description(\"The package contains private/confidential data\")]\nContainsPrivateAndConfidentialData,\n- [Description(\"The package was not intended to be published publically on nuget.org\")]\n+ [Description(\"The package was not intended to be published publicly on nuget.org\")]\nReleasedInPublicByAccident,\n}\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Fix typo of "publically" (#3636)
* fixed ReleasedInPublicByAccident reason
publicly
* publicly privacy policy
* publicly INT privacy policy
|
455,772 |
23.03.2017 11:20:31
| 25,200 |
e6dd6e4b61e112c2ac03e691d5c5dac059435cfc
|
Change telemetry time to use correct format
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/TelemetryService.cs",
"new_path": "src/NuGetGallery/Services/TelemetryService.cs",
"diff": "@@ -122,7 +122,7 @@ private static string GetClientVersion()\nprivate static string GetAccountCreationDate(User user)\n{\n- return user.CreatedUtc != null ? user.CreatedUtc.Value.ToString(\"d\") : \"N/A\";\n+ return user.CreatedUtc != null ? user.CreatedUtc.Value.ToString(\"o\") : \"N/A\";\n}\nprivate static void TrackEvent(string eventName, Action<Dictionary<string, string>> addProperties)\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Change telemetry time to use correct format (#3690)
|
455,759 |
23.03.2017 20:54:27
| -3,600 |
d2ee4b30d9be8f4741fe2bd3e35658e2c85fdf10
|
Store SemVerLevel for newly pushed/uploaded packages to gallery
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Entities/Package.cs",
"new_path": "src/NuGetGallery.Core/Entities/Package.cs",
"diff": "@@ -144,6 +144,17 @@ public Package()\n[StringLength(64)]\npublic string NormalizedVersion { get; set; }\n+ /// <summary>\n+ /// Gets or sets the minimum required SemVer level for consumers of this package,\n+ /// based on the Version property containing the original version string,\n+ /// or the dependency version ranges of this package.\n+ /// </summary>\n+ /// <remarks>\n+ /// If the field value is null, the SemVer level of this version is unknown,\n+ /// and could either indicate the package version is SemVer1- or non-SemVer-compliant at all (e.g. System.Versioning pattern).\n+ /// </remarks>\n+ public int? SemVerLevelKey { get; set; }\n+\npublic virtual ICollection<PackageLicenseReport> LicenseReports { get; set; }\n// Pre-calculated data for the feed\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"new_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"diff": "<Compile Include=\"Properties\\AssemblyInfo.cs\" />\n<Compile Include=\"Properties\\AssemblyInfo.*.cs\" />\n<Compile Include=\"NuGetVersionExtensions.cs\" />\n+ <Compile Include=\"SemVerLevelKey.cs\" />\n<Compile Include=\"StreamExtensions.cs\" />\n<Compile Include=\"CoreStrings.Designer.cs\">\n<AutoGen>True</AutoGen>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/NuGetVersionExtensions.cs",
"new_path": "src/NuGetGallery.Core/NuGetVersionExtensions.cs",
"diff": "// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\nusing System;\n-using System.Linq;\nusing System.Text.RegularExpressions;\nusing NuGet.Versioning;\n@@ -32,11 +31,6 @@ public static string ToNormalizedStringSafe(this NuGetVersion self)\nreturn self != null ? self.ToNormalizedString() : String.Empty;\n}\n- public static bool IsSemVer200(this NuGetVersion self)\n- {\n- return self.ReleaseLabels.Count() > 1 || self.HasMetadata;\n- }\n-\npublic static bool IsValidVersionForLegacyClients(this NuGetVersion self)\n{\nvar match = SemanticVersionRegex.Match(self.ToString().Trim());\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Packaging/ManifestValidator.cs",
"new_path": "src/NuGetGallery.Core/Packaging/ManifestValidator.cs",
"diff": "@@ -166,7 +166,7 @@ private static IEnumerable<ValidationResult> ValidateCore(PackageMetadata packag\nprivate static ValidationResult ValidateVersion(NuGetVersion version)\n{\n- if (version.IsSemVer200())\n+ if (version.IsSemVer2)\n{\nreturn new ValidationResult(string.Format(\nCultureInfo.CurrentCulture,\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/NuGetGallery/Migrations/201703221228170_AddSemVerLevelKeyColumn.Designer.cs",
"diff": "+// <auto-generated />\n+namespace NuGetGallery.Migrations\n+{\n+ using System.CodeDom.Compiler;\n+ using System.Data.Entity.Migrations;\n+ using System.Data.Entity.Migrations.Infrastructure;\n+ using System.Resources;\n+\n+ [GeneratedCode(\"EntityFramework.Migrations\", \"6.1.3-40302\")]\n+ public sealed partial class AddSemVerLevelKeyColumn : IMigrationMetadata\n+ {\n+ private readonly ResourceManager Resources = new ResourceManager(typeof(AddSemVerLevelKeyColumn));\n+\n+ string IMigrationMetadata.Id\n+ {\n+ get { return \"201703221228170_AddSemVerLevelKeyColumn\"; }\n+ }\n+\n+ string IMigrationMetadata.Source\n+ {\n+ get { return null; }\n+ }\n+\n+ string IMigrationMetadata.Target\n+ {\n+ get { return Resources.GetString(\"Target\"); }\n+ }\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/NuGetGallery/Migrations/201703221228170_AddSemVerLevelKeyColumn.cs",
"diff": "+namespace NuGetGallery.Migrations\n+{\n+ using System;\n+ using System.Data.Entity.Migrations;\n+\n+ public partial class AddSemVerLevelKeyColumn : DbMigration\n+ {\n+ public override void Up()\n+ {\n+ AddColumn(\"dbo.Packages\", \"SemVerLevelKey\", c => c.Int());\n+ }\n+\n+ public override void Down()\n+ {\n+ DropColumn(\"dbo.Packages\", \"SemVerLevelKey\");\n+ }\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"Migrations\\201611240011320_AddTriggerForPackagesLastEdited.Designer.cs\">\n<DependentUpon>201611240011320_AddTriggerForPackagesLastEdited.cs</DependentUpon>\n</Compile>\n+ <Compile Include=\"Migrations\\201703221228170_AddSemVerLevelKeyColumn.cs\" />\n+ <Compile Include=\"Migrations\\201703221228170_AddSemVerLevelKeyColumn.Designer.cs\">\n+ <DependentUpon>201703221228170_AddSemVerLevelKeyColumn.cs</DependentUpon>\n+ </Compile>\n<Compile Include=\"OData\\Conventions\\CompositeODataKeyHelper.cs\" />\n<Compile Include=\"OData\\Conventions\\EntitySetPropertyRoutingConvention.cs\" />\n<Compile Include=\"OData\\ODataServiceVersionHeaderPropagatingBatchHandler.cs\" />\n<Content Include=\"Scripts\\d3.v3.min.js\" />\n<Content Include=\"Areas\\Admin\\Views\\SupportRequest\\Index.cshtml\" />\n<Content Include=\"Areas\\Admin\\Views\\SupportRequest\\Admins.cshtml\" />\n+ <EmbeddedResource Include=\"Migrations\\201703221228170_AddSemVerLevelKeyColumn.resx\">\n+ <DependentUpon>201703221228170_AddSemVerLevelKeyColumn.cs</DependentUpon>\n+ </EmbeddedResource>\n<EmbeddedResource Include=\"OData\\QueryAllowed\\Data\\apiv1packages.json\" />\n<EmbeddedResource Include=\"OData\\QueryAllowed\\Data\\apiv1search.json\" />\n<EmbeddedResource Include=\"OData\\QueryAllowed\\Data\\apiv2getupdates.json\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/PackageService.cs",
"new_path": "src/NuGetGallery/Services/PackageService.cs",
"diff": "@@ -506,6 +506,9 @@ private Package CreatePackageFromNuGetPackage(PackageRegistration packageRegistr\npackage.Version = packageMetadata.Version.ToString();\npackage.NormalizedVersion = packageMetadata.Version.ToNormalizedString();\n+ // Identify the SemVerLevelKey using the original package version string and package dependencies\n+ package.SemVerLevelKey = SemVerLevelKey.ForPackage(packageMetadata.Version, package.Dependencies);\n+\npackage.Description = packageMetadata.Description;\npackage.ReleaseNotes = packageMetadata.ReleaseNotes;\npackage.HashAlgorithm = packageStreamMetadata.HashAlgorithm;\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Core.Facts/NuGetGallery.Core.Facts.csproj",
"new_path": "tests/NuGetGallery.Core.Facts/NuGetGallery.Core.Facts.csproj",
"diff": "<Compile Include=\"Packaging\\PackageMetadataFacts.cs\" />\n<Compile Include=\"Properties\\AssemblyInfo.cs\" />\n<Compile Include=\"Packaging\\NupkgRewriterFacts.cs\" />\n+ <Compile Include=\"SemVerLevelKeyFacts.cs\" />\n<Compile Include=\"Utilities\\TestDirectory.cs\" />\n</ItemGroup>\n<ItemGroup>\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
#3675 Store SemVerLevel for newly pushed/uploaded packages to gallery (#3678)
|
455,731 |
23.03.2017 14:25:30
| 25,200 |
705eca29ea3ecd6ba1bd4e4249ec03bf5821f5ce
|
Add unit test for audit record types
|
[
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Core.Facts/NuGetGallery.Core.Facts.csproj",
"new_path": "tests/NuGetGallery.Core.Facts/NuGetGallery.Core.Facts.csproj",
"diff": "<Reference Include=\"Microsoft.WindowsAzure.Configuration, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL\">\n<HintPath>..\\..\\packages\\Microsoft.WindowsAzure.ConfigurationManager.3.1.0\\lib\\net40\\Microsoft.WindowsAzure.Configuration.dll</HintPath>\n</Reference>\n- <Reference Include=\"Microsoft.WindowsAzure.Storage, Version=2.1.0.3, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL\">\n- <SpecificVersion>False</SpecificVersion>\n- <HintPath>..\\..\\packages\\WindowsAzure.Storage.2.1.0.3\\lib\\net40\\Microsoft.WindowsAzure.Storage.dll</HintPath>\n+ <Reference Include=\"Microsoft.WindowsAzure.Storage, Version=7.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL\">\n+ <HintPath>..\\..\\packages\\WindowsAzure.Storage.7.0.0\\lib\\net40\\Microsoft.WindowsAzure.Storage.dll</HintPath>\n</Reference>\n<Reference Include=\"Moq, Version=4.7.0.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL\">\n<HintPath>..\\..\\packages\\Moq.4.7.0\\lib\\net45\\Moq.dll</HintPath>\n<Compile Include=\"Auditing\\AuditedUserActionTests.cs\" />\n<Compile Include=\"Auditing\\AuditEntryTests.cs\" />\n<Compile Include=\"Auditing\\AuditingServiceTests.cs\" />\n+ <Compile Include=\"Auditing\\AuditRecordTests.cs\" />\n<Compile Include=\"Auditing\\CredentialAuditRecordTests.cs\" />\n<Compile Include=\"Auditing\\EnumTests.cs\" />\n<Compile Include=\"Auditing\\FailedAuthenticatedOperationAuditRecordTests.cs\" />\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Add unit test for audit record types (#3693)
|
455,794 |
24.03.2017 09:25:42
| 25,200 |
551fd8616d25f7257513380b13e9443b0f93afc9
|
UpdateIsLatest concurrent unlist fix
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/PackageService.cs",
"new_path": "src/NuGetGallery/Services/PackageService.cs",
"diff": "@@ -729,7 +729,14 @@ protected internal async virtual Task<bool> TryUpdateIsLatestInDatabase(IEntitie\nquery.AppendLine($\"UPDATE [dbo].[Packages]\");\nquery.AppendLine($\"SET [IsLatest] = {isLatest}, [IsLatestStable] = {isLatestStable}, [LastUpdated] = GETUTCDATE()\");\n- query.AppendLine($\"WHERE [Key] = {key} AND [IsLatest] = {originalIsLatest} AND [IsLatestStable] = {originalIsLatestStable}\");\n+ query.AppendLine($\"WHERE [Key] = {key}\");\n+ // optimistic concurrency check to prevent concurrent sets of latest/latestStable\n+ query.AppendLine($\" AND [IsLatest] = {originalIsLatest} AND [IsLatestStable] = {originalIsLatestStable}\");\n+ // ensure new latest/latestStable was not concurrently unlisted/deleted\n+ if (packageEntry.Entity.IsLatest || packageEntry.Entity.IsLatestStable)\n+ {\n+ query.AppendLine($\" AND [Listed] = 1 AND [Deleted] = 0\");\n+ }\nquery.AppendLine($\"SET @rowCount = @rowCount + @@ROWCOUNT\");\n}\nquery.AppendLine(\"SELECT @rowCount\");\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests/ODataFeeds/V2FeedExtendedTests.cs",
"new_path": "tests/NuGetGallery.FunctionalTests/ODataFeeds/V2FeedExtendedTests.cs",
"diff": "@@ -97,11 +97,6 @@ public async Task PackagesAppearInFeedInOrderTest()\n[Category(\"P0Tests\")]\npublic async Task PackageLatestSetCorrectlyOnConcurrentPushes()\n{\n- var latestAll = \"7.0.2-abc\";\n- var latestStableAll = \"7.0.1\";\n- var latestFirstHalf = \"3.0.2-abc\";\n- var latestStableFirstHalf = \"3.0.1\";\n-\nvar packageId = $\"TestV2FeedPackageLatestSetCorrectlyOnConcurrentPushes.{DateTime.UtcNow.Ticks}\";\nvar packageVersions = new List<string>()\n{\n@@ -109,8 +104,8 @@ public async Task PackageLatestSetCorrectlyOnConcurrentPushes()\n\"2.0.0-a\", \"2.0.0-b\", \"2.0.0\", \"2.0.1\", \"2.0.2-abc\",\n\"3.0.0-a\", \"3.0.0-b\", \"3.0.0\", \"3.0.1\", \"3.0.2-abc\",\n\"4.0.0-a\", \"4.0.0-b\", \"4.0.0\", \"4.0.1\", \"4.0.2-abc\",\n- \"6.0.0-a\", \"6.0.0-b\", \"6.0.0\", \"6.0.1\", \"6.0.2-abc\",\n- \"7.0.0-a\", \"7.0.0-b\", \"7.0.0\", \"7.0.1\", \"7.0.2-abc\"\n+ \"5.0.0-a\", \"5.0.0-b\", \"5.0.0\", \"5.0.1\", \"5.0.2-abc\",\n+ \"6.0.0-a\", \"6.0.0-b\", \"6.0.0\", \"6.0.1\", \"6.0.2-abc\"\n};\n// first push should not be concurrent to avoid conflict on creation of package registration.\n@@ -119,6 +114,7 @@ public async Task PackageLatestSetCorrectlyOnConcurrentPushes()\nconcurrentTasks[0].Wait();\n// push remaining packages over period of 5 seconds\n+ // goal is insert of multiple packages that would be marked as new latest/latestStable\nvar random = new Random();\nfor (int i = 1; i < concurrentTasks.Length; i++)\n{\n@@ -131,26 +127,29 @@ public async Task PackageLatestSetCorrectlyOnConcurrentPushes()\n}\nTask.WaitAll(concurrentTasks);\n- await CheckPackageLatestVersions(packageId, packageVersions, latestAll, latestStableAll);\n-\n- // unlist last half and verify; ~1-2 concurrency conflicts seen in testing\n- for (int i = concurrentTasks.Length - 1; i >= 15; i--)\n+ // unlist packages a row at a time\n+ // goal is unlist of package that would be marked latest/latestStable by concurrent UpdateIsLatest\n+ var rowCount = 6;\n+ var columnCount = 5;\n+ var concurrentUnlists = new Task[columnCount];\n+ for (int r = rowCount; r > 0; r--)\n{\n- var packageVersion = packageVersions[i];\n- concurrentTasks[i] = Task.Run(() => _clientSdkHelper.UnlistPackage(packageId, version: packageVersion));\n- }\n- Task.WaitAll(concurrentTasks);\n+ // verify current latest/latestStable before unlisting next row\n+ var latestIndex = (r * columnCount) - 1;\n+ var latestStableIndex = (r * columnCount) - 2;\n+ await CheckPackageLatestVersions(packageId, packageVersions, packageVersions[latestIndex], packageVersions[latestStableIndex]);\n- await CheckPackageLatestVersions(packageId, packageVersions, latestFirstHalf, latestStableFirstHalf);\n-\n- // unlist remaining and verify; ~1-2 concurrency conflicts seen in testing\n- for (int i = 14; i >= 0; i--)\n+ // unlist each package in the current row\n+ for (int c = 1; c <= columnCount; c++)\n{\n- var packageVersion = packageVersions[i];\n- concurrentTasks[i] = Task.Run(() => _clientSdkHelper.UnlistPackage(packageId, version: packageVersion));\n+ var index = (r * columnCount) - c;\n+ var versionToUnlist = packageVersions[index];\n+ concurrentUnlists[c - 1] = Task.Run(() => _clientSdkHelper.UnlistPackage(packageId, version: versionToUnlist));\n+ }\n+ Task.WaitAll(concurrentUnlists);\n}\n- Task.WaitAll(concurrentTasks);\n+ // no latest/latestStable, as all packages have been unlisted\nawait CheckPackageLatestVersions(packageId, packageVersions, string.Empty, string.Empty);\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
UpdateIsLatest concurrent unlist fix (#3695)
|
455,731 |
28.03.2017 14:40:53
| 25,200 |
3e6f60092069d0bda8436b8f7b892a487aba69c2
|
Fix SSL errors in functional tests when running against staging slot
|
[
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests/Statistics/PackageStatisticsTests.cs",
"new_path": "tests/NuGetGallery.FunctionalTests/Statistics/PackageStatisticsTests.cs",
"diff": "@@ -14,6 +14,12 @@ namespace NuGetGallery.FunctionalTests.Statistics\n{\npublic class PackageStatisticsTests\n{\n+ public PackageStatisticsTests()\n+ {\n+ // Suppress SSL validation for *.cloudapp.net.\n+ ServicePointManagerInitializer.InitializeServerCertificateValidationCallback();\n+ }\n+\n/// <summary>\n/// Double-checks whether expected fields exist in the packages feed.\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests/WebPages/LinksTests.cs",
"new_path": "tests/NuGetGallery.FunctionalTests/WebPages/LinksTests.cs",
"diff": "@@ -17,6 +17,9 @@ public class LinksTests\npublic LinksTests(ITestOutputHelper testOutputHelper)\n{\n+ // Suppress SSL validation for *.cloudapp.net.\n+ ServicePointManagerInitializer.InitializeServerCertificateValidationCallback();\n+\n_fluentLinkChecker = new FluentLinkChecker(testOutputHelper);\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Fix SSL errors in functional tests when running against staging slot (#3717)
|
455,772 |
31.03.2017 15:49:19
| 25,200 |
b73a844b7784e865f2b0074e59d7c047b2a11ade
|
.NET 4.6 for Gallery
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<AppDesignerFolder>Properties</AppDesignerFolder>\n<RootNamespace>NuGetGallery</RootNamespace>\n<AssemblyName>NuGetGallery</AssemblyName>\n- <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>\n+ <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>\n<UseIISExpress>true</UseIISExpress>\n<TreatWarningsAsErrors>true</TreatWarningsAsErrors>\n<CodeAnalysisRuleSet>..\\CodeAnalysis.ruleset</CodeAnalysisRuleSet>\n<Private>True</Private>\n</Reference>\n<Reference Include=\"Microsoft.ApplicationInsights, Version=2.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL\">\n- <HintPath>..\\..\\packages\\Microsoft.ApplicationInsights.2.2.0\\lib\\net45\\Microsoft.ApplicationInsights.dll</HintPath>\n+ <HintPath>..\\..\\packages\\Microsoft.ApplicationInsights.2.2.0\\lib\\net46\\Microsoft.ApplicationInsights.dll</HintPath>\n<Private>True</Private>\n</Reference>\n<Reference Include=\"Microsoft.ApplicationInsights.TraceListener, Version=2.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL\">\n<Private>True</Private>\n</Reference>\n<Reference Include=\"System.ComponentModel.Composition\" />\n- <Reference Include=\"System.Core\" />\n<Reference Include=\"System.Data.DataSetExtensions\" />\n<Reference Include=\"System.IdentityModel\" />\n<Reference Include=\"System.IdentityModel.Tokens.Jwt, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL\">\n<HintPath>..\\..\\packages\\Microsoft.Net.Http.2.2.29\\lib\\net45\\System.Net.Http.Primitives.dll</HintPath>\n<Private>True</Private>\n</Reference>\n+ <Reference Include=\"System.Web.Extensions\" />\n<Reference Include=\"System.Web.Http, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL\">\n<HintPath>..\\..\\packages\\Microsoft.AspNet.WebApi.Core.5.2.3\\lib\\net45\\System.Web.Http.dll</HintPath>\n<Private>True</Private>\n<HintPath>..\\..\\packages\\Microsoft.AspNet.WebApi.WebHost.5.2.3\\lib\\net45\\System.Web.Http.WebHost.dll</HintPath>\n<Private>True</Private>\n</Reference>\n+ <Reference Include=\"System.Xml.Linq\" />\n<Reference Include=\"WebApi.OutputCache.Core, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL\">\n<SpecificVersion>False</SpecificVersion>\n<HintPath>..\\..\\packages\\Strathweb.CacheOutput.WebApi2.0.9.0\\lib\\net45\\WebApi.OutputCache.Core.dll</HintPath>\n</Reference>\n<Reference Include=\"System.Transactions\" />\n<Reference Include=\"System.Web.ApplicationServices\" />\n- <Reference Include=\"System.Web.Extensions\" />\n<Reference Include=\"Microsoft.CSharp\" />\n<Reference Include=\"System\" />\n<Reference Include=\"System.Data\" />\n</Reference>\n<Reference Include=\"System.Xml\" />\n<Reference Include=\"System.Xml.Linq\" />\n- <Reference Include=\"System.Xml.Linq\" />\n<Reference Include=\"WebActivator, Version=1.4.4.0, Culture=neutral, processorArchitecture=MSIL\">\n<SpecificVersion>False</SpecificVersion>\n<HintPath>..\\..\\packages\\WebActivator.1.4.4\\lib\\net40\\WebActivator.dll</HintPath>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Web.config",
"new_path": "src/NuGetGallery/Web.config",
"diff": "-->\n<system.web>\n<httpCookies requireSSL=\"true\" httpOnlyCookies=\"true\" />\n- <compilation debug=\"true\" targetFramework=\"4.5.2\" />\n+ <compilation debug=\"true\" targetFramework=\"4.6\" />\n<pages controlRenderingCompatibilityVersion=\"4.0\">\n<namespaces>\n<add namespace=\"System.Web.Helpers\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"new_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"diff": "<AppDesignerFolder>Properties</AppDesignerFolder>\n<RootNamespace>NuGetGallery</RootNamespace>\n<AssemblyName>NuGetGallery.Facts</AssemblyName>\n- <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>\n+ <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>\n<FileAlignment>512</FileAlignment>\n<TargetFrameworkProfile />\n<NuGetPackageImportStamp>\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
.NET 4.6 for Gallery (#3736)
|
455,759 |
05.04.2017 10:31:39
| 25,200 |
2f4098f14e34b8fc6fc654469d8299bac6ea46d5
|
Gallery Compiler warning - Could not find rule set file 'Sdl7.0.ruleset'
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGet.Services.Search.Client/NuGet.Services.Search.Client.csproj",
"new_path": "src/NuGet.Services.Search.Client/NuGet.Services.Search.Client.csproj",
"diff": "<DefineConstants>DEBUG;TRACE</DefineConstants>\n<ErrorReport>prompt</ErrorReport>\n<WarningLevel>4</WarningLevel>\n- <CodeAnalysisRuleSet>Sdl7.0.ruleset</CodeAnalysisRuleSet>\n</PropertyGroup>\n<PropertyGroup Condition=\" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' \">\n<DebugType>pdbonly</DebugType>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"new_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"diff": "<DefineConstants>DEBUG;TRACE</DefineConstants>\n<ErrorReport>prompt</ErrorReport>\n<WarningLevel>4</WarningLevel>\n- <CodeAnalysisRuleSet>..\\FrontendSDL.ruleset</CodeAnalysisRuleSet>\n+ <CodeAnalysisRuleSet>..\\Frontend.ruleset</CodeAnalysisRuleSet>\n<TreatWarningsAsErrors>true</TreatWarningsAsErrors>\n</PropertyGroup>\n<PropertyGroup Condition=\" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' \">\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<WarningLevel>4</WarningLevel>\n<Prefer32Bit>false</Prefer32Bit>\n<UseVSHostingProcess>true</UseVSHostingProcess>\n- <CodeAnalysisRuleSet>..\\FrontendSDL.ruleset</CodeAnalysisRuleSet>\n+ <CodeAnalysisRuleSet>..\\Frontend.ruleset</CodeAnalysisRuleSet>\n<CodeContractsEnableRuntimeChecking>False</CodeContractsEnableRuntimeChecking>\n<CodeContractsRuntimeOnlyPublicSurface>False</CodeContractsRuntimeOnlyPublicSurface>\n<CodeContractsRuntimeThrowOnFailure>True</CodeContractsRuntimeThrowOnFailure>\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Core.Facts/NuGetGallery.Core.Facts.csproj",
"new_path": "tests/NuGetGallery.Core.Facts/NuGetGallery.Core.Facts.csproj",
"diff": "<WarningLevel>4</WarningLevel>\n<TreatWarningsAsErrors>true</TreatWarningsAsErrors>\n<Prefer32Bit>false</Prefer32Bit>\n- <CodeAnalysisRuleSet>Sdl7.0.ruleset</CodeAnalysisRuleSet>\n+ <CodeAnalysisRuleSet>ManagedMinimumRules.ruleset</CodeAnalysisRuleSet>\n</PropertyGroup>\n<PropertyGroup Condition=\" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' \">\n<DebugType>pdbonly</DebugType>\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"new_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"diff": "<TreatWarningsAsErrors>true</TreatWarningsAsErrors>\n<Prefer32Bit>false</Prefer32Bit>\n<NoWarn>0618</NoWarn>\n- <CodeAnalysisRuleSet>Sdl7.0.ruleset</CodeAnalysisRuleSet>\n+ <CodeAnalysisRuleSet>ManagedMinimumRules.ruleset</CodeAnalysisRuleSet>\n</PropertyGroup>\n<PropertyGroup Condition=\" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' \">\n<DebugType>pdbonly</DebugType>\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Gallery Compiler warning - Could not find rule set file 'Sdl7.0.ruleset' (#3749)
|
455,759 |
05.04.2017 16:15:40
| 25,200 |
433ce65d3e8c04e0dd5a46bb4e89b883f79f0bc7
|
Update default localdb connection strings in gallery web.config
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Web.config",
"new_path": "src/NuGetGallery/Web.config",
"diff": "<add key=\"KeyVault.CertificateThumbprint\" value=\"\" />\n</appSettings>\n<connectionStrings>\n- <add name=\"Gallery.SqlServer\" connectionString=\"Data Source=(localdb)\\v11.0; Initial Catalog=NuGetGallery; Integrated Security=True; MultipleActiveResultSets=True\" providerName=\"System.Data.SqlClient\" />\n- <add name=\"Gallery.SupportRequestSqlServer\" connectionString=\"Data Source=(localdb)\\v11.0; Initial Catalog=SupportRequest; Integrated Security=True; MultipleActiveResultSets=True\" providerName=\"System.Data.SqlClient\" />\n+ <add name=\"Gallery.SqlServer\" connectionString=\"Data Source=(localdb)\\mssqllocaldb; Initial Catalog=NuGetGallery; Integrated Security=True; MultipleActiveResultSets=True\" providerName=\"System.Data.SqlClient\" />\n+ <add name=\"Gallery.SupportRequestSqlServer\" connectionString=\"Data Source=(localdb)\\mssqllocaldb; Initial Catalog=SupportRequest; Integrated Security=True; MultipleActiveResultSets=True\" providerName=\"System.Data.SqlClient\" />\n</connectionStrings>\n<elmah>\n<security allowRemoteAccess=\"true\" />\n<entityFramework>\n<defaultConnectionFactory type=\"System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework\">\n<parameters>\n- <parameter value=\"Data Source=(LocalDB)\\v11.0;Initial Catalog=NuGetGallery;Integrated Security=SSPI\" />\n+ <parameter value=\"Data Source=(LocalDB)\\mssqllocaldb;Initial Catalog=NuGetGallery;Integrated Security=SSPI\" />\n</parameters>\n</defaultConnectionFactory>\n<providers>\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Update default localdb connection strings in gallery web.config (#3753)
|
455,772 |
07.04.2017 10:55:42
| 25,200 |
d96f44f6368545e473169c76a998e01f3bfc9d53
|
Add client information property to request telemetry
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Start/OwinStartup.cs",
"new_path": "src/NuGetGallery/App_Start/OwinStartup.cs",
"diff": "@@ -59,7 +59,12 @@ public static void Configuration(IAppBuilder app)\n{\nTelemetryConfiguration.Active.InstrumentationKey = instrumentationKey;\n+ // Add enrichers\n+ TelemetryConfiguration.Active.TelemetryInitializers.Add(new ClientInformationTelemetryEnricher());\n+\nvar telemetryProcessorChainBuilder = TelemetryConfiguration.Active.TelemetryProcessorChainBuilder;\n+\n+ // Add filters\ntelemetryProcessorChainBuilder.Use(next => new TelemetryResponseCodeFilter(next));\n// Note: sampling rate must be a factor 100/N where N is a whole number\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Constants.cs",
"new_path": "src/NuGetGallery/Constants.cs",
"diff": "@@ -55,6 +55,7 @@ public static class Constants\ninternal const string ApiKeyHeaderName = \"X-NuGet-ApiKey\";\ninternal const string ClientVersionHeaderName = \"X-NuGet-Client-Version\";\ninternal const string WarningHeaderName = \"X-NuGet-Warning\";\n+ internal const string UserAgentHeaderName = \"User-Agent\";\npublic static readonly string ReturnUrlParameterName = \"ReturnUrl\";\npublic static readonly string CurrentUserOwinEnvironmentKey = \"nuget.user\";\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"Controllers\\PagesController.cs\" />\n<Compile Include=\"Filters\\ApiScopeRequiredAttribute.cs\" />\n<Compile Include=\"GlobalSuppressions.cs\" />\n- <Compile Include=\"Helpers\\TelemetryResponseCodeFilter.cs\" />\n+ <Compile Include=\"Telemetry\\ClientInformationTelemetryEnricher.cs\" />\n+ <Compile Include=\"Telemetry\\TelemetryResponseCodeFilter.cs\" />\n<Compile Include=\"Infrastructure\\Authentication\\CredentialBuilder.cs\" />\n<Compile Include=\"Infrastructure\\Authentication\\CredentialValidator.cs\" />\n<Compile Include=\"Infrastructure\\Authentication\\ICredentialBuilder.cs\" />\n</Compile>\n<Compile Include=\"Extensions\\HttpRequestExtensions.cs\" />\n<Compile Include=\"Helpers\\HostMachine.cs\" />\n- <Compile Include=\"Helpers\\AppInsightsHealthIndicatorLogger.cs\" />\n- <Compile Include=\"Helpers\\Telemetry.cs\" />\n+ <Compile Include=\"Telemetry\\AppInsightsHealthIndicatorLogger.cs\" />\n+ <Compile Include=\"Telemetry\\Telemetry.cs\" />\n<Compile Include=\"Infrastructure\\DependencyResolverServiceProviderAdapter.cs\" />\n<Compile Include=\"Infrastructure\\Lucene\\CloudDownloadCountServiceRefreshJob.cs\" />\n<Compile Include=\"Infrastructure\\MessageQueue.cs\" />\n<Compile Include=\"Helpers\\FileHelper.cs\" />\n<Compile Include=\"Helpers\\HtmlExtensions.cs\" />\n<Compile Include=\"Helpers\\PackageHelper.cs\" />\n- <Compile Include=\"Helpers\\QuietLog.cs\" />\n+ <Compile Include=\"Telemetry\\QuietLog.cs\" />\n<Compile Include=\"Helpers\\StringExtensions.cs\" />\n<Compile Include=\"Helpers\\StatisticsHelper.cs\" />\n<Compile Include=\"Helpers\\TreeView.cs\" />\n"
},
{
"change_type": "RENAME",
"old_path": "src/NuGetGallery/Helpers/AppInsightsHealthIndicatorLogger.cs",
"new_path": "src/NuGetGallery/Telemetry/AppInsightsHealthIndicatorLogger.cs",
"diff": ""
},
{
"change_type": "RENAME",
"old_path": "src/NuGetGallery/Helpers/QuietLog.cs",
"new_path": "src/NuGetGallery/Telemetry/QuietLog.cs",
"diff": "using System.Collections.Generic;\nusing System.Web;\nusing Elmah;\n-using Microsoft.ApplicationInsights;\nnamespace NuGetGallery\n{\n"
},
{
"change_type": "RENAME",
"old_path": "src/NuGetGallery/Helpers/Telemetry.cs",
"new_path": "src/NuGetGallery/Telemetry/Telemetry.cs",
"diff": ""
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"new_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"diff": "<HintPath>..\\..\\packages\\MarkdownSharp.1.13.0.0\\lib\\35\\MarkdownSharp.dll</HintPath>\n<Private>True</Private>\n</Reference>\n+ <Reference Include=\"Microsoft.ApplicationInsights, Version=2.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL\">\n+ <HintPath>..\\..\\packages\\Microsoft.ApplicationInsights.2.2.0\\lib\\net46\\Microsoft.ApplicationInsights.dll</HintPath>\n+ </Reference>\n<Reference Include=\"Microsoft.Azure.Common, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL\">\n<HintPath>..\\..\\packages\\Microsoft.Azure.Common.2.0.4\\lib\\net45\\Microsoft.Azure.Common.dll</HintPath>\n<Private>True</Private>\n<Compile Include=\"Services\\ReflowPackageServiceFacts.cs\" />\n<Compile Include=\"Services\\ScopeEvaluatorFacts.cs\" />\n<Compile Include=\"Services\\SearchAdaptorFacts.cs\" />\n+ <Compile Include=\"Telemetry\\ClientInformationTelemetryEnricherTests.cs\" />\n<Compile Include=\"TestUtils\\Infrastructure\\TestableV1Feed.cs\" />\n<Compile Include=\"TestUtils\\Infrastructure\\TestableV2Feed.cs\" />\n<Compile Include=\"TestUtils\\Infrastructure\\TestDependencyResolver.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/packages.config",
"new_path": "tests/NuGetGallery.Facts/packages.config",
"diff": "<package id=\"Hyak.Common\" version=\"1.0.2\" targetFramework=\"net46\" />\n<package id=\"Lucene.Net\" version=\"3.0.3\" targetFramework=\"net46\" />\n<package id=\"MarkdownSharp\" version=\"1.13.0.0\" targetFramework=\"net46\" />\n+ <package id=\"Microsoft.ApplicationInsights\" version=\"2.2.0\" targetFramework=\"net46\" />\n<package id=\"Microsoft.AspNet.Mvc\" version=\"5.2.3\" targetFramework=\"net46\" />\n<package id=\"Microsoft.AspNet.Razor\" version=\"3.2.3\" targetFramework=\"net46\" />\n<package id=\"Microsoft.AspNet.WebApi.Client\" version=\"5.2.3\" targetFramework=\"net46\" />\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Add client information property to request telemetry (#3759)
|
455,776 |
10.04.2017 10:38:08
| 25,200 |
61ddd4627d8df24cd9b26eb93e29cf9e732a60bd
|
Add script to run a semicolon-delimited list of functional test scripts
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": "tests/Scripts/RunTestScripts.ps1",
"diff": "+param(\n+ [string]$TestCategories\n+)\n+\n+$dividerSymbol = \"~\"\n+\n+$failedTests = New-Object System.Collections.ArrayList\n+\n+$TestCategories.Split(';') | ForEach-Object {\n+ Write-Output ($dividerSymbol * 20)\n+ Write-Output \"Testing $_.\"\n+ Write-Output ($dividerSymbol * 10)\n+\n+ & $env:COMSPEC /c \"$PSScriptRoot\\Run$_.bat\"\n+\n+ Write-Output ($dividerSymbol * 10)\n+\n+ Write-Output \"Finished testing $_.\"\n+ if ($LastExitCode) {\n+ Write-Output \"$_ failed!\"\n+ $failedTests.Add($_) | Out-Null\n+ } else {\n+ Write-Output \"$_ succeeded!\"\n+ }\n+}\n+\n+Write-Output ($dividerSymbol * 20)\n+if ($failedTests.Count -gt 0) {\n+ Write-Output \"Some functional tests failed!\"\n+ $failedTests | ForEach-Object { Write-Output $_ }\n+ exit 1\n+}\n+\n+Write-Output \"All functional tests succeeded!\"\n+exit 0\n\\ No newline at end of file\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Add script to run a semicolon-delimited list of functional test scripts (#3764)
|
455,794 |
18.04.2017 09:16:39
| 25,200 |
a01b0f8e421b444c3b3f8cb93e752eb5a1639722
|
PR#3741 test fix, per integration with PR#3728
|
[
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs",
"diff": "@@ -835,7 +835,7 @@ private async Task WillThrowIfTheNuGetPackageDescriptionIsNull()\nvar service = CreateService();\nvar nugetPackage = CreateNuGetPackage(description: null);\n- var ex = await Assert.ThrowsAsync<EntityException>(async () => await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), null));\n+ var ex = await Assert.ThrowsAsync<InvalidPackageException>(async () => await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), null));\nAssert.Equal(String.Format(Strings.NuGetPackagePropertyMissing, \"Description\"), ex.Message);\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
PR#3741 test fix, per integration with PR#3728 (#3794)
|
455,794 |
19.04.2017 11:57:49
| 25,200 |
d80197f179dc9130ce12abb05f8e0404e5f26f9d
|
IsVerificationKeyUsed telemetry fix
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ExtensionMethods.cs",
"new_path": "src/NuGetGallery/ExtensionMethods.cs",
"diff": "@@ -403,11 +403,15 @@ public static bool IsScopedAuthentication(this IIdentity self)\nreturn !ScopeEvaluator.IsEmptyScopeClaim(scopeClaim);\n}\n- public static bool HasVerifyScope(this IIdentity self)\n+ /// <summary>\n+ /// Determines if authentication is scoped and uses package verify claim.\n+ /// </summary>\n+ public static bool HasPackageVerifyScopeClaim(this IIdentity self)\n{\nvar scopeClaim = self.GetScopeClaim();\n- return ScopeEvaluator.ScopeClaimsAllowsActionForSubject(scopeClaim, subject: null,\n+ return !ScopeEvaluator.IsEmptyScopeClaim(scopeClaim) &&\n+ ScopeEvaluator.ScopeClaimsAllowsActionForSubject(scopeClaim, subject: null,\nrequestedActions: new [] { NuGetScopes.PackageVerify });\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/TelemetryService.cs",
"new_path": "src/NuGetGallery/Services/TelemetryService.cs",
"diff": "@@ -110,7 +110,7 @@ public void TrackVerifyPackageKeyEvent(string packageId, string packageVersion,\n{\nproperties.Add(PackageId, packageId);\nproperties.Add(PackageVersion, packageVersion);\n- properties.Add(IsVerificationKeyUsed, identity.HasVerifyScope().ToString());\n+ properties.Add(IsVerificationKeyUsed, identity.HasPackageVerifyScopeClaim().ToString());\nproperties.Add(VerifyPackageKeyStatusCode, statusCode.ToString());\n});\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
IsVerificationKeyUsed telemetry fix (#3806)
|
455,794 |
27.04.2017 07:37:18
| 25,200 |
764119db1486cdcf0ae73ae3962f9afaaddbbdd2
|
Functional tests (disabled) for temp keys policies
|
[
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests.Core/Constants.cs",
"new_path": "tests/NuGetGallery.FunctionalTests.Core/Constants.cs",
"diff": "@@ -5,6 +5,10 @@ namespace NuGetGallery.FunctionalTests\n{\npublic static class Constants\n{\n+ // Headers\n+ public const string NuGetHeaderApiKey = \"X-NuGet-ApiKey\";\n+ public const string NuGetHeaderClientVersion = \"X-NuGet-Client-Version\";\n+\n// Form Fields\npublic const string ConfirmPasswordFormField = \"ConfirmPassword\";\npublic const string EmailAddressFormField = \"Register.EmailAddress\";\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests.Core/EnvironmentSettings.cs",
"new_path": "tests/NuGetGallery.FunctionalTests.Core/EnvironmentSettings.cs",
"diff": "@@ -20,6 +20,7 @@ public class EnvironmentSettings\nprivate static string _testAccountApiKey_Unlist;\nprivate static string _testAccountApiKey_PushPackage;\nprivate static string _testAccountApiKey_PushVersion;\n+ private static string _testSecurityPoliciesAccountApiKey;\nprivate static string _testEmailServerHost;\nprivate static List<string> _trustedHttpsCertificates;\n@@ -215,6 +216,21 @@ public static string TestAccountApiKey_PushVersion\n}\n}\n+ /// <summary>\n+ /// The full access API key for the security policies test account.\n+ /// </summary>\n+ public static string TestSecurityPoliciesAccountApiKey\n+ {\n+ get\n+ {\n+ if (string.IsNullOrEmpty(_testSecurityPoliciesAccountApiKey))\n+ {\n+ _testSecurityPoliciesAccountApiKey = Environment.GetEnvironmentVariable(\"TestSecurityPoliciesAccountApiKey\");\n+ }\n+ return _testSecurityPoliciesAccountApiKey;\n+ }\n+ }\n+\npublic static string TestEmailServerHost\n{\nget\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests/NuGetGallery.FunctionalTests.csproj",
"new_path": "tests/NuGetGallery.FunctionalTests/NuGetGallery.FunctionalTests.csproj",
"diff": "<Compile Include=\"ODataFeeds\\SearchTest.cs\" />\n<Compile Include=\"ODataFeeds\\V2FeedExtendedTests.cs\" />\n<Compile Include=\"PackageCreation\\ApiPushTests.cs\" />\n+ <Compile Include=\"PackageCreation\\SecurityPolicyTests.cs\" />\n<Compile Include=\"Statistics\\PackageStatisticsTests.cs\" />\n<Compile Include=\"ODataFeeds\\V2FeedTests.cs\" />\n<Compile Include=\"WebPages\\FluentLinkChecker.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests/ODataFeeds/V2FeedExtendedTests.cs",
"new_path": "tests/NuGetGallery.FunctionalTests/ODataFeeds/V2FeedExtendedTests.cs",
"diff": "@@ -241,93 +241,5 @@ public async Task PackageFeedSortingTest()\nAssert.True(condition, \"Expected string \" + packageName[i - 1] + \" to come before \" + packageName[i] + \". Expected list is: \" + packageName[0] + \", \" + packageName[1] + \", \" + packageName[2] + \", \" + packageName[3] + \", \" + packageName[4] + \", \" + packageName[5] + \", \" + packageName[6] + \", \" + packageName[7] + \", \" + packageName[8] + \", \" + packageName[9]);\n}\n}\n-\n- [Fact]\n- [Description(\"VerifyPackageKey fails if package isn't found.\")]\n- [Priority(1)]\n- [Category(\"P1Tests\")]\n- public async Task VerifyPackageKeyReturns404ForMissingPackage()\n- {\n- Assert.Equal(HttpStatusCode.NotFound, await VerifyPackageKey(EnvironmentSettings.TestAccountApiKey, \"VerifyPackageKeyReturns404ForMissingPackage\", \"1.0.0\"));\n- }\n-\n- [Fact]\n- [Description(\"VerifyPackageKey succeeds for full API key without deletion.\")]\n- [Priority(1)]\n- [Category(\"P1Tests\")]\n- public async Task VerifyPackageKeyReturns200ForFullApiKey()\n- {\n- var packageId = $\"VerifyPackageKeyReturns200ForFullApiKey.{DateTimeOffset.UtcNow.Ticks}\";\n- var packageVersion = \"1.0.0\";\n-\n- await _clientSdkHelper.UploadNewPackage(packageId, packageVersion);\n-\n- Assert.Equal(HttpStatusCode.OK, await VerifyPackageKey(EnvironmentSettings.TestAccountApiKey, packageId));\n- Assert.Equal(HttpStatusCode.OK, await VerifyPackageKey(EnvironmentSettings.TestAccountApiKey, packageId, packageVersion));\n- }\n-\n- [Fact]\n- [Description(\"VerifyPackageKey succeeds for temp API key with deletion.\")]\n- [Priority(1)]\n- [Category(\"P1Tests\")]\n- public async Task VerifyPackageKeyReturns200ForTempApiKey()\n- {\n- var packageId = $\"VerifyPackageKeySupportsFullAndTempApiKeys.{DateTimeOffset.UtcNow.Ticks}\";\n- var packageVersion = \"1.0.0\";\n-\n- await _clientSdkHelper.UploadNewPackage(packageId, packageVersion);\n-\n- var verificationKey = await CreateVerificationKey(packageId, packageVersion);\n-\n- Assert.Equal(HttpStatusCode.OK, await VerifyPackageKey(verificationKey, packageId, packageVersion));\n- Assert.Equal(HttpStatusCode.Forbidden, await VerifyPackageKey(verificationKey, packageId, packageVersion));\n- }\n-\n- private async Task<string> CreateVerificationKey(string packageId, string packageVersion)\n- {\n- var request = WebRequest.Create(UrlHelper.V2FeedRootUrl + $\"package/create-verification-key/{packageId}/{packageVersion}\");\n- request.Method = \"POST\";\n- request.ContentLength = 0;\n- request.Headers.Add(\"X-NuGet-ApiKey\", EnvironmentSettings.TestAccountApiKey);\n- request.Headers.Add(\"X-NuGet-Client-Version\", \"NuGetGallery.FunctionalTests\");\n-\n- var response = await request.GetResponseAsync() as HttpWebResponse;\n- Assert.NotNull(response);\n- Assert.Equal(HttpStatusCode.OK, response.StatusCode);\n-\n- string responseText;\n- using (var sr = new StreamReader(response.GetResponseStream()))\n- {\n- responseText = await sr.ReadToEndAsync();\n- }\n-\n- var json = JObject.Parse(responseText);\n- var expiration = json.Value<DateTime>(\"Expires\");\n-\n- // Verification key should expire in 1 day. Ensure expiration is within 2 days in case client/server clocks differ.\n- Assert.True(expiration - DateTime.UtcNow < TimeSpan.FromDays(2), \"Verification keys should expire after 1 day.\");\n-\n- return json.Value<string>(\"Key\");\n- }\n-\n- private async Task<HttpStatusCode> VerifyPackageKey(string apiKey, string packageId, string packageVersion = null)\n- {\n- var route = string.IsNullOrWhiteSpace(packageVersion) ?\n- $\"verifykey/{packageId}\" :\n- $\"verifykey/{packageId}/{packageVersion}\";\n-\n- var request = WebRequest.Create(UrlHelper.V2FeedRootUrl + route);\n- request.Headers.Add(\"X-NuGet-ApiKey\", apiKey);\n-\n- try\n- {\n- var response = await request.GetResponseAsync() as HttpWebResponse;\n- return response.StatusCode;\n- }\n- catch (WebException e)\n- {\n- return ((HttpWebResponse)e.Response).StatusCode;\n- }\n- }\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests/PackageCreation/ApiPushTests.cs",
"new_path": "tests/NuGetGallery.FunctionalTests/PackageCreation/ApiPushTests.cs",
"diff": "@@ -96,7 +96,7 @@ public async Task DuplicatePushesAreRejectedAndNotDeleted()\nusing (var request = new HttpRequestMessage(HttpMethod.Put, UrlHelper.V2FeedPushSourceUrl))\n{\nrequest.Content = new StreamContent(new BarrierStream(package, barrier));\n- request.Headers.Add(\"X-NuGet-ApiKey\", EnvironmentSettings.TestAccountApiKey);\n+ request.Headers.Add(Constants.NuGetHeaderApiKey, EnvironmentSettings.TestAccountApiKey);\nusing (var response = await client.SendAsync(request))\n{\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Functional tests (disabled) for temp keys policies (#3829)
|
455,794 |
27.04.2017 10:54:31
| 25,200 |
547931a99f9cb369b81bf8ba8aff0205dc7159d0
|
PR 3829 feedback
|
[
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests/PackageCreation/SecurityPolicyTests.cs",
"new_path": "tests/NuGetGallery.FunctionalTests/PackageCreation/SecurityPolicyTests.cs",
"diff": "@@ -173,8 +173,8 @@ private async Task<string> CreateVerificationKey(string apiKey, string packageId\nvar request = WebRequest.Create(UrlHelper.V2FeedRootUrl + route);\nrequest.Method = \"POST\";\nrequest.ContentLength = 0;\n- request.Headers.Add(\"X-NuGet-ApiKey\", apiKey);\n- request.Headers.Add(\"X-NuGet-Client-Version\", \"NuGetGallery.FunctionalTests\");\n+ request.Headers.Add(Constants.NuGetHeaderApiKey, apiKey);\n+ request.Headers.Add(Constants.NuGetHeaderClientVersion, \"NuGetGallery.FunctionalTests\");\nvar response = await request.GetResponseAsync() as HttpWebResponse;\nAssert.NotNull(response);\n@@ -202,7 +202,7 @@ private async Task<HttpStatusCode> VerifyPackageKey(string apiKey, string packag\n$\"verifykey/{packageId}/{packageVersion}\";\nvar request = WebRequest.Create(UrlHelper.V2FeedRootUrl + route);\n- request.Headers.Add(\"X-NuGet-ApiKey\", apiKey);\n+ request.Headers.Add(Constants.NuGetHeaderApiKey, apiKey);\ntry\n{\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
PR 3829 feedback (#3838)
|
455,790 |
03.05.2017 20:37:01
| 25,200 |
344e6b2d9cc3197cae0c8108d294a178b5585c61
|
Update Terms-Of-Use.md
|
[
{
"change_type": "MODIFY",
"old_path": "content/PROD/Terms-Of-Use.md",
"new_path": "content/PROD/Terms-Of-Use.md",
"diff": "# NuGet Website Terms of Use\n-Updated: May 1, 2017\n+Updated: May 3, 2017\n## Legal Notices.\nThe NuGet Website [https://nuget.org](https://nuget.org) (the \"Website\") is provided by the .NET Foundation (\".NET Foundation\") as a public service to our users. Please carefully review the following basic rules that govern your use of the Website. Please note that your use of the Website constitutes your unconditional agreement to follow and be bound by these Terms of Use. If you do not agree to these Terms of Use, do not use the Website, provide any materials to the site or download any materials from it. .NET Foundation reserves the right to update or modify these Terms of Use at any time without prior notice. Your use of the Website following any such change constitutes your unconditional agreement to follow and be bound by these Terms of Use as changed. For this reason, we encourage you to review these Terms of Use whenever you use the Website. These Terms of Use apply to the use of Website and do not extend to any linked third-party websites. These Terms of Use and our Privacy Statement, which is hereby incorporated by reference, contain the entire agreement between .NET Foundation and you with respect to this site. Any rights not expressly granted herein are reserved.\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Update Terms-Of-Use.md
|
455,760 |
08.05.2017 18:49:33
| -7,200 |
36d594fa14ba7bafd7e698bdc96eb648daefdbf5
|
Support MinClientVersion <= 4.1.0.0
* Support MinClientVersion <= 4.0.0.0
Fixes
* Update Constants.cs
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Constants.cs",
"new_path": "src/NuGetGallery/Constants.cs",
"diff": "@@ -21,7 +21,7 @@ public static class Constants\npublic const double AllowedLoginAttempts = 10;\npublic const int MaxEmailSubjectLength = 255;\n- internal static readonly NuGetVersion MaxSupportedMinClientVersion = new NuGetVersion(\"3.4.0.0\");\n+ internal static readonly NuGetVersion MaxSupportedMinClientVersion = new NuGetVersion(\"4.1.0.0\");\npublic const string PackageContentType = \"binary/octet-stream\";\npublic const string OctetStreamContentType = \"application/octet-stream\";\npublic const string NuGetPackageFileExtension = \".nupkg\";\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Support MinClientVersion <= 4.1.0.0 (#3860)
* Support MinClientVersion <= 4.0.0.0
Fixes https://github.com/NuGet/Home/issues/5156
* Update Constants.cs
|
455,744 |
10.05.2017 15:24:19
| 25,200 |
def19072374d9d2e76ca30b6de7cc867879761b0
|
Added index on ([SemVerLevelKey], [IsLatest], [Deleted]) on Packages table.
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/NuGetGallery/Migrations/201705102016311_AddIndexSemVerLevelKeyDeletedIsLatest.Designer.cs",
"diff": "+// <auto-generated />\n+namespace NuGetGallery.Migrations\n+{\n+ using System.CodeDom.Compiler;\n+ using System.Data.Entity.Migrations;\n+ using System.Data.Entity.Migrations.Infrastructure;\n+ using System.Resources;\n+\n+ [GeneratedCode(\"EntityFramework.Migrations\", \"6.1.3-40302\")]\n+ public sealed partial class AddIndexSemVerLevelKeyDeletedIsLatest : IMigrationMetadata\n+ {\n+ private readonly ResourceManager Resources = new ResourceManager(typeof(AddIndexSemVerLevelKeyDeletedIsLatest));\n+\n+ string IMigrationMetadata.Id\n+ {\n+ get { return \"201705102016311_AddIndexSemVerLevelKeyDeletedIsLatest\"; }\n+ }\n+\n+ string IMigrationMetadata.Source\n+ {\n+ get { return null; }\n+ }\n+\n+ string IMigrationMetadata.Target\n+ {\n+ get { return Resources.GetString(\"Target\"); }\n+ }\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/NuGetGallery/Migrations/201705102016311_AddIndexSemVerLevelKeyDeletedIsLatest.cs",
"diff": "+namespace NuGetGallery.Migrations\n+{\n+ using System;\n+ using System.Data.Entity.Migrations;\n+\n+ public partial class AddIndexSemVerLevelKeyDeletedIsLatest : DbMigration\n+ {\n+ private const string IndexName = \"nci_Packages_SemVerIsLatestDeleted\";\n+\n+ public override void Up()\n+ {\n+ Sql($\"IF NOT EXISTS(SELECT * FROM sys.indexes WHERE name = '{IndexName}' AND object_id = OBJECT_ID('Packages')) \" +\n+ $\"CREATE NONCLUSTERED INDEX [{IndexName}] ON [dbo].[Packages]([SemVerLevelKey], [IsLatest], [Deleted]) \");\n+ }\n+\n+ public override void Down()\n+ {\n+ Sql($\"DROP INDEX [{IndexName}] ON [dbo].[Packages]\");\n+ }\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"Migrations\\201705032101231_SecurityPoliciesFix.Designer.cs\">\n<DependentUpon>201705032101231_SecurityPoliciesFix.cs</DependentUpon>\n</Compile>\n+ <Compile Include=\"Migrations\\201705102016311_AddIndexSemVerLevelKeyDeletedIsLatest.cs\" />\n+ <Compile Include=\"Migrations\\201705102016311_AddIndexSemVerLevelKeyDeletedIsLatest.Designer.cs\">\n+ <DependentUpon>201705102016311_AddIndexSemVerLevelKeyDeletedIsLatest.cs</DependentUpon>\n+ </Compile>\n<Compile Include=\"Security\\UserSecurityPolicyHandler.cs\" />\n<Compile Include=\"Security\\ISecurityPolicyService.cs\" />\n<Compile Include=\"Security\\RequirePackageVerifyScopePolicy.cs\" />\n<EmbeddedResource Include=\"Migrations\\201705032101231_SecurityPoliciesFix.resx\">\n<DependentUpon>201705032101231_SecurityPoliciesFix.cs</DependentUpon>\n</EmbeddedResource>\n+ <EmbeddedResource Include=\"Migrations\\201705102016311_AddIndexSemVerLevelKeyDeletedIsLatest.resx\">\n+ <DependentUpon>201705102016311_AddIndexSemVerLevelKeyDeletedIsLatest.cs</DependentUpon>\n+ </EmbeddedResource>\n<EmbeddedResource Include=\"OData\\QueryAllowed\\Data\\apiv1packages.json\" />\n<EmbeddedResource Include=\"OData\\QueryAllowed\\Data\\apiv1search.json\" />\n<EmbeddedResource Include=\"OData\\QueryAllowed\\Data\\apiv2getupdates.json\" />\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Added index on ([SemVerLevelKey], [IsLatest], [Deleted]) on Packages table. (#3934)
|
455,776 |
11.05.2017 13:34:33
| 25,200 |
cdcb6a8fd6c890fd879f5188eda41eeff9d2fcc2
|
pressing edit or undo on the verify package page does not reset focus
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/VerifyPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/VerifyPackage.cshtml",
"diff": "$(\"#\" + name + \"Field\").show();\n$(\"#\" + name + \"Button\").hide();\n$(\"#Undo\" + name).show();\n+ $(\"#Undo\" + name).focus();\n});\nSetDataEditedFlag = function (event) {\n$(\"#\" + name + \"Field\").hide();\n$(\"#\" + name + \"Button\").show();\n$(\"#Undo\" + name).hide();\n+ $(\"#\" + name + \"Button\").focus();\n});\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
pressing edit or undo on the verify package page does not reset focus (#3919)
|
455,794 |
12.05.2017 10:19:14
| 25,200 |
98fdbf5c54d929bcfeb359126398833033d9ac0c
|
Fix SecurityPoliciesFix migration rollback
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Migrations/201705032101231_SecurityPoliciesFix.cs",
"new_path": "src/NuGetGallery/Migrations/201705032101231_SecurityPoliciesFix.cs",
"diff": "@@ -7,7 +7,7 @@ public partial class SecurityPoliciesFix : DbMigration\n{\npublic override void Up()\n{\n- DropUserSecurityPoliciesIfExists();\n+ Sql(\"IF OBJECT_ID('dbo.UserSecurityPolicies', 'U') IS NOT NULL DROP TABLE [dbo].[UserSecurityPolicies]\");\nCreateTable(\n\"dbo.UserSecurityPolicies\",\n@@ -29,16 +29,17 @@ public override void Down()\nDropForeignKey(\"dbo.UserSecurityPolicies\", \"UserKey\", \"dbo.Users\");\nDropIndex(\"dbo.UserSecurityPolicies\", new[] { \"UserKey\" });\nDropTable(\"dbo.UserSecurityPolicies\");\n- }\n- private void DropUserSecurityPoliciesIfExists()\n- {\n- try\n+ // revert to previous migration.\n+ CreateTable(\"UserSecurityPolicies\", c => new\n{\n- DropForeignKey(\"dbo.UserSecurityPolicies\", \"UserKey\", \"dbo.Users\");\n- DropTable(\"dbo.UserSecurityPolicies\");\n- }\n- catch (Exception) { }\n+ Key = c.Int(nullable: false, identity: true),\n+ Name = c.String(nullable: false, maxLength: 256),\n+ UserKey = c.Int(nullable: false),\n+ Value = c.String(nullable: true, maxLength: 256)\n+ })\n+ .PrimaryKey(t => t.Key)\n+ .ForeignKey(\"Users\", t => t.UserKey);\n}\n}\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Fix SecurityPoliciesFix migration rollback (#3944)
|
455,737 |
12.05.2017 11:26:27
| 25,200 |
ce1bf4e81584455d1389b00ecff3573f7098195f
|
Update CSS to show focused elements.
Move some css around to try to limit visual impact of change.
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Content/Site.css",
"new_path": "src/NuGetGallery/Content/Site.css",
"diff": "@@ -239,6 +239,10 @@ th {\npadding: 5px;\n}\n+:focus {\n+ outline: #ff9600 solid 2px;\n+}\n+\n/* Logo */\n#logo {\n@@ -1130,7 +1134,6 @@ a.btn {\nfont: inherit;\ncursor: pointer;\ncolor: #0071bc;\n- outline: none;\ntext-decoration: none;\nbox-shadow: none;\n}\n@@ -1139,6 +1142,10 @@ a.btn {\ntext-decoration: underline;\n}\n+ .btn.btn-veryflat:not(:focus) {\n+ outline: none;\n+ }\n+\na:hover.btn {\ncolor: white;\ntext-decoration: none;\n@@ -1173,7 +1180,6 @@ input[type=\"submit\"]:hover, .btn:hover {\n-\n.form a.cancel {\nfont-size: 1.25em;\n}\n@@ -1270,6 +1276,10 @@ input[type=\"submit\"]:hover, .btn:hover {\npadding: 0.25em;\n}\n+ .btn.btn-big:focus {\n+ outline: #ff9600 solid 2px;\n+ }\n+\n.verticalSeparator {\ndisplay: inline-block;\nvertical-align: middle;\n@@ -1512,8 +1522,7 @@ img.contributors-contributor-avatar {\n}\n/* Details table*/\n-.details-table\n-{\n+.details-table {\ntable-layout: fixed;\nborder-spacing: 0px;\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Update CSS to show focused elements.
Move some css around to try to limit visual impact of change. (#3939)
|
455,776 |
12.05.2017 12:42:43
| 25,200 |
319bc7957ab8fffee756117d2f8bed223898445d
|
Make PackageDownloadsDetail and PackageDownloadsByVersion graphs update without refreshing the page
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Start/Routes.cs",
"new_path": "src/NuGetGallery/App_Start/Routes.cs",
"diff": "@@ -69,11 +69,21 @@ public static void RegisterUIRoutes(RouteCollection routes)\n\"stats/packages/{id}/{version}\",\nnew { controller = \"Statistics\", action = \"PackageDownloadsDetail\" });\n+ routes.MapRoute(\n+ RouteName.StatisticsPackageDownloadsDetailReport,\n+ \"stats/reports/packages/{id}/{version}\",\n+ new { controller = \"Statistics\", action = \"PackageDownloadsDetailReport\" });\n+\nroutes.MapRoute(\nRouteName.StatisticsPackageDownloadsByVersion,\n\"stats/packages/{id}\",\nnew { controller = \"Statistics\", action = \"PackageDownloadsByVersion\" });\n+ routes.MapRoute(\n+ RouteName.StatisticsPackageDownloadsByVersionReport,\n+ \"stats/reports/packages/{id}\",\n+ new { controller = \"Statistics\", action = \"PackageDownloadsByVersionReport\" });\n+\nroutes.MapRoute(\nRouteName.JsonApi,\n\"json/{action}\",\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/StatisticsController.cs",
"new_path": "src/NuGetGallery/Controllers/StatisticsController.cs",
"diff": "@@ -149,7 +149,7 @@ public virtual async Task<ActionResult> PackageVersions()\n}\n//\n- // GET: /stats/package/{id}\n+ // GET: /stats/packages/{id}\npublic virtual async Task<ActionResult> PackageDownloadsByVersion(string id, string[] groupby)\n{\n@@ -158,26 +158,45 @@ public virtual async Task<ActionResult> PackageDownloadsByVersion(string id, str\nreturn new HttpStatusCodeResult(HttpStatusCode.NotFound);\n}\n- StatisticsPackagesReport report = null;\n- try\n- {\n- report = await _statisticsService.GetPackageDownloadsByVersion(id);\n+ var report = await GetPackageDownloadsByVersionReport(id, groupby);\n- ProcessReport(report, groupby, PackageDownloadsByVersionDimensions, id);\n+ var model = new StatisticsPackagesViewModel();\n+\n+ model.SetPackageDownloadsByVersion(id);\n+\n+ model.UseD3 = UseD3();\n+\n+ return View(model);\n}\n- catch (StatisticsReportNotFoundException)\n+\n+ //\n+ // GET: /stats/reports/packages/{id}\n+\n+ public virtual async Task<ActionResult> PackageDownloadsByVersionReport(string id, string[] groupby)\n{\n- // no report found\n+ if (_statisticsService == NullStatisticsService.Instance)\n+ {\n+ return new HttpStatusCodeResult(HttpStatusCode.NotFound);\n}\n- if (report != null)\n+ return Json(await GetPackageDownloadsByVersionReport(id, groupby), JsonRequestBehavior.AllowGet);\n+ }\n+\n+ //\n+ // GET: /stats/packages/{id}/{version}\n+\n+ public virtual async Task<ActionResult> PackageDownloadsDetail(string id, string version, string[] groupby)\n{\n- report.Id = MakeReportId(groupby);\n+ if (_statisticsService == NullStatisticsService.Instance)\n+ {\n+ return new HttpStatusCodeResult(HttpStatusCode.NotFound);\n}\n- StatisticsPackagesViewModel model = new StatisticsPackagesViewModel();\n+ var report = await GetPackageDownloadsDetailReport(id, version, groupby);\n- model.SetPackageDownloadsByVersion(id, report);\n+ var model = new StatisticsPackagesViewModel();\n+\n+ model.SetPackageVersionDownloadsByClient(id, version);\nmodel.UseD3 = UseD3();\n@@ -185,21 +204,33 @@ public virtual async Task<ActionResult> PackageDownloadsByVersion(string id, str\n}\n//\n- // GET: /stats/package/{id}/{version}\n+ // GET: /stats/reports/packages/{id}/{version}\n- public virtual async Task<ActionResult> PackageDownloadsDetail(string id, string version, string[] groupby)\n+ public virtual async Task<ActionResult> PackageDownloadsDetailReport(string id, string version, string[] groupby)\n{\nif (_statisticsService == NullStatisticsService.Instance)\n{\nreturn new HttpStatusCodeResult(HttpStatusCode.NotFound);\n}\n+ var report = await GetPackageDownloadsDetailReport(id, version, groupby);\n+\n+ if (report != null)\n+ {\n+ report.Id = MakeReportId(groupby);\n+ }\n+\n+ return Json(report, JsonRequestBehavior.AllowGet);\n+ }\n+\n+ private async Task<StatisticsPackagesReport> GetPackageDownloadsByVersionReport(string id, string[] groupby)\n+ {\nStatisticsPackagesReport report = null;\ntry\n{\n- report = await _statisticsService.GetPackageVersionDownloadsByClient(id, version);\n+ report = await _statisticsService.GetPackageDownloadsByVersion(id);\n- ProcessReport(report, groupby, PackageDownloadsDetailDimensions, null);\n+ ProcessReport(report, groupby, PackageDownloadsByVersionDimensions, id);\n}\ncatch (StatisticsReportNotFoundException)\n{\n@@ -211,13 +242,29 @@ public virtual async Task<ActionResult> PackageDownloadsDetail(string id, string\nreport.Id = MakeReportId(groupby);\n}\n- var model = new StatisticsPackagesViewModel();\n+ return report;\n+ }\n+\n+ private async Task<StatisticsPackagesReport> GetPackageDownloadsDetailReport(string id, string version, string[] groupby)\n+ {\n+ StatisticsPackagesReport report = null;\n+ try\n+ {\n+ report = await _statisticsService.GetPackageVersionDownloadsByClient(id, version);\n- model.SetPackageVersionDownloadsByClient(id, version, report);\n+ ProcessReport(report, groupby, PackageDownloadsDetailDimensions, null);\n+ }\n+ catch (StatisticsReportNotFoundException)\n+ {\n+ // no report found\n+ }\n- model.UseD3 = UseD3();\n+ if (report != null)\n+ {\n+ report.Id = MakeReportId(groupby);\n+ }\n- return View(model);\n+ return report;\n}\nprivate void ProcessReport(StatisticsPackagesReport report, string[] groupby, string[] dimensions, string id)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/RouteNames.cs",
"new_path": "src/NuGetGallery/RouteNames.cs",
"diff": "@@ -47,7 +47,9 @@ public static class RouteName\npublic const string StatisticsPackages = \"StatisticsPackages\";\npublic const string StatisticsPackageVersions = \"StatisticsPackageVersions\";\npublic const string StatisticsPackageDownloadsByVersion = \"StatisticsPackageDownloadsByVersion\";\n+ public const string StatisticsPackageDownloadsByVersionReport = \"StatisticsPackageDownloadsByVersionReport\";\npublic const string StatisticsPackageDownloadsDetail = \"StatisticsPackageDownloadsDetail\";\n+ public const string StatisticsPackageDownloadsDetailReport = \"StatisticsPackageDownloadsDetailReport\";\npublic const string StatisticsDownloadsApi = \"StatisticsDownloadsApi\";\npublic const string LegacyRegister = \"LegacyRegister\";\npublic const string LegacyRegister2 = \"LegacyRegister2\";\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/StatisticsPackagesViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/StatisticsPackagesViewModel.cs",
"diff": "@@ -28,8 +28,6 @@ public StatisticsPackagesViewModel()\npublic IEnumerable<StatisticsWeeklyUsageItem> Last6Weeks { get; set; }\n- public StatisticsPackagesReport Report { get; private set; }\n-\npublic bool IsDownloadPackageAvailable { get; set; }\npublic bool IsDownloadPackageDetailAvailable { get; set; }\n@@ -40,8 +38,6 @@ public StatisticsPackagesViewModel()\npublic int NuGetClientVersionTotalDownloads { get; private set; }\n- public bool IsReportAvailable { get { return (Report != null); } }\n-\npublic string PackageId { get; private set; }\npublic string PackageVersion { get; private set; }\n@@ -50,21 +46,19 @@ public StatisticsPackagesViewModel()\npublic DateTime? LastUpdatedUtc\n{\n- get { return Report == null ? _lastUpdatedUtc : Report.LastUpdatedUtc; }\n+ get { return _lastUpdatedUtc; }\nset { _lastUpdatedUtc = value; }\n}\n- public void SetPackageDownloadsByVersion(string packageId, StatisticsPackagesReport report)\n+ public void SetPackageDownloadsByVersion(string packageId)\n{\nPackageId = packageId;\n- Report = report;\n}\n- public void SetPackageVersionDownloadsByClient(string packageId, string packageVersion, StatisticsPackagesReport report)\n+ public void SetPackageVersionDownloadsByClient(string packageId, string packageVersion)\n{\nPackageId = packageId;\nPackageVersion = packageVersion;\n- Report = report;\n}\n[System.Diagnostics.CodeAnalysis.SuppressMessage(\"Microsoft.Performance\", \"CA1822:MarkMembersAsStatic\", Justification = \"We want to be able to use this easily in the related view.\")]\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Statistics/PackageDownloadsByVersion.cshtml",
"new_path": "src/NuGetGallery/Views/Statistics/PackageDownloadsByVersion.cshtml",
"diff": "ViewBag.Tab = \"Statistics\";\n}\n-@if (Model.IsReportAvailable && Model.Report != null)\n-{\n- <h1 class=\"statistics-report-title\">Package Downloads for <a href=\"@Url.Package(Model.PackageId)\">@Model.PackageId</a> (@Model.Report.Total over the Last 6 Weeks)</h1>\n- @Html.Partial(\"_LastUpdated\", Model)\n- @Html.Partial(\"_PivotTable\", Model.Report)\n-}\n-else\n-{\n- <h1 class=\"statistics-report-title\">Package Downloads for <a href=\"@Url.Package(Model.PackageId)\">@Model.PackageId</a></h1>\n- <p>\n- Download statistics are not currently available for this package, please check back later.\n- </p>\n-}\n+@Html.Partial(\"_PivotTable\")\n@section BottomScripts\n{\n+ <script src=\"@Url.Content(\"~/Scripts/knockout-2.2.1.js\")\"></script>\n+ <script src=\"@Url.Content(\"~/Scripts/moment.js\")\"></script>\n@if (Model.UseD3)\n{\n@Scripts.Render(\"~/Scripts/d3.v3.min.js\")\n@@ -29,22 +19,7 @@ else\n<script>\n$(document)\n.ready(function () {\n- groupbyNavigation();\n- packageDisplayGraphs();\n-\n- @if (Model.IsReportAvailable)\n- {\n- <text>\n- if ($('.dimension-checkbox:checked').length == 0) {\n- var search = location.search.toLowerCase();\n- if (search.indexOf('groupby=@Constants.StatisticsDimensions.ClientName.ToLowerInvariant()') >= 0 ||\n- search.indexOf('groupby=@Constants.StatisticsDimensions.ClientVersion.ToLowerInvariant()') >= 0 ||\n- search.indexOf('groupby=@Constants.StatisticsDimensions.Operation.ToLowerInvariant()') >= 0) {\n- location.reload();\n- }\n- }\n- </text>\n- }\n+ renderGraph('@Url.Action(\"PackageDownloadsByVersionReport\", \"Statistics\")', location.search);\n});\n</script>\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Statistics/PackageDownloadsDetail.cshtml",
"new_path": "src/NuGetGallery/Views/Statistics/PackageDownloadsDetail.cshtml",
"diff": "ViewBag.Tab = \"Statistics\";\n}\n-@if (Model.IsReportAvailable)\n-{\n- <h1 class=\"statistics-report-title\">Package Downloads for <a href=\"@Url.Package(Model.PackageId, Model.PackageVersion)\">@Model.PackageId @Model.PackageVersion</a> (@Model.Report.Total over the Last 6 Weeks)</h1>\n- @Html.Partial(\"_LastUpdated\", Model)\n- @Html.Partial(\"_PivotTable\", Model.Report)\n-}\n-else\n-{\n- <h1 class=\"statistics-report-title\">Package Downloads for <a href=\"@Url.Package(Model.PackageId, Model.PackageVersion)\">@Model.PackageId @Model.PackageVersion</a></h1>\n- <p>\n- Download statistics are not currently available for this package, please check back later.\n- </p>\n-}\n+@Html.Partial(\"_PivotTable\")\n@section BottomScripts\n{\n+ <script src=\"@Url.Content(\"~/Scripts/knockout-2.2.1.js\")\"></script>\n+ <script src=\"@Url.Content(\"~/Scripts/moment.js\")\"></script>\n@if (Model.UseD3)\n{\n@Scripts.Render(\"~/Scripts/d3.v3.min.js\")\n@@ -29,23 +19,7 @@ else\n<script>\n$(document)\n.ready(function () {\n- groupbyNavigation();\n- packageDisplayGraphs();\n-\n- @if (Model.IsReportAvailable)\n- {\n- <text>\n- if ($('.dimension-checkbox:checked').length == 0) {\n- var search = location.search.toLowerCase();\n- if (search.indexOf('groupby=@Constants.StatisticsDimensions.Version.ToLowerInvariant()') >= 0 ||\n- search.indexOf('groupby=@Constants.StatisticsDimensions.ClientName.ToLowerInvariant()') >= 0 ||\n- search.indexOf('groupby=@Constants.StatisticsDimensions.ClientVersion.ToLowerInvariant()') >= 0 ||\n- search.indexOf('groupby=@Constants.StatisticsDimensions.Operation.ToLowerInvariant()') >= 0) {\n- location.reload();\n- }\n- }\n- </text>\n- }\n+ renderGraph('@Url.Action(\"PackageDownloadsDetailReport\", \"Statistics\")', location.search);\n});\n</script>\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/StatisticsControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/StatisticsControllerFacts.cs",
"diff": "using System.Web.Mvc;\nusing System.Web.Routing;\nusing Moq;\n+using Newtonsoft.Json;\nusing Newtonsoft.Json.Linq;\nusing Xunit;\n@@ -340,6 +341,22 @@ public async void StatisticsHomePage_PackageVersions_ValidateReportStructureAndA\nAssert.Equal(updatedUtc, model.LastUpdatedUtc.Value);\n}\n+ [Fact]\n+ public async void StatisticsHomePage_Per_Package_ValidateModel()\n+ {\n+ string PackageId = \"A\";\n+\n+ var fakeReportService = new Mock<IReportService>();\n+\n+ var controller = new StatisticsController(new JsonStatisticsService(fakeReportService.Object));\n+\n+ TestUtility.SetupUrlHelperForUrlGeneration(controller, new Uri(\"http://nuget.org\"));\n+\n+ var model = (StatisticsPackagesViewModel)((ViewResult)await controller.PackageDownloadsByVersion(PackageId, new[] { Constants.StatisticsDimensions.Version })).Model;\n+\n+ Assert.Equal(PackageId, model.PackageId);\n+ }\n+\n[Fact]\npublic async void StatisticsHomePage_Per_Package_ValidateReportStructureAndAvailability()\n{\n@@ -407,19 +424,19 @@ public async void StatisticsHomePage_Per_Package_ValidateReportStructureAndAvail\nTestUtility.SetupUrlHelperForUrlGeneration(controller, new Uri(\"http://nuget.org\"));\n- var model = (StatisticsPackagesViewModel)((ViewResult)await controller.PackageDownloadsByVersion(PackageId, new[] { Constants.StatisticsDimensions.Version })).Model;\n+ var actualReport = (StatisticsPackagesReport)((JsonResult)await controller.PackageDownloadsByVersionReport(PackageId, new[] { Constants.StatisticsDimensions.Version })).Data;\nint sum = 0;\n- foreach (var row in model.Report.Table)\n+ foreach (var row in actualReport.Table)\n{\nsum += int.Parse(row[row.GetLength(0) - 1].Data);\n}\nAssert.Equal(603, sum);\n- Assert.Equal(\"603\", model.Report.Total);\n- Assert.True(model.LastUpdatedUtc.HasValue);\n- Assert.Equal(updatedUtc, model.LastUpdatedUtc.Value);\n+ Assert.Equal(\"603\", actualReport.Total);\n+ Assert.True(actualReport.LastUpdatedUtc.HasValue);\n+ Assert.Equal(updatedUtc, actualReport.LastUpdatedUtc.Value);\n}\n[Fact]\n@@ -491,20 +508,38 @@ public async void StatisticsHomePage_Per_Package_ValidateReportStructureAndAvail\nvar invalidDimension = \"this_dimension_does_not_exist\";\n- var model = (StatisticsPackagesViewModel)((ViewResult)await controller.PackageDownloadsByVersion(PackageId, new[] { Constants.StatisticsDimensions.Version, invalidDimension })).Model;\n+ var actualReport = (StatisticsPackagesReport)((JsonResult)await controller.PackageDownloadsByVersionReport(PackageId, new[] { Constants.StatisticsDimensions.Version, invalidDimension })).Data;\nint sum = 0;\n- foreach (var row in model.Report.Table)\n+ foreach (var row in actualReport.Table)\n{\nsum += int.Parse(row[row.GetLength(0) - 1].Data);\n}\nAssert.Equal(603, sum);\n- Assert.Equal(\"603\", model.Report.Total);\n- Assert.True(model.LastUpdatedUtc.HasValue);\n- Assert.Equal(updatedUtc, model.LastUpdatedUtc.Value);\n- Assert.DoesNotContain(invalidDimension, model.Report.Columns);\n+ Assert.Equal(\"603\", actualReport.Total);\n+ Assert.True(actualReport.LastUpdatedUtc.HasValue);\n+ Assert.Equal(updatedUtc, actualReport.LastUpdatedUtc.Value);\n+ Assert.DoesNotContain(invalidDimension, actualReport.Columns);\n+ }\n+\n+ [Fact]\n+ public async void Statistics_By_Client_Operation_ValidateModel()\n+ {\n+ string PackageId = \"A\";\n+ string PackageVersion = \"2.0\";\n+\n+ var fakeReportService = new Mock<IReportService>();\n+\n+ var controller = new StatisticsController(new JsonStatisticsService(fakeReportService.Object));\n+\n+ TestUtility.SetupUrlHelperForUrlGeneration(controller, new Uri(\"http://nuget.org\"));\n+\n+ var model = (StatisticsPackagesViewModel)((ViewResult)await controller.PackageDownloadsDetail(PackageId, PackageVersion, new string[] { \"ClientName\" })).Model;\n+\n+ Assert.Equal(PackageId, model.PackageId);\n+ Assert.Equal(PackageVersion, model.PackageVersion);\n}\n[Fact]\n@@ -575,19 +610,19 @@ public async void Statistics_By_Client_Operation_ValidateReportStructureAndAvail\nTestUtility.SetupUrlHelperForUrlGeneration(controller, new Uri(\"http://nuget.org\"));\n- var model = (StatisticsPackagesViewModel)((ViewResult)await controller.PackageDownloadsDetail(PackageId, PackageVersion, new string[] { \"ClientName\" })).Model;\n+ var actualReport = (StatisticsPackagesReport)((JsonResult)await controller.PackageDownloadsDetailReport(PackageId, PackageVersion, new string[] { \"ClientName\" })).Data;\nint sum = 0;\n- foreach (var row in model.Report.Table)\n+ foreach (var row in actualReport.Table)\n{\nsum += int.Parse(row[row.GetLength(0) - 1].Data);\n}\nAssert.Equal(502, sum);\n- Assert.Equal(\"502\", model.Report.Total);\n- Assert.True(model.LastUpdatedUtc.HasValue);\n- Assert.Equal(updatedUtc, model.LastUpdatedUtc.Value);\n+ Assert.Equal(\"502\", actualReport.Total);\n+ Assert.True(actualReport.LastUpdatedUtc.HasValue);\n+ Assert.Equal(updatedUtc, actualReport.LastUpdatedUtc.Value);\n}\npublic class TheTotalsAllAction\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Make PackageDownloadsDetail and PackageDownloadsByVersion graphs update without refreshing the page (#3951)
|
455,772 |
16.05.2017 11:42:37
| 25,200 |
6a7b75ca8b126dab0b279e135af8b4981e2cf1b9
|
Fix: "Example glob patterns" button and "close" button are not accessible using keyboard
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/ApiKeys.cshtml",
"new_path": "src/NuGetGallery/Views/Users/ApiKeys.cshtml",
"diff": "<a href=\"#\" class=\"globHelpLink\">Example glob patterns</a>.\n<div class=\"popup\">\n<div class=\"popupbox\" id=\"addapikeypopup\">\n- <a class=\"boxclose\"><i class=\"icon-remove\"></i></a>\n+ <a href=\"#\" class=\"boxclose\"><i class=\"icon-remove\"></i></a>\n<div class=\"innertext\">\nA glob pattern allows you to replace any sequence of characters with '*'.\n<h5>Example glob patterns</h5>\n$('.boxclose')\n.click(function () {\n$(this).parent().hide();\n+ // Prevent page jump\n+ return false;\n});\n$('.globHelpLink')\n.click(function () {\n$(this).next().find('.popupbox').show();\n+ // Prevent page jump\n+ return false;\n});\n}\n</script>\npopupboxDiv.className = \"popupbox editapikeypopup\";\nvar boxclose = document.createElement(\"a\");\nboxclose.className = \"boxclose\";\n+ boxclose.href = \"#\";\nvar iconRemove = document.createElement(\"i\");\niconRemove.className = \"icon-remove\";\nboxclose.appendChild(iconRemove);\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Fix: "Example glob patterns" button and "close" button are not accessible using keyboard (#3968)
|
455,794 |
03.05.2017 09:37:49
| 25,200 |
9ea30662817b8f5da7f3c61c6fabbb1449abc812
|
Key creation telemetry
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/ApiController.cs",
"new_path": "src/NuGetGallery/Controllers/ApiController.cs",
"diff": "using System.IO.Compression;\nusing System.Linq;\nusing System.Net;\n-using System.Security.Claims;\nusing System.Threading.Tasks;\nusing System.Web.Mvc;\nusing System.Web.UI;\n@@ -198,14 +197,6 @@ public async virtual Task<ActionResult> Status()\nreturn await StatusService.GetStatus();\n}\n- private Credential GetCurrentCredential(User user)\n- {\n- var identity = User.Identity as ClaimsIdentity;\n- var apiKey = identity.GetClaimOrDefault(NuGetClaims.ApiKey);\n-\n- return user.Credentials.FirstOrDefault(c => c.Value == apiKey);\n- }\n-\n[HttpPost]\n[RequireSsl]\n[ApiAuthorize]\n@@ -239,7 +230,7 @@ public async virtual Task<ActionResult> CreatePackageVerificationKeyAsync(string\npublic async virtual Task<ActionResult> VerifyPackageKeyAsync(string id, string version)\n{\nvar user = GetCurrentUser();\n- var credential = GetCurrentCredential(user);\n+ var credential = user.GetCurrentApiKeyCredential(User.Identity);\nvar result = VerifyPackageKeyInternal(user, credential, id, version);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ExtensionMethods.cs",
"new_path": "src/NuGetGallery/ExtensionMethods.cs",
"diff": "@@ -453,6 +453,18 @@ public static User GetCurrentUser(this IOwinContext self)\nreturn user;\n}\n+ /// <summary>\n+ /// Get the current API key credential, if available.\n+ /// </summary>\n+ public static Credential GetCurrentApiKeyCredential(this User user, IIdentity identity)\n+ {\n+ var claimsIdentity = identity as ClaimsIdentity;\n+ var apiKey = claimsIdentity.GetClaimOrDefault(NuGetClaims.ApiKey);\n+\n+ return string.IsNullOrEmpty(apiKey) ? null\n+ : user.Credentials.FirstOrDefault(c => c.Value == apiKey);\n+ }\n+\nprivate static User LoadUser(IOwinContext context)\n{\nvar principal = context.Authentication.User;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/TelemetryService.cs",
"new_path": "src/NuGetGallery/Services/TelemetryService.cs",
"diff": "@@ -27,6 +27,7 @@ public class TelemetryService : ITelemetryService\npublic const string AccountCreationDate = \"AccountCreationDate\";\npublic const string ClientVersion = \"ClientVersion\";\npublic const string IsScoped = \"IsScoped\";\n+ public const string KeyCreationDate = \"KeyCreationDate\";\npublic const string PackageId = \"PackageId\";\npublic const string PackageVersion = \"PackageVersion\";\n@@ -69,6 +70,7 @@ public void TrackPackagePushEvent(Package package, User user, IIdentity identity\nproperties.Add(PackageVersion, package.Version);\nproperties.Add(AuthenticationMethod, identity.GetAuthenticationType());\nproperties.Add(AccountCreationDate, GetAccountCreationDate(user));\n+ properties.Add(KeyCreationDate, GetApiKeyCreationDate(user, identity));\nproperties.Add(IsScoped, identity.IsScopedAuthentication().ToString());\n});\n}\n@@ -90,6 +92,7 @@ public void TrackCreatePackageVerificationKeyEvent(string packageId, string pack\nproperties.Add(PackageId, packageId);\nproperties.Add(PackageVersion, packageVersion);\nproperties.Add(AccountCreationDate, GetAccountCreationDate(user));\n+ properties.Add(KeyCreationDate, GetApiKeyCreationDate(user, identity));\nproperties.Add(IsScoped, identity.IsScopedAuthentication().ToString());\n});\n}\n@@ -110,6 +113,7 @@ public void TrackVerifyPackageKeyEvent(string packageId, string packageVersion,\n{\nproperties.Add(PackageId, packageId);\nproperties.Add(PackageVersion, packageVersion);\n+ properties.Add(KeyCreationDate, GetApiKeyCreationDate(user, identity));\nproperties.Add(IsVerificationKeyUsed, identity.HasPackageVerifyScopeClaim().ToString());\nproperties.Add(VerifyPackageKeyStatusCode, statusCode.ToString());\n});\n@@ -125,6 +129,12 @@ private static string GetAccountCreationDate(User user)\nreturn user.CreatedUtc != null ? user.CreatedUtc.Value.ToString(\"o\") : \"N/A\";\n}\n+ private static string GetApiKeyCreationDate(User user, IIdentity identity)\n+ {\n+ var apiKey = user.GetCurrentApiKeyCredential(identity);\n+ return apiKey?.Created.ToString(\"o\") ?? \"N/A\";\n+ }\n+\nprivate static void TrackEvent(string eventName, Action<Dictionary<string, string>> addProperties)\n{\nvar telemetryProperties = new Dictionary<string, string>();\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/ExtensionMethodsFacts.cs",
"new_path": "tests/NuGetGallery.Facts/ExtensionMethodsFacts.cs",
"diff": "@@ -9,6 +9,47 @@ namespace NuGetGallery\n{\npublic class ExtensionMethodsFacts\n{\n+ public class TheGetCurrentApiKeyCredentialMethod\n+ {\n+ [Theory]\n+ [InlineData(\"apikey.v2\")]\n+ [InlineData(\"apikey.verify.v1\")]\n+ public void ReturnsApiKeyMatchingClaim(string credentialType)\n+ {\n+ // Arrange\n+ var user = new User(\"testuser\");\n+ user.Credentials.Add(new Credential(CredentialTypes.ApiKey.V2, \"A\"));\n+ user.Credentials.Add(new Credential(credentialType, \"B\"));\n+\n+ var identity = AuthenticationService.CreateIdentity(\n+ new User(\"testuser\"),\n+ AuthenticationTypes.ApiKey,\n+ new Claim(NuGetClaims.ApiKey, \"B\"));\n+\n+ // Act\n+ var credential = user.GetCurrentApiKeyCredential(identity);\n+\n+ // Assert\n+ Assert.Equal(\"B\", credential.Value);\n+ }\n+\n+ [Fact]\n+ public void ReturnsNullIfNoApiKeyClaim()\n+ {\n+ // Arrange\n+ var user = new User(\"testuser\");\n+ user.Credentials.Add(new Credential(CredentialTypes.ApiKey.V2, \"A\"));\n+ user.Credentials.Add(new Credential(CredentialTypes.ApiKey.V2, \"B\"));\n+\n+ var identity = AuthenticationService.CreateIdentity(\n+ new User(\"testuser\"),\n+ AuthenticationTypes.LocalUser);\n+\n+ // Act & Assert\n+ Assert.Null(user.GetCurrentApiKeyCredential(identity));\n+ }\n+ }\n+\npublic class TheHasPackageVerifyScopeClaimMethod\n{\n[Fact]\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Key creation telemetry (#3855)
|
455,794 |
15.05.2017 13:58:28
| 25,200 |
b6e424fe72aa38381207dc20555b9d2171c7b93b
|
Enable security policy functional tests
|
[
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests/PackageCreation/SecurityPolicyTests.cs",
"new_path": "tests/NuGetGallery.FunctionalTests/PackageCreation/SecurityPolicyTests.cs",
"diff": "@@ -23,17 +23,17 @@ public SecurityPolicyTests(ITestOutputHelper testOutputHelper)\n_clientSdkHelper = new ClientSdkHelper(TestOutputHelper);\n}\n- [Theory(Skip = \"Depends on TestSecurityPoliciesAccountApiKey account setup\")]\n+ [Theory]\n[InlineData(\"\")]\n[InlineData(\"3.5.0\")]\n[InlineData(\"4.1.0-beta\")]\n[Description(\"Package push fails if min client version policy not met\")]\n[Priority(1)]\n[Category(\"P1Tests\")]\n- public async Task PackagePushReturns400_RequireMinClientVersionPolicyNotMet(string clientVersion)\n+ public async Task PackagePush_Returns400IfRequireMinClientVersionPolicyNotMet(string clientVersion)\n{\n// Arrange\n- var id = $\"{nameof(PackagePushReturns400_RequireMinClientVersionPolicyNotMet)}.{DateTime.UtcNow.Ticks}\";\n+ var id = $\"{nameof(PackagePush_Returns400IfRequireMinClientVersionPolicyNotMet)}.{DateTime.UtcNow.Ticks}\";\n// Act\nvar response = await PushPackageAsync(EnvironmentSettings.TestSecurityPoliciesAccountApiKey, id, clientVersion);\n@@ -42,16 +42,16 @@ public async Task PackagePushReturns400_RequireMinClientVersionPolicyNotMet(stri\nAssert.Equal(HttpStatusCode.BadRequest, response.StatusCode);\n}\n- [Theory(Skip = \"Depends on TestSecurityPoliciesAccountApiKey account setup\")]\n+ [Theory]\n[InlineData(\"4.1.0\")]\n[InlineData(\"4.3.0-beta\")]\n[Description(\"Package push succeeds if min client version policy met\")]\n[Priority(1)]\n[Category(\"P1Tests\")]\n- public async Task PackagePushReturns200_RequireMinClientVersionPolicyMet(string clientVersion)\n+ public async Task PackagePush_Returns200IfRequireMinClientVersionPolicyMet(string clientVersion)\n{\n// Arrange\n- var id = $\"{nameof(PackagePushReturns200_RequireMinClientVersionPolicyMet)}.{DateTime.UtcNow.Ticks}\";\n+ var id = $\"{nameof(PackagePush_Returns200IfRequireMinClientVersionPolicyMet)}.{DateTime.UtcNow.Ticks}\";\n// Act\nvar response = await PushPackageAsync(EnvironmentSettings.TestSecurityPoliciesAccountApiKey, id, clientVersion);\n@@ -60,14 +60,14 @@ public async Task PackagePushReturns200_RequireMinClientVersionPolicyMet(string\nAssert.Equal(HttpStatusCode.Created, response.StatusCode);\n}\n- [Fact(Skip = \"Depends on TestSecurityPoliciesAccountApiKey account setup\")]\n+ [Fact]\n[Description(\"VerifyPackageKey fails if package verify policy not met\")]\n[Priority(1)]\n[Category(\"P1Tests\")]\n- public async Task VerifyPackageKeyReturns400_RequirePackageVerifyScopePolicyNotMet()\n+ public async Task VerifyPackageKey_Returns400IfRequirePackageVerifyScopePolicyNotMet()\n{\n// Arrange\n- var id = $\"{nameof(VerifyPackageKeyReturns400_RequirePackageVerifyScopePolicyNotMet)}.{DateTime.UtcNow.Ticks}\";\n+ var id = $\"{nameof(VerifyPackageKey_Returns400IfRequirePackageVerifyScopePolicyNotMet)}.{DateTime.UtcNow.Ticks}\";\nvar pushResponse = await PushPackageAsync(EnvironmentSettings.TestSecurityPoliciesAccountApiKey, id, \"4.1.0\");\nAssert.Equal(HttpStatusCode.Created, pushResponse.StatusCode);\n@@ -79,14 +79,14 @@ public async Task VerifyPackageKeyReturns400_RequirePackageVerifyScopePolicyNotM\nAssert.Equal(HttpStatusCode.BadRequest, verifyResponse);\n}\n- [Fact(Skip = \"Depends on TestSecurityPoliciesAccountApiKey account setup\")]\n+ [Fact]\n[Description(\"VerifyPackageKey succeeds if package verify policy met\")]\n[Priority(1)]\n[Category(\"P1Tests\")]\n- public async Task VerifyPackageKeyReturns200_RequirePackageVerifyScopePolicyMet()\n+ public async Task VerifyPackageKey_Returns200IfRequirePackageVerifyScopePolicyMet()\n{\n// Arrange\n- var id = $\"{nameof(VerifyPackageKeyReturns200_RequirePackageVerifyScopePolicyMet)}.{DateTime.UtcNow.Ticks}\";\n+ var id = $\"{nameof(VerifyPackageKey_Returns200IfRequirePackageVerifyScopePolicyMet)}.{DateTime.UtcNow.Ticks}\";\nvar pushResponse = await PushPackageAsync(EnvironmentSettings.TestSecurityPoliciesAccountApiKey, id, \"4.1.0\");\nAssert.Equal(HttpStatusCode.Created, pushResponse.StatusCode);\n@@ -104,7 +104,7 @@ public async Task VerifyPackageKeyReturns200_RequirePackageVerifyScopePolicyMet(\n[Description(\"VerifyPackageKey fails if package isn't found.\")]\n[Priority(1)]\n[Category(\"P1Tests\")]\n- public async Task VerifyPackageKeyReturns404ForMissingPackage()\n+ public async Task VerifyPackageKey_Returns404ForMissingPackage()\n{\nAssert.Equal(HttpStatusCode.NotFound, await VerifyPackageKey(EnvironmentSettings.TestAccountApiKey, \"VerifyPackageKeyReturns404ForMissingPackage\", \"1.0.0\"));\n}\n@@ -113,7 +113,7 @@ public async Task VerifyPackageKeyReturns404ForMissingPackage()\n[Description(\"VerifyPackageKey succeeds for full API key without deletion.\")]\n[Priority(1)]\n[Category(\"P1Tests\")]\n- public async Task VerifyPackageKeyReturns200ForFullApiKey()\n+ public async Task VerifyPackageKey_Returns200ForFullApiKey()\n{\n// Arrange\nvar packageId = $\"VerifyPackageKeyReturns200ForFullApiKey.{DateTimeOffset.UtcNow.Ticks}\";\n@@ -130,7 +130,7 @@ public async Task VerifyPackageKeyReturns200ForFullApiKey()\n[Description(\"VerifyPackageKey succeeds for temp API key with deletion.\")]\n[Priority(1)]\n[Category(\"P1Tests\")]\n- public async Task VerifyPackageKeyReturns200ForTempApiKey()\n+ public async Task VerifyPackageKey_Returns200ForTempApiKey()\n{\n// Arrange\nvar packageId = $\"VerifyPackageKeySupportsFullAndTempApiKeys.{DateTimeOffset.UtcNow.Ticks}\";\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Enable security policy functional tests (#3965)
|
455,751 |
17.05.2017 09:15:14
| 25,200 |
d1203e80f47caebeade2c44821bbfa1b2ed1225a
|
fix for 3828
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Infrastructure/ApplicationVersionHelper.cs",
"new_path": "src/NuGetGallery/Infrastructure/ApplicationVersionHelper.cs",
"diff": "@@ -48,7 +48,7 @@ public ApplicationVersion(Uri repositoryBase, string version, string branch, str\nif (repositoryBase != null)\n{\n- BranchUri = CombineUri(repositoryBase, \"branches/\" + branch);\n+ BranchUri = CombineUri(repositoryBase, \"tree/\" + branch);\nCommitUri = CombineUri(repositoryBase, \"commit/\" + ShortCommit);\n}\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
fix for 3828 (#3972)
|
455,794 |
17.05.2017 16:22:46
| 25,200 |
01d0a4a58614ddda96419926fb0d0dc9dfbb8bd4
|
Avoid separate context from policy service
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"new_path": "src/NuGetGallery/App_Start/DefaultDependenciesModule.cs",
"diff": "@@ -203,8 +203,9 @@ protected override void Load(ContainerBuilder builder)\n.InstancePerLifetimeScope();\nbuilder.RegisterType<SecurityPolicyService>()\n+ .AsSelf()\n.As<ISecurityPolicyService>()\n- .SingleInstance();\n+ .InstancePerLifetimeScope();\nbuilder.RegisterType<SecurePushSubscription>()\n.SingleInstance();\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Avoid separate context from policy service (#3982)
|
455,737 |
17.05.2017 16:38:13
| 25,200 |
3f25393bba2f04e0f808e2dcc22a41218d0d5d19
|
Allow auto outlining. Fix issue with outline on click.
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Content/Site.css",
"new_path": "src/NuGetGallery/Content/Site.css",
"diff": "@@ -156,6 +156,10 @@ a {\nborder: none;\n}\n+ a:focus {\n+ outline: auto;\n+ }\n+\nblockquote {\ncolor: #666;\nfont-style: italic;\n@@ -239,10 +243,6 @@ th {\npadding: 5px;\n}\n-:focus {\n- outline: #ff9600 solid 2px;\n-}\n-\n/* Logo */\n#logo {\n@@ -987,6 +987,12 @@ fieldset.form {\nborder-left: none;\n}\n+ .form-field input[type=\"checkbox\"]:focus,\n+ .form-field input[type=\"radio\"]:focus,\n+ .form-field input[type=\"file\"]:focus {\n+ outline: auto !important;\n+ }\n+\n.form-field input[type=\"url\"] {\nwidth: 100%;\n}\n@@ -1142,8 +1148,8 @@ a.btn {\ntext-decoration: underline;\n}\n- .btn.btn-veryflat:not(:focus) {\n- outline: none;\n+ .btn.btn-veryflat:focus {\n+ outline: auto;\n}\na:hover.btn {\n@@ -1193,6 +1199,10 @@ button, input[type=\"submit\"], .btn {\nmargin: 15px 0;\n}\n+.form input[type=\"submit\"]:focus {\n+ outline: auto;\n+}\n+\n.validation-summary-errors,\n.field-validation-error {\ncolor: #c13a3f;\n@@ -1277,7 +1287,7 @@ button, input[type=\"submit\"], .btn {\n}\n.btn.btn-big:focus {\n- outline: #ff9600 solid 2px;\n+ outline: auto;\n}\n.verticalSeparator {\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Allow auto outlining. Fix issue with outline on click. (#3983)
|
455,772 |
19.05.2017 08:50:54
| 25,200 |
eddf51462755170db90b002410f06741f43e3566
|
Parse tags list before comparing on package validation completion
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -1140,7 +1140,7 @@ public virtual async Task<ActionResult> VerifyPackage(VerifyPackageRequest formD\npendEdit = pendEdit || IsDifferent(formData.Edit.Description, packageMetadata.Description);\npendEdit = pendEdit || IsDifferent(formData.Edit.ReleaseNotes, packageMetadata.ReleaseNotes);\npendEdit = pendEdit || IsDifferent(formData.Edit.Summary, packageMetadata.Summary);\n- pendEdit = pendEdit || IsDifferent(formData.Edit.Tags, packageMetadata.Tags);\n+ pendEdit = pendEdit || IsDifferent(formData.Edit.Tags, PackageHelper.ParseTags(packageMetadata.Tags));\npendEdit = pendEdit || IsDifferent(formData.Edit.VersionTitle, packageMetadata.Title);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"diff": "@@ -1175,217 +1175,121 @@ public async Task WillRedirectToUploadPackagePageWhenThereIsNoUploadInProgress()\n[Fact]\npublic async Task WillPassThePackageIdToTheView()\n{\n- var fakeUploadFileService = new Mock<IUploadFileService>();\n- var fakeUploadFileStream = TestPackage.CreateTestPackageStream(\"theId\", \"1.0.0\");\n-\n- fakeUploadFileService.Setup(x => x.GetUploadFileAsync(TestUtility.FakeUser.Key)).Returns(Task.FromResult<Stream>(fakeUploadFileStream));\n- var controller = CreateController(\n- uploadFileService: fakeUploadFileService,\n- fakeNuGetPackage: fakeUploadFileStream);\n- controller.SetCurrentUser(TestUtility.FakeUser);\n-\n- var model = ((ViewResult)await controller.VerifyPackage()).Model as VerifyPackageRequest;\n-\n+ using (var fakeUploadFileStream = TestPackage.CreateTestPackageStream(\"theId\", \"1.0.0\"))\n+ {\n+ var model = await CreateVerifyPackageRequestForPackage(fakeUploadFileStream);\nAssert.Equal(\"theId\", model.Id);\n- fakeUploadFileStream.Dispose();\n+ }\n}\n[Fact]\npublic async Task WillPassThePackageVersionToTheView()\n{\n- var fakeUploadFileService = new Mock<IUploadFileService>();\n- var fakeUploadFileStream = TestPackage.CreateTestPackageStream(\"theId\", \"1.0.42\");\n- fakeUploadFileService.Setup(x => x.GetUploadFileAsync(TestUtility.FakeUser.Key)).Returns(Task.FromResult<Stream>(fakeUploadFileStream));\n-\n- var controller = CreateController(\n- uploadFileService: fakeUploadFileService,\n- fakeNuGetPackage: fakeUploadFileStream);\n- controller.SetCurrentUser(TestUtility.FakeUser);\n-\n- var model = ((ViewResult)await controller.VerifyPackage()).Model as VerifyPackageRequest;\n-\n+ using (var fakeUploadFileStream = TestPackage.CreateTestPackageStream(\"theId\", \"1.0.42\"))\n+ {\n+ var model = await CreateVerifyPackageRequestForPackage(fakeUploadFileStream);\nAssert.Equal(\"1.0.42\", model.Version);\n- fakeUploadFileStream.Dispose();\n+ }\n}\n[Fact]\npublic async Task WillPassThePackageTitleToTheView()\n{\n- var fakeUploadFileService = new Mock<IUploadFileService>();\n- var fakeUploadFileStream = TestPackage.CreateTestPackageStream(\"theId\", \"1.0.0\", title: \"theTitle\");\n- fakeUploadFileService.Setup(x => x.GetUploadFileAsync(TestUtility.FakeUser.Key)).Returns(Task.FromResult<Stream>(fakeUploadFileStream));\n-\n- var controller = CreateController(\n- uploadFileService: fakeUploadFileService,\n- fakeNuGetPackage: fakeUploadFileStream);\n- controller.SetCurrentUser(TestUtility.FakeUser);\n-\n- var model = ((ViewResult)await controller.VerifyPackage()).Model as VerifyPackageRequest;\n-\n+ using (var fakeUploadFileStream = TestPackage.CreateTestPackageStream(\"theId\", \"1.0.0\", title: \"theTitle\"))\n+ {\n+ var model = await CreateVerifyPackageRequestForPackage(fakeUploadFileStream);\nAssert.Equal(\"theTitle\", model.Edit.VersionTitle);\n- fakeUploadFileStream.Dispose();\n+ }\n}\n[Fact]\npublic async Task WillPassThePackageSummaryToTheView()\n{\n- var fakeUploadFileService = new Mock<IUploadFileService>();\n- var fakeUploadFileStream = TestPackage.CreateTestPackageStream(\"theId\", \"1.0.0\", summary: \"theSummary\");\n- fakeUploadFileService.Setup(x => x.GetUploadFileAsync(TestUtility.FakeUser.Key)).Returns(Task.FromResult<Stream>(fakeUploadFileStream));\n-\n- var controller = CreateController(\n- uploadFileService: fakeUploadFileService,\n- fakeNuGetPackage: fakeUploadFileStream);\n- controller.SetCurrentUser(TestUtility.FakeUser);\n-\n- var model = ((ViewResult)await controller.VerifyPackage()).Model as VerifyPackageRequest;\n-\n+ using (var fakeUploadFileStream = TestPackage.CreateTestPackageStream(\"theId\", \"1.0.0\", summary: \"theSummary\"))\n+ {\n+ var model = await CreateVerifyPackageRequestForPackage(fakeUploadFileStream);\nAssert.Equal(\"theSummary\", model.Edit.Summary);\n- fakeUploadFileStream.Dispose();\n+ }\n}\n[Fact]\npublic async Task WillPassThePackageDescriptionToTheView()\n{\n- var fakeUploadFileService = new Mock<IUploadFileService>();\n- var fakeUploadFileStream = TestPackage.CreateTestPackageStream(\"theId\", \"1.0.0\", description: \"theDescription\");\n- fakeUploadFileService.Setup(x => x.GetUploadFileAsync(TestUtility.FakeUser.Key)).Returns(Task.FromResult<Stream>(fakeUploadFileStream));\n-\n- var controller = CreateController(\n- uploadFileService: fakeUploadFileService,\n- fakeNuGetPackage: fakeUploadFileStream);\n- controller.SetCurrentUser(TestUtility.FakeUser);\n-\n- var model = ((ViewResult)await controller.VerifyPackage()).Model as VerifyPackageRequest;\n-\n+ using (var fakeUploadFileStream = TestPackage.CreateTestPackageStream(\"theId\", \"1.0.0\", description: \"theDescription\"))\n+ {\n+ var model = await CreateVerifyPackageRequestForPackage(fakeUploadFileStream);\nAssert.Equal(\"theDescription\", model.Edit.Description);\n- fakeUploadFileStream.Dispose();\n+ }\n}\n[Fact]\npublic async Task WillPassThePackageLicenseAcceptanceRequirementToTheView()\n{\n- var fakeUploadFileService = new Mock<IUploadFileService>();\n- var fakeUploadFileStream = TestPackage.CreateTestPackageStream(\"theId\", \"1.0.0\", requireLicenseAcceptance: true);\n- fakeUploadFileService.Setup(x => x.GetUploadFileAsync(TestUtility.FakeUser.Key)).Returns(Task.FromResult<Stream>(fakeUploadFileStream));\n-\n- var controller = CreateController(\n- uploadFileService: fakeUploadFileService,\n- fakeNuGetPackage: fakeUploadFileStream);\n- controller.SetCurrentUser(TestUtility.FakeUser);\n-\n- var model = ((ViewResult)await controller.VerifyPackage()).Model as VerifyPackageRequest;\n-\n+ using (var fakeUploadFileStream = TestPackage.CreateTestPackageStream(\"theId\", \"1.0.0\", requireLicenseAcceptance: true))\n+ {\n+ var model = await CreateVerifyPackageRequestForPackage(fakeUploadFileStream);\nAssert.True(model.Edit.RequiresLicenseAcceptance);\n- fakeUploadFileStream.Dispose();\n+ }\n}\n[Fact]\npublic async Task WillPassThePackageLicenseUrlToTheView()\n{\n- var fakeUploadFileService = new Mock<IUploadFileService>();\n- var fakeUploadFileStream = TestPackage.CreateTestPackageStream(\"theId\", \"1.0.0\", licenseUrl: new Uri(\"http://theLicenseUri\"));\n- fakeUploadFileService.Setup(x => x.GetUploadFileAsync(TestUtility.FakeUser.Key)).Returns(Task.FromResult<Stream>(fakeUploadFileStream));\n-\n- var controller = CreateController(\n- uploadFileService: fakeUploadFileService,\n- fakeNuGetPackage: fakeUploadFileStream);\n- controller.SetCurrentUser(TestUtility.FakeUser);\n-\n- var model = ((ViewResult)await controller.VerifyPackage()).Model as VerifyPackageRequest;\n-\n+ using (var fakeUploadFileStream = TestPackage.CreateTestPackageStream(\"theId\", \"1.0.0\", licenseUrl: new Uri(\"http://theLicenseUri\")))\n+ {\n+ var model = await CreateVerifyPackageRequestForPackage(fakeUploadFileStream);\nAssert.Equal(\"http://thelicenseuri/\", model.LicenseUrl);\n- fakeUploadFileStream.Dispose();\n+ }\n}\n[Fact]\npublic async Task WillPassThePackageTagsToTheView()\n{\n- var fakeUploadFileService = new Mock<IUploadFileService>();\n- var fakeUploadFileStream = TestPackage.CreateTestPackageStream(\"theId\", \"1.0.0\", tags: \"theTags\");\n- fakeUploadFileService.Setup(x => x.GetUploadFileAsync(TestUtility.FakeUser.Key)).Returns(Task.FromResult<Stream>(fakeUploadFileStream));\n-\n- var controller = CreateController(\n- uploadFileService: fakeUploadFileService,\n- fakeNuGetPackage: fakeUploadFileStream);\n- controller.SetCurrentUser(TestUtility.FakeUser);\n-\n- var model = ((ViewResult)await controller.VerifyPackage()).Model as VerifyPackageRequest;\n-\n+ using(var fakeUploadFileStream = TestPackage.CreateTestPackageStream(\"theId\", \"1.0.0\", tags: \"theTags\"))\n+ {\n+ var model = await CreateVerifyPackageRequestForPackage(fakeUploadFileStream);\nAssert.Equal(\"theTags\", model.Edit.Tags);\n- fakeUploadFileStream.Dispose();\n+ }\n}\n[Fact]\npublic async Task WillPassThePackageProjectUrlToTheView()\n{\n- var fakeUploadFileService = new Mock<IUploadFileService>();\n- var fakeUploadFileStream = TestPackage.CreateTestPackageStream(\"theId\", \"1.0.0\", projectUrl: new Uri(\"http://theProjectUri\"));\n- fakeUploadFileService.Setup(x => x.GetUploadFileAsync(TestUtility.FakeUser.Key)).Returns(Task.FromResult<Stream>(fakeUploadFileStream));\n-\n- var controller = CreateController(\n- uploadFileService: fakeUploadFileService,\n- fakeNuGetPackage: fakeUploadFileStream);\n- controller.SetCurrentUser(TestUtility.FakeUser);\n-\n- var model = ((ViewResult)await controller.VerifyPackage()).Model as VerifyPackageRequest;\n-\n+ using (var fakeUploadFileStream = TestPackage.CreateTestPackageStream(\"theId\", \"1.0.0\", projectUrl: new Uri(\"http://theProjectUri\")))\n+ {\n+ var model = await CreateVerifyPackageRequestForPackage(fakeUploadFileStream);\nAssert.Equal(\"http://theprojecturi/\", model.Edit.ProjectUrl);\n- fakeUploadFileStream.Dispose();\n+ }\n}\n[Fact]\npublic async Task WillPassThePackagAuthorsToTheView()\n{\n- var fakeUploadFileService = new Mock<IUploadFileService>();\n- var fakeUploadFileStream = TestPackage.CreateTestPackageStream(\"theId\", \"1.0.0\", authors: \"firstAuthor, secondAuthor\");\n- fakeUploadFileService.Setup(x => x.GetUploadFileAsync(TestUtility.FakeUser.Key)).Returns(Task.FromResult<Stream>(fakeUploadFileStream));\n-\n- var controller = CreateController(\n- uploadFileService: fakeUploadFileService,\n- fakeNuGetPackage: fakeUploadFileStream);\n- controller.SetCurrentUser(TestUtility.FakeUser);\n-\n- var model = ((ViewResult)await controller.VerifyPackage()).Model as VerifyPackageRequest;\n-\n+ using (var fakeUploadFileStream = TestPackage.CreateTestPackageStream(\"theId\", \"1.0.0\", authors: \"firstAuthor, secondAuthor\"))\n+ {\n+ var model = await CreateVerifyPackageRequestForPackage(fakeUploadFileStream);\nAssert.Equal(\"firstAuthor, secondAuthor\", model.Edit.Authors);\n- fakeUploadFileStream.Dispose();\n+ }\n}\n[Fact]\npublic async Task WillPassMinClientVersionToTheView()\n{\n- var fakeUploadFileService = new Mock<IUploadFileService>();\n- var fakeUploadFileStream = TestPackage.CreateTestPackageStream(\"theId\", \"1.0.0\", minClientVersion: \"1.2.3\");\n- fakeUploadFileService.Setup(x => x.GetUploadFileAsync(TestUtility.FakeUser.Key)).Returns(Task.FromResult<Stream>(fakeUploadFileStream));\n-\n- var controller = CreateController(\n- uploadFileService: fakeUploadFileService,\n- fakeNuGetPackage: fakeUploadFileStream);\n- controller.SetCurrentUser(TestUtility.FakeUser);\n-\n- var model = ((ViewResult)await controller.VerifyPackage()).Model as VerifyPackageRequest;\n-\n+ using (var fakeUploadFileStream = TestPackage.CreateTestPackageStream(\"theId\", \"1.0.0\", minClientVersion: \"1.2.3\"))\n+ {\n+ var model = await CreateVerifyPackageRequestForPackage(fakeUploadFileStream);\nAssert.Equal(new NuGetVersion(1, 2, 3, 0), model.MinClientVersion);\n- fakeUploadFileStream.Dispose();\n+ }\n}\n[Fact]\npublic async Task WillPassLanguageToTheView()\n{\n- var fakeUploadFileService = new Mock<IUploadFileService>();\n- var fakeUploadFileStream = TestPackage.CreateTestPackageStream(\"theId\", \"1.0.0\", language: \"de-DE\");\n- fakeUploadFileService.Setup(x => x.GetUploadFileAsync(TestUtility.FakeUser.Key)).Returns(Task.FromResult<Stream>(fakeUploadFileStream));\n-\n- var controller = CreateController(\n- uploadFileService: fakeUploadFileService,\n- fakeNuGetPackage: fakeUploadFileStream);\n- controller.SetCurrentUser(TestUtility.FakeUser);\n-\n- var model = ((ViewResult)await controller.VerifyPackage()).Model as VerifyPackageRequest;\n-\n+ using (var fakeUploadFileStream = TestPackage.CreateTestPackageStream(\"theId\", \"1.0.0\", language: \"de-DE\"))\n+ {\n+ var model = await CreateVerifyPackageRequestForPackage(fakeUploadFileStream);\nAssert.Equal(\"de-DE\", model.Language);\n- fakeUploadFileStream.Dispose();\n+ }\n}\n[Fact]\n@@ -1417,23 +1321,28 @@ public async Task WillPassDependenciesToTheView()\n})\n};\n+ using (var fakeUploadFileStream = TestPackage.CreateTestPackageStream(\"theId\", \"1.0.0\", packageDependencyGroups: dependencyGroups))\n+ {\n+ var model = await CreateVerifyPackageRequestForPackage(fakeUploadFileStream);\n+ var assert = model.Dependencies.DependencySets.ToList();\n+\n+ Assert.Equal(2, assert[0].Value.Count()); //net451 has 2 dependencies\n+ Assert.Equal(1, assert[1].Value.Count()); //unsupported has 1 dependency\n+ }\n+ }\n+\n+ public static async Task<VerifyPackageRequest> CreateVerifyPackageRequestForPackage(Stream packageStream)\n+ {\nvar fakeUploadFileService = new Mock<IUploadFileService>();\n- var fakeUploadFileStream = TestPackage.CreateTestPackageStream(\"theId\", \"1.0.0\", packageDependencyGroups: dependencyGroups);\n- fakeUploadFileService.Setup(x => x.GetUploadFileAsync(TestUtility.FakeUser.Key)).Returns(Task.FromResult<Stream>(fakeUploadFileStream));\n+ fakeUploadFileService.Setup(x => x.GetUploadFileAsync(TestUtility.FakeUser.Key)).Returns(Task.FromResult<Stream>(packageStream));\nvar controller = CreateController(\nuploadFileService: fakeUploadFileService,\n- fakeNuGetPackage: fakeUploadFileStream);\n+ fakeNuGetPackage: packageStream);\ncontroller.SetCurrentUser(TestUtility.FakeUser);\nvar model = ((ViewResult)await controller.VerifyPackage()).Model as VerifyPackageRequest;\n-\n- var assert = model.Dependencies.DependencySets.ToList();\n-\n- Assert.Equal(2, assert[0].Value.Count()); //net451 has 2 dependencies\n- Assert.Equal(1, assert[1].Value.Count()); //unsupported has 1 dependency\n-\n- fakeUploadFileStream.Dispose();\n+ return model;\n}\n}\n@@ -1950,6 +1859,96 @@ public async Task WillSendPackagePublishedEvent()\nfakeTelemetryService.Verify(x => x.TrackPackagePushEvent(It.IsAny<Package>(), TestUtility.FakeUser, controller.OwinContext.Request.User.Identity), Times.Once);\n}\n}\n+\n+ public static IEnumerable<object[]> WillApplyEdits_Data\n+ {\n+ get\n+ {\n+ yield return new object[] { new EditPackageVersionRequest() { RequiresLicenseAcceptance = true } };\n+ yield return new object[] { new EditPackageVersionRequest() { IconUrl = \"https://iconnew\" } };\n+ yield return new object[] { new EditPackageVersionRequest() { ProjectUrl = \"https://projectnew\" } };\n+ yield return new object[] { new EditPackageVersionRequest() { Authors = \"author1new authors2new\" } };\n+ yield return new object[] { new EditPackageVersionRequest() { Copyright = \"copyright\" } };\n+ yield return new object[] { new EditPackageVersionRequest() { Description = \"new desc\" } };\n+ yield return new object[] { new EditPackageVersionRequest() { ReleaseNotes = \"notes123\" } };\n+ yield return new object[] { new EditPackageVersionRequest() { Summary = \"summary new\" } };\n+ yield return new object[] { new EditPackageVersionRequest() { Tags = \"tag1new tag2new\" } };\n+ yield return new object[] { new EditPackageVersionRequest() { VersionTitle = \"title\" } };\n+ }\n+ }\n+\n+ [Theory]\n+ [MemberData(\"WillApplyEdits_Data\")]\n+ public async Task WillApplyEdits(EditPackageVersionRequest edit)\n+ {\n+ // Arrange\n+ using (var fakeFileStream = new MemoryStream())\n+ {\n+ var fakeUploadFileService = new Mock<IUploadFileService>();\n+ fakeUploadFileService.Setup(x => x.GetUploadFileAsync(TestUtility.FakeUser.Key)).Returns(Task.FromResult<Stream>(fakeFileStream));\n+ fakeUploadFileService.Setup(x => x.DeleteUploadFileAsync(TestUtility.FakeUser.Key)).Returns(Task.CompletedTask);\n+\n+ var packageService = new Mock<IPackageService>();\n+\n+ var fakePackage = new Package { PackageRegistration = new PackageRegistration { Id = \"thePackageId\" }, Version = \"1.0.0\" };\n+ packageService.Setup(x => x.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), It.IsAny<User>(), It.IsAny<bool>()))\n+ .Returns(Task.FromResult(fakePackage));\n+\n+ var fakeEditPackageService = new Mock<EditPackageService>();\n+\n+ var controller = CreateController(packageService: packageService, editPackageService: fakeEditPackageService, uploadFileService: fakeUploadFileService);\n+ controller.SetCurrentUser(TestUtility.FakeUser);\n+\n+ // Act\n+ await controller.VerifyPackage(new VerifyPackageRequest { Listed = true, Edit = edit });\n+\n+ // Assert\n+ fakeEditPackageService.Verify(x => x.StartEditPackageRequest(fakePackage, edit, TestUtility.FakeUser), Times.Once);\n+ }\n+ }\n+\n+ [Fact]\n+ public async Task WillNotApplyEditIfThereWereNoChanges()\n+ {\n+ // Arrange\n+ var fakePackage = new Package { PackageRegistration = new PackageRegistration { Id = \"thePackageId\" }, Version = \"1.0.0\", Tags = \"abc, cde\" };\n+\n+ // Create the original model that was presented to the user\n+ using (var fakeUploadFileStream = TestPackage.CreateTestPackageStream(id: fakePackage.PackageRegistration.Id, version: fakePackage.Version, tags: fakePackage.Tags))\n+ {\n+ var model = await TheVerifyPackageActionForGetRequests.CreateVerifyPackageRequestForPackage(fakeUploadFileStream);\n+\n+ using (var fakeFileStream = new MemoryStream())\n+ {\n+ var fakeUploadFileService = new Mock<IUploadFileService>();\n+ fakeUploadFileService.Setup(x => x.GetUploadFileAsync(TestUtility.FakeUser.Key)).Returns(Task.FromResult<Stream>(fakeFileStream));\n+ fakeUploadFileService.Setup(x => x.DeleteUploadFileAsync(TestUtility.FakeUser.Key)).Returns(Task.CompletedTask);\n+\n+ var packageService = new Mock<IPackageService>();\n+\n+ packageService.Setup(x => x.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), It.IsAny<User>(), It.IsAny<bool>()))\n+ .Returns(Task.FromResult(fakePackage));\n+\n+ var fakeEditPackageService = new Mock<EditPackageService>();\n+\n+ using (var fakeUploadFileStream2 = TestPackage.CreateTestPackageStream(id: fakePackage.PackageRegistration.Id, version: fakePackage.Version, tags: fakePackage.Tags))\n+ {\n+ var controller = CreateController(packageService: packageService,\n+ editPackageService: fakeEditPackageService,\n+ uploadFileService: fakeUploadFileService,\n+ fakeNuGetPackage: fakeUploadFileStream2);\n+\n+ controller.SetCurrentUser(TestUtility.FakeUser);\n+\n+ // Act\n+ await controller.VerifyPackage(model);\n+\n+ // Assert\n+ fakeEditPackageService.Verify(x => x.StartEditPackageRequest(fakePackage, model.Edit, TestUtility.FakeUser), Times.Never);\n+ }\n+ }\n+ }\n+ }\n}\npublic class TheUploadProgressAction\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Parse tags list before comparing on package validation completion (#3992)
|
455,794 |
19.05.2017 13:36:56
| 25,200 |
a1c1d56b253474906cf5ea0c85e0c122497d06f2
|
Path too long fix for policy test
|
[
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests/PackageCreation/SecurityPolicyTests.cs",
"new_path": "tests/NuGetGallery.FunctionalTests/PackageCreation/SecurityPolicyTests.cs",
"diff": "@@ -30,10 +30,10 @@ public SecurityPolicyTests(ITestOutputHelper testOutputHelper)\n[Description(\"Package push fails if min client version policy not met\")]\n[Priority(1)]\n[Category(\"P1Tests\")]\n- public async Task PackagePush_Returns400IfRequireMinClientVersionPolicyNotMet(string clientVersion)\n+ public async Task PackagePush_Returns400IfMinClientVersionPolicyNotMet(string clientVersion)\n{\n// Arrange\n- var id = $\"{nameof(PackagePush_Returns400IfRequireMinClientVersionPolicyNotMet)}.{DateTime.UtcNow.Ticks}\";\n+ var id = $\"{nameof(PackagePush_Returns400IfMinClientVersionPolicyNotMet)}.{DateTime.UtcNow.Ticks}\";\n// Act\nvar response = await PushPackageAsync(EnvironmentSettings.TestSecurityPoliciesAccountApiKey, id, clientVersion);\n@@ -48,10 +48,10 @@ public async Task PackagePush_Returns400IfRequireMinClientVersionPolicyNotMet(st\n[Description(\"Package push succeeds if min client version policy met\")]\n[Priority(1)]\n[Category(\"P1Tests\")]\n- public async Task PackagePush_Returns200IfRequireMinClientVersionPolicyMet(string clientVersion)\n+ public async Task PackagePush_Returns200IfMinClientVersionPolicyMet(string clientVersion)\n{\n// Arrange\n- var id = $\"{nameof(PackagePush_Returns200IfRequireMinClientVersionPolicyMet)}.{DateTime.UtcNow.Ticks}\";\n+ var id = $\"{nameof(PackagePush_Returns200IfMinClientVersionPolicyMet)}.{DateTime.UtcNow.Ticks}\";\n// Act\nvar response = await PushPackageAsync(EnvironmentSettings.TestSecurityPoliciesAccountApiKey, id, clientVersion);\n@@ -64,10 +64,10 @@ public async Task PackagePush_Returns200IfRequireMinClientVersionPolicyMet(strin\n[Description(\"VerifyPackageKey fails if package verify policy not met\")]\n[Priority(1)]\n[Category(\"P1Tests\")]\n- public async Task VerifyPackageKey_Returns400IfRequirePackageVerifyScopePolicyNotMet()\n+ public async Task VerifyPackageKey_Returns400IfPackageVerifyScopePolicyNotMet()\n{\n// Arrange\n- var id = $\"{nameof(VerifyPackageKey_Returns400IfRequirePackageVerifyScopePolicyNotMet)}.{DateTime.UtcNow.Ticks}\";\n+ var id = $\"{nameof(VerifyPackageKey_Returns400IfPackageVerifyScopePolicyNotMet)}.{DateTime.UtcNow.Ticks}\";\nvar pushResponse = await PushPackageAsync(EnvironmentSettings.TestSecurityPoliciesAccountApiKey, id, \"4.1.0\");\nAssert.Equal(HttpStatusCode.Created, pushResponse.StatusCode);\n@@ -83,10 +83,10 @@ public async Task VerifyPackageKey_Returns400IfRequirePackageVerifyScopePolicyNo\n[Description(\"VerifyPackageKey succeeds if package verify policy met\")]\n[Priority(1)]\n[Category(\"P1Tests\")]\n- public async Task VerifyPackageKey_Returns200IfRequirePackageVerifyScopePolicyMet()\n+ public async Task VerifyPackageKey_Returns200IfPackageVerifyScopePolicyMet()\n{\n// Arrange\n- var id = $\"{nameof(VerifyPackageKey_Returns200IfRequirePackageVerifyScopePolicyMet)}.{DateTime.UtcNow.Ticks}\";\n+ var id = $\"{nameof(VerifyPackageKey_Returns200IfPackageVerifyScopePolicyMet)}.{DateTime.UtcNow.Ticks}\";\nvar pushResponse = await PushPackageAsync(EnvironmentSettings.TestSecurityPoliciesAccountApiKey, id, \"4.1.0\");\nAssert.Equal(HttpStatusCode.Created, pushResponse.StatusCode);\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Path too long fix for policy test (#3995)
|
455,736 |
22.05.2017 14:23:14
| 25,200 |
9a424b87942d0b147e631dda02a6fae8dcfc89ff
|
Fix functional tests to work against redesign
Shorten package name due to max file path issue when running locally
|
[
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests/PackageCreation/SecurityPolicyTests.cs",
"new_path": "tests/NuGetGallery.FunctionalTests/PackageCreation/SecurityPolicyTests.cs",
"diff": "@@ -67,7 +67,7 @@ public async Task PackagePush_Returns200IfMinClientVersionPolicyMet(string clien\npublic async Task VerifyPackageKey_Returns400IfPackageVerifyScopePolicyNotMet()\n{\n// Arrange\n- var id = $\"{nameof(VerifyPackageKey_Returns400IfPackageVerifyScopePolicyNotMet)}.{DateTime.UtcNow.Ticks}\";\n+ var id = $\"VerifyKeyReturns400IfScopeNotMet.{DateTime.UtcNow.Ticks}\";\nvar pushResponse = await PushPackageAsync(EnvironmentSettings.TestSecurityPoliciesAccountApiKey, id, \"4.1.0\");\nAssert.Equal(HttpStatusCode.Created, pushResponse.StatusCode);\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.WebUITests.P0/BasicPages/NetFoundationBrandingValidationTest.cs",
"new_path": "tests/NuGetGallery.WebUITests.P0/BasicPages/NetFoundationBrandingValidationTest.cs",
"diff": "@@ -23,7 +23,7 @@ public override IEnumerator<WebTestRequest> GetRequestEnumerator()\n{\n//send a request to home page and check for default home page text.\nvar pageRequest = new WebTestRequest(UrlHelper.BaseUrl);\n- var homePageTextValidationRuleLogo = AssertAndValidationHelper.GetValidationRuleForFindText(@\"<a title=\"\".NET Foundation\"\" href=\"\"https://www.dotnetfoundation.org\"\"><img src=\"\"/Content/Logos/dnf.png\"\" alt=\"\".NET Foundation\"\" /></a>\");\n+ var homePageTextValidationRuleLogo = AssertAndValidationHelper.GetValidationRuleForFindText(@\"<a title=\"\".NET Foundation\"\" href=\"\"https://www.dotnetfoundation.org\"\"><img src=\"\"/Content/gallery/img/dotnet-foundation-32x30.png\"\" alt=\"\"Logo of the .NET Foundation in the page footer\"\" /></a>\");\nvar homePageTextValidationRuleCopyright = AssertAndValidationHelper.GetValidationRuleForFindText(@\"© \" + DateTime.UtcNow.Year + \" .NET Foundation\");\nvar homePageTextValidationRuleTOU = AssertAndValidationHelper.GetValidationRuleForFindText(@\"<a href=\"\"/policies/Terms\"\">Terms of Use</a>\");\nvar homePageTextValidationRulePrivacy = AssertAndValidationHelper.GetValidationRuleForFindText(@\"<a href=\"\"/policies/Privacy\"\">Privacy Policy</a>\");\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Fix functional tests to work against redesign
Shorten package name due to max file path issue when running locally
|
455,743 |
26.05.2017 09:32:35
| 25,200 |
863b88bd16d551428b2b9b1908fbea73f93c6bc3
|
Fixed Report Abuse Page's Accessibility
Fixes Relevant to [VSTS #395879](https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_workitems?id=395879&_a=edit). This help-text bug was for the sign-in page, but this also affects the Report Abuse page.
* Fixed accessibility of email field in report abuse page
* Fixed signature accessibility
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/ReportAbuse.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/ReportAbuse.cshtml",
"diff": "<div class=\"form-field\">\n@if (!Model.ConfirmedUser)\n{\n- @Html.LabelFor(m => m.Email)\n- @Html.EditorFor(m => m.Email)\n- <span class=\"field-hint-message\">Provide your email address so we can follow up with you.</span>\n+ @Html.LabelFor(m => m.Email, new { id = \"ReportAbuse_Email_Label\" })\n+ @Html.EditorFor(m => m.Email, new { htmlAttributes = new { aria_labelledby = \"ReportAbuse_Email_Label ReportAbuse_Email_Help\" } })\n+ <span class=\"field-hint-message\" id=\"ReportAbuse_Email_Help\">Provide your email address so we can follow up with you.</span>\n@Html.ValidationMessageFor(m => m.Email)\n}\nelse\n<p>\nAs applicable under 17 U.S.C. 512(f), I acknowledge that I may be subject to liability for damages if I knowingly materially misrepresent that material or activity is infringing.\n</p>\n- @Html.LabelFor(m => m.Signature)\n- @Html.EditorFor(m => m.Signature)\n- <span class=\"field-hint-message\">Sign with your real name.</span>\n+ @Html.LabelFor(m => m.Signature, new { id = \"ReportAbuse_Signature_Label\" })\n+ @Html.EditorFor(m => m.Signature, new { htmlAttributes = new { aria_labelledby = \"ReportAbuse_Signature_Label ReportAbuse_Signature_Help\" } })\n+ <span class=\"field-hint-message\" id=\"ReportAbuse_Signature_Help\">Sign with your real name.</span>\n@Html.ValidationMessageFor(m => m.Signature)\n</div>\n<div class=\"infringement-claim-requirements\">You can also send us an email at <a href=\"mailto:admin@nuget.org\">admin@nuget.org</a></div>\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Fixed Report Abuse Page's Accessibility (#4001)
Fixes #4002. Relevant to [VSTS #395879](https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_workitems?id=395879&_a=edit). This help-text bug was for the sign-in page, but this also affects the Report Abuse page.
* Fixed accessibility of email field in report abuse page
* Fixed signature accessibility
|
455,759 |
06.04.2017 15:37:47
| 25,200 |
77b08a6944c9ac2b0924fee63a155b1563b1e03c
|
Remove validation rules that block uploading valid semver2 versions
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/CoreStrings.Designer.cs",
"new_path": "src/NuGetGallery.Core/CoreStrings.Designer.cs",
"diff": "@@ -123,6 +123,15 @@ public class CoreStrings {\n}\n}\n+ /// <summary>\n+ /// Looks up a localized string similar to The package manifest contains an invalid Dependency Version: '{0}'.\n+ /// </summary>\n+ public static string Manifest_InvalidDependencyVersion {\n+ get {\n+ return ResourceManager.GetString(\"Manifest_InvalidDependencyVersion\", resourceCulture);\n+ }\n+ }\n+\n/// <summary>\n/// Looks up a localized string similar to The package manifest contains an invalid ID: '{0}'.\n/// </summary>\n@@ -168,15 +177,6 @@ public class CoreStrings {\n}\n}\n- /// <summary>\n- /// Looks up a localized string similar to The version '{0}' is not supported. The NuGet Gallery currently does not currently support Semantic Version 2.0 as it would break older NuGet clients..\n- /// </summary>\n- public static string Manifest_InvalidVersionSemVer200 {\n- get {\n- return ResourceManager.GetString(\"Manifest_InvalidVersionSemVer200\", resourceCulture);\n- }\n- }\n-\n/// <summary>\n/// Looks up a localized string similar to The package manifest is missing the Id field.\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/CoreStrings.resx",
"new_path": "src/NuGetGallery.Core/CoreStrings.resx",
"diff": "<data name=\"Manifest_TargetFrameworkNotSupported\" xml:space=\"preserve\">\n<value>The target framework {0} is not supported.</value>\n</data>\n- <data name=\"Manifest_InvalidVersionSemVer200\" xml:space=\"preserve\">\n- <value>The version '{0}' is not supported. The NuGet Gallery currently does not currently support Semantic Version 2.0 as it would break older NuGet clients.</value>\n- </data>\n<data name=\"Http404NotFound\" xml:space=\"preserve\">\n<value>(404) Error - Not Found</value>\n</data>\n<data name=\"NegativeIndexesAreInvalid\" xml:space=\"preserve\">\n<value>Negative indexes are invalid.</value>\n</data>\n+ <data name=\"Manifest_InvalidDependencyVersion\" xml:space=\"preserve\">\n+ <value>The package manifest contains an invalid Dependency Version: '{0}'</value>\n+ </data>\n</root>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/NuGetVersionExtensions.cs",
"new_path": "src/NuGetGallery.Core/NuGetVersionExtensions.cs",
"diff": "// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\nusing System;\n-using System.Text.RegularExpressions;\nusing NuGet.Versioning;\nnamespace NuGetGallery\n@@ -23,19 +22,9 @@ public static string Normalize(string version)\npublic static class NuGetVersionExtensions\n{\n- private const RegexOptions Flags = RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.ExplicitCapture;\n- private static readonly Regex SemanticVersionRegex = new Regex(@\"^(?<Version>\\d+(\\s*\\.\\s*\\d+){0,3})(?<Release>-[a-z][0-9a-z-]*)?$\", Flags);\n-\npublic static string ToNormalizedStringSafe(this NuGetVersion self)\n{\nreturn self != null ? self.ToNormalizedString() : String.Empty;\n}\n-\n- public static bool IsValidVersionForLegacyClients(this NuGetVersion self)\n- {\n- var match = SemanticVersionRegex.Match(self.ToString().Trim());\n-\n- return match.Success;\n- }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Packaging/ManifestValidator.cs",
"new_path": "src/NuGetGallery.Core/Packaging/ManifestValidator.cs",
"diff": "@@ -76,12 +76,6 @@ private static IEnumerable<ValidationResult> ValidateCore(PackageMetadata packag\nversion));\n}\n- var versionValidationResult = ValidateVersion(packageMetadata.Version);\n- if (versionValidationResult != null)\n- {\n- yield return versionValidationResult;\n- }\n-\n// Check framework reference groups\nvar frameworkReferenceGroups = packageMetadata.GetFrameworkReferenceGroups();\nif (frameworkReferenceGroups != null)\n@@ -143,7 +137,8 @@ private static IEnumerable<ValidationResult> ValidateCore(PackageMetadata packag\n// Versions\nif (dependency.VersionRange.MinVersion != null)\n{\n- var versionRangeValidationResult = ValidateVersion(dependency.VersionRange.MinVersion);\n+ var versionRangeValidationResult =\n+ ValidateDependencyVersion(dependency.VersionRange.MinVersion);\nif (versionRangeValidationResult != null)\n{\nyield return versionRangeValidationResult;\n@@ -153,7 +148,8 @@ private static IEnumerable<ValidationResult> ValidateCore(PackageMetadata packag\nif (dependency.VersionRange.MaxVersion != null\n&& dependency.VersionRange.MaxVersion != dependency.VersionRange.MinVersion)\n{\n- var versionRangeValidationResult = ValidateVersion(dependency.VersionRange.MaxVersion);\n+ var versionRangeValidationResult =\n+ ValidateDependencyVersion(dependency.VersionRange.MaxVersion);\nif (versionRangeValidationResult != null)\n{\nyield return versionRangeValidationResult;\n@@ -164,22 +160,15 @@ private static IEnumerable<ValidationResult> ValidateCore(PackageMetadata packag\n}\n}\n- private static ValidationResult ValidateVersion(NuGetVersion version)\n+ private static ValidationResult ValidateDependencyVersion(NuGetVersion version)\n{\n- if (version.IsSemVer2)\n+ if (version.HasMetadata)\n{\nreturn new ValidationResult(string.Format(\nCultureInfo.CurrentCulture,\n- CoreStrings.Manifest_InvalidVersionSemVer200,\n+ CoreStrings.Manifest_InvalidDependencyVersion,\nversion.ToFullString()));\n}\n- else if (!version.IsValidVersionForLegacyClients())\n- {\n- return new ValidationResult(string.Format(\n- CultureInfo.CurrentCulture,\n- CoreStrings.Manifest_InvalidVersion,\n- version));\n- }\nreturn null;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/PackageService.cs",
"new_path": "src/NuGetGallery/Services/PackageService.cs",
"diff": "@@ -626,21 +626,6 @@ private static void ValidateNuGetPackageMetadata(PackageMetadata packageMetadata\n{\nthrow new EntityException(Strings.NuGetPackagePropertyTooLong, \"Id\", CoreConstants.MaxPackageIdLength);\n}\n- if (packageMetadata.Version.IsPrerelease)\n- {\n- var release = packageMetadata.Version.Release;\n-\n- if (release.Contains(\".\"))\n- {\n- throw new EntityException(Strings.NuGetPackageReleaseVersionWithDot, \"Version\");\n- }\n-\n- long temp;\n- if (long.TryParse(release, out temp))\n- {\n- throw new EntityException(Strings.NuGetPackageReleaseVersionContainsOnlyNumerics, \"Version\");\n- }\n- }\nif (packageMetadata.Authors != null && packageMetadata.Authors.Flatten().Length > 4000)\n{\nthrow new EntityException(Strings.NuGetPackagePropertyTooLong, \"Authors\", \"4000\");\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.Designer.cs",
"new_path": "src/NuGetGallery/Strings.Designer.cs",
"diff": "@@ -599,24 +599,6 @@ public class Strings {\n}\n}\n- /// <summary>\n- /// Looks up a localized string similar to Package {0} invalid: the release label can not only contain numerics..\n- /// </summary>\n- public static string NuGetPackageReleaseVersionContainsOnlyNumerics {\n- get {\n- return ResourceManager.GetString(\"NuGetPackageReleaseVersionContainsOnlyNumerics\", resourceCulture);\n- }\n- }\n-\n- /// <summary>\n- /// Looks up a localized string similar to Package {0} invalid: no '.' allowed in the release label..\n- /// </summary>\n- public static string NuGetPackageReleaseVersionWithDot {\n- get {\n- return ResourceManager.GetString(\"NuGetPackageReleaseVersionWithDot\", resourceCulture);\n- }\n- }\n-\n/// <summary>\n/// Looks up a localized string similar to Package created from API..\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.resx",
"new_path": "src/NuGetGallery/Strings.resx",
"diff": "@@ -314,12 +314,6 @@ The {1} Team</value>\n<data name=\"UploadPackage_InvalidNuspec\" xml:space=\"preserve\">\n<value>The NuGet package contains an invalid .nuspec file. The error encountered was: '{0}'. Correct the error and try again.</value>\n</data>\n- <data name=\"NuGetPackageReleaseVersionWithDot\" xml:space=\"preserve\">\n- <value>Package {0} invalid: no '.' allowed in the release label.</value>\n- </data>\n- <data name=\"NuGetPackageReleaseVersionContainsOnlyNumerics\" xml:space=\"preserve\">\n- <value>Package {0} invalid: the release label can not only contain numerics.</value>\n- </data>\n<data name=\"CopyExternalPackages_PackageFileBlobAlreadyExists\" xml:space=\"preserve\">\n<value>SKIPPED! Package file blob {0} already exists</value>\n</data>\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Core.Facts/Packaging/ManifestValidatorFacts.cs",
"new_path": "tests/NuGetGallery.Core.Facts/Packaging/ManifestValidatorFacts.cs",
"diff": "@@ -424,44 +424,29 @@ public void ReturnsErrorIfVersionInvalid2()\n}\n[Fact]\n- public void ReturnsErrorIfVersionIsSemVer200()\n+ public void ReturnsNoErrorIfVersionIsSemVer200()\n{\nvar nuspecStream = CreateNuspecStream(NuSpecSemVer200);\n- Assert.Equal(new[] { String.Format(CoreStrings.Manifest_InvalidVersionSemVer200, \"2.0.0+123\") }, GetErrors(nuspecStream));\n+ Assert.Empty(GetErrors(nuspecStream));\n}\n- [Theory]\n- [InlineData(\"1.0.0-beta.1\")]\n- [InlineData(\"3.0.0-beta+12\")]\n- public void ReturnsErrorIfDependencyVersionIsSemVer200(string version)\n+ [Fact]\n+ public void ReturnsNoErrorIfDependencyVersionIsSemVer200WithoutMetadataPart()\n{\n+ const string version = \"1.0.0-beta.1\";\nvar nuspecStream = CreateNuspecStream(string.Format(NuSpecDependencyVersionPlaceholder, version));\n- Assert.Equal(new[] { String.Format(CoreStrings.Manifest_InvalidVersionSemVer200, version) }, GetErrors(nuspecStream));\n+ Assert.Empty(GetErrors(nuspecStream));\n}\n- [Theory]\n- [InlineData(\"1.0.0-10\")]\n- [InlineData(\"1.0.0--\")]\n- public void ReturnsErrorIfVersionIsInvalid(string version)\n- {\n- // https://github.com/NuGet/NuGetGallery/issues/3226\n-\n- var nuspecStream = CreateNuspecStream(string.Format(NuSpecPlaceholderVersion, version));\n-\n- Assert.Equal(new[] { String.Format(CoreStrings.Manifest_InvalidVersion, version) }, GetErrors(nuspecStream));\n- }\n-\n-\n- [Theory]\n- [InlineData(\"1.0.0-10\")]\n- [InlineData(\"1.0.0--\")]\n- public void ReturnsErrorIfDependencyVersionIsInvalid(string version)\n+ [Fact]\n+ public void ReturnsErrorIfDependencyVersionIsSemVer200WithMetadataPart()\n{\n+ const string version = \"3.0.0-beta+12\";\nvar nuspecStream = CreateNuspecStream(string.Format(NuSpecDependencyVersionPlaceholder, version));\n- Assert.Equal(new[] { String.Format(CoreStrings.Manifest_InvalidVersion, version) }, GetErrors(nuspecStream));\n+ Assert.Equal(new[] { String.Format(CoreStrings.Manifest_InvalidDependencyVersion, version) }, GetErrors(nuspecStream));\n}\n[Fact]\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs",
"diff": "@@ -702,25 +702,21 @@ private async Task WillThrowIfTheNuGetPackageIdIsLongerThanMaxPackageIdLength()\n}\n[Fact]\n- private async Task WillThrowIfTheNuGetPackageSpecialVersionContainsADot()\n+ private async Task DoesNotThrowIfTheNuGetPackageSpecialVersionContainsADot()\n{\nvar service = CreateService();\nvar nugetPackage = CreateNuGetPackage(id: \"theId\", version: \"1.2.3-alpha.0\");\n- var ex = await Assert.ThrowsAsync<InvalidPackageException>(async () => await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), null));\n-\n- Assert.Equal(String.Format(Strings.NuGetPackageReleaseVersionWithDot, \"Version\"), ex.Message);\n+ await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), null);\n}\n[Fact]\n- private async Task WillThrowIfTheNuGetPackageSpecialVersionContainsOnlyNumbers()\n+ private async Task DoesNotThrowIfTheNuGetPackageSpecialVersionContainsOnlyNumbers()\n{\nvar service = CreateService();\nvar nugetPackage = CreateNuGetPackage(id: \"theId\", version: \"1.2.3-12345\");\n- var ex = await Assert.ThrowsAsync<InvalidPackageException>(async () => await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), null));\n-\n- Assert.Equal(String.Format(Strings.NuGetPackageReleaseVersionContainsOnlyNumerics, \"Version\"), ex.Message);\n+ await service.CreatePackageAsync(nugetPackage.Object, new PackageStreamMetadata(), null);\n}\n[Fact]\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Remove validation rules that block uploading valid semver2 versions #3645 (#3757)
|
455,759 |
24.04.2017 11:07:29
| -7,200 |
86537ab2ee0cde29b0520e643721b664edfb5755
|
Set SemVerLevelKey after setting Dependencies
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/PackageService.cs",
"new_path": "src/NuGetGallery/Services/PackageService.cs",
"diff": "@@ -547,9 +547,6 @@ private Package CreatePackageFromNuGetPackage(PackageRegistration packageRegistr\npackage.Version = packageMetadata.Version.OriginalVersion;\npackage.NormalizedVersion = packageMetadata.Version.ToNormalizedString();\n- // Identify the SemVerLevelKey using the original package version string and package dependencies\n- package.SemVerLevelKey = SemVerLevelKey.ForPackage(packageMetadata.Version, package.Dependencies);\n-\npackage.Description = packageMetadata.Description;\npackage.ReleaseNotes = packageMetadata.ReleaseNotes;\npackage.HashAlgorithm = packageStreamMetadata.HashAlgorithm;\n@@ -610,6 +607,9 @@ private Package CreatePackageFromNuGetPackage(PackageRegistration packageRegistr\npackage.FlattenedPackageTypes = package.PackageTypes.Flatten();\n+ // Identify the SemVerLevelKey using the original package version string and package dependencies\n+ package.SemVerLevelKey = SemVerLevelKey.ForPackage(packageMetadata.Version, package.Dependencies);\n+\nreturn package;\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Set SemVerLevelKey after setting Dependencies
|
455,759 |
03.05.2017 22:34:01
| -7,200 |
c48f1ff854d3c4508017ad621ce141b64ef94b9a
|
V2 NuGetEntityTypeSerializer Id link patcher must retain curated feed name
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/OData/Serializers/NuGetEntityTypeSerializer.cs",
"new_path": "src/NuGetGallery/OData/Serializers/NuGetEntityTypeSerializer.cs",
"diff": "@@ -100,7 +100,7 @@ private void TryAnnotateV2FeedPackage(ODataEntry entry, EntityInstanceContext en\nprivate static void NormalizeNavigationLinks(ODataEntry entry, HttpRequestMessage request, V2FeedPackage instance, string normalizedVersion)\n{\n- var idLink = BuildIdLink(\"v2\", instance.Id, normalizedVersion, request);\n+ var idLink = BuildIdLink(instance.Id, normalizedVersion, request);\nif (entry.ReadLink != null)\n{\n@@ -135,9 +135,9 @@ private static Uri BuildLinkForStreamProperty(string routePrefix, string id, str\nreturn builder.Uri;\n}\n- private static Uri BuildIdLink(string routePrefix, string id, string version, HttpRequestMessage request)\n+ private static Uri BuildIdLink(string id, string version, HttpRequestMessage request)\n{\n- return new Uri($\"{request.RequestUri.Scheme}://{request.RequestUri.Host}/api/{routePrefix}/Packages(Id='{id}',Version='{version}')\");\n+ return new Uri($\"{request.RequestUri.Scheme}://{request.RequestUri.Host}{request.RequestUri.LocalPath}(Id='{id}',Version='{version}')\");\n}\nprivate static string EnsureTrailingSlash(string url)\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
#3861 V2 NuGetEntityTypeSerializer Id link patcher must retain curated feed name (#3864)
|
455,759 |
03.05.2017 22:56:05
| -7,200 |
028140111460815f0ed0d13e5e846ff1d73c3fb7
|
LuceneIndexingService in Gallery should take into account IsLatest(Stable)SemVer2
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Infrastructure/Lucene/LuceneIndexingService.cs",
"new_path": "src/NuGetGallery/Infrastructure/Lucene/LuceneIndexingService.cs",
"diff": "@@ -142,16 +142,16 @@ private List<PackageIndexEntity> GetPackages(DateTime? lastIndexTime)\nif (lastIndexTime.HasValue)\n{\n- // Retrieve the Latest and LatestStable version of packages if any package for that registration changed since we last updated the index.\n+ // Retrieve the Latest, LatestStable, LatestSemVer2 and LatestStableSemVer2 version of packages if any package for that registration changed since we last updated the index.\n// We need to do this because some attributes that we index such as DownloadCount are values in the PackageRegistration table that may\n// update independent of the package.\nset = set.Where(\n- p => (p.IsLatest || p.IsLatestStable) &&\n+ p => (p.IsLatest || p.IsLatestStable || p.IsLatestSemVer2 || p.IsLatestStableSemVer2) &&\np.PackageRegistration.Packages.Any(p2 => p2.LastUpdated > lastIndexTime));\n}\nelse\n{\n- set = set.Where(p => p.IsLatest || p.IsLatestStable); // which implies that p.IsListed by the way!\n+ set = set.Where(p => p.IsLatest || p.IsLatestStable || p.IsLatestSemVer2 || p.IsLatestStableSemVer2); // which implies that p.IsListed by the way!\n}\nvar list = set\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
LuceneIndexingService in Gallery should take into account IsLatest(Stable)SemVer2 (#3863)
|
455,759 |
04.05.2017 10:10:57
| -7,200 |
6342239c2aabcf589cbc82e351c31fd43d72eb54
|
POST VerifyPackage version validation should use ToFullString comparison
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -1142,7 +1142,7 @@ public virtual async Task<ActionResult> VerifyPackage(VerifyPackageRequest formD\nif (!(String.IsNullOrEmpty(formData.Id) || String.IsNullOrEmpty(formData.OriginalVersion)))\n{\nif (!(String.Equals(packageMetadata.Id, formData.Id, StringComparison.OrdinalIgnoreCase)\n- && String.Equals(packageMetadata.Version.ToNormalizedString(), formData.Version, StringComparison.OrdinalIgnoreCase)\n+ && String.Equals(packageMetadata.Version.ToFullStringSafe(), formData.Version, StringComparison.OrdinalIgnoreCase)\n&& String.Equals(packageMetadata.Version.OriginalVersion, formData.OriginalVersion, StringComparison.OrdinalIgnoreCase)))\n{\nTempData[\"Message\"] = \"Your attempt to verify the package submission failed, because the package file appears to have changed. Please try again.\";\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
POST VerifyPackage version validation should use ToFullString comparison
|
455,759 |
04.05.2017 12:27:47
| -7,200 |
f4b685b54194b32918e313462a5839e777272139
|
ODataV2CuratedFeedController should support semver2 by default when requesting a specific version, and compare on NormalizedVersion
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/ODataV2CuratedFeedController.cs",
"new_path": "src/NuGetGallery/Controllers/ODataV2CuratedFeedController.cs",
"diff": "@@ -83,7 +83,7 @@ public class ODataV2CuratedFeedController\n[CacheOutput(ServerTimeSpan = NuGetODataConfig.GetByIdAndVersionCacheTimeInSeconds, Private = true, ClientTimeSpan = NuGetODataConfig.GetByIdAndVersionCacheTimeInSeconds)]\npublic async Task<IHttpActionResult> Get(ODataQueryOptions<V2FeedPackage> options, string curatedFeedName, string id, string version)\n{\n- var result = await GetCore(options, curatedFeedName, id, version, return404NotFoundWhenNoResults: true, semVerLevel: null);\n+ var result = await GetCore(options, curatedFeedName, id, version, return404NotFoundWhenNoResults: true, semVerLevel: SemVerLevelKey.SemVerLevel2);\nreturn result.FormattedAsSingleResult<V2FeedPackage>();\n}\n@@ -107,14 +107,14 @@ public async Task<IHttpActionResult> Get(ODataQueryOptions<V2FeedPackage> option\nreturn QueryResult(options, emptyResult, MaxPageSize);\n}\n- return await GetCore(options, curatedFeedName, id, version: null, return404NotFoundWhenNoResults: false, semVerLevel: semVerLevel);\n+ return await GetCore(options, curatedFeedName, id, normalizedVersion: null, return404NotFoundWhenNoResults: false, semVerLevel: semVerLevel);\n}\nprivate async Task<IHttpActionResult> GetCore(\nODataQueryOptions<V2FeedPackage> options,\nstring curatedFeedName,\nstring id,\n- string version,\n+ string normalizedVersion,\nbool return404NotFoundWhenNoResults,\nstring semVerLevel)\n{\n@@ -128,9 +128,9 @@ public async Task<IHttpActionResult> Get(ODataQueryOptions<V2FeedPackage> option\n.Where(SemVerLevelKey.IsPackageCompliantWithSemVerLevel(semVerLevel))\n.Where(p => p.PackageRegistration.Id.Equals(id, StringComparison.OrdinalIgnoreCase));\n- if (!string.IsNullOrEmpty(version))\n+ if (!string.IsNullOrEmpty(normalizedVersion))\n{\n- packages = packages.Where(p => p.Version == version);\n+ packages = packages.Where(p => p.NormalizedVersion == normalizedVersion);\n}\nvar semVerLevelKey = SemVerLevelKey.ForSemVerLevel(semVerLevel);\n@@ -143,7 +143,7 @@ public async Task<IHttpActionResult> Get(ODataQueryOptions<V2FeedPackage> option\nGetTraditionalHttpContext().Request,\npackages,\nid,\n- version,\n+ normalizedVersion,\ncuratedFeed: curatedFeed,\nsemVerLevel: semVerLevel);\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
ODataV2CuratedFeedController should support semver2 by default when requesting a specific version, and compare on NormalizedVersion
|
455,759 |
04.05.2017 19:46:39
| -7,200 |
41c2b73a5c6251cd5440beae0c1ba4d099c43a8d
|
Refactor NuGetEntityTypeSerializer + unit test coverage
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "</Compile>\n<Compile Include=\"Security\\SecurePushSubscription.cs\" />\n<Compile Include=\"Security\\IUserSecurityPolicySubscription.cs\" />\n+ <Compile Include=\"OData\\Serializers\\FeedPackageAnnotationStrategy.cs\" />\n+ <Compile Include=\"OData\\Serializers\\IFeedPackageAnnotationStrategy.cs\" />\n+ <Compile Include=\"OData\\Serializers\\V1FeedPackageAnnotationStrategy.cs\" />\n+ <Compile Include=\"OData\\Serializers\\V2FeedPackageAnnotationStrategy.cs\" />\n<Compile Include=\"Security\\UserSecurityPolicyHandler.cs\" />\n<Compile Include=\"Security\\ISecurityPolicyService.cs\" />\n<Compile Include=\"Security\\RequirePackageVerifyScopePolicy.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/OData/Serializers/NuGetEntityTypeSerializer.cs",
"new_path": "src/NuGetGallery/OData/Serializers/NuGetEntityTypeSerializer.cs",
"diff": "// Copyright (c) .NET Foundation. All rights reserved.\n// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\n-using System;\n-using System.Net.Http;\n+using Microsoft.Data.OData;\n+using System.Collections.Generic;\nusing System.Web.Http.OData;\nusing System.Web.Http.OData.Formatter.Serialization;\n-using System.Web.Http.Routing;\n-using Microsoft.Data.OData;\n-using Microsoft.Data.OData.Atom;\nnamespace NuGetGallery.OData.Serializers\n{\n@@ -15,139 +12,37 @@ public class NuGetEntityTypeSerializer\n: ODataEntityTypeSerializer\n{\nprivate readonly string _contentType;\n+ private readonly IReadOnlyCollection<IFeedPackageAnnotationStrategy> _annotationStrategies;\npublic NuGetEntityTypeSerializer(ODataSerializerProvider serializerProvider)\n: base(serializerProvider)\n{\n_contentType = \"application/zip\";\n- }\n-\n- public override ODataEntry CreateEntry(SelectExpandNode selectExpandNode, EntityInstanceContext entityInstanceContext)\n+ _annotationStrategies = new List<IFeedPackageAnnotationStrategy>\n{\n- var entry = base.CreateEntry(selectExpandNode, entityInstanceContext);\n-\n- TryAnnotateV1FeedPackage(entry, entityInstanceContext);\n- TryAnnotateV2FeedPackage(entry, entityInstanceContext);\n-\n- return entry;\n- }\n-\n- private void TryAnnotateV1FeedPackage(ODataEntry entry, EntityInstanceContext entityInstanceContext)\n- {\n- var instance = entityInstanceContext.EntityInstance as V1FeedPackage;\n- if (instance != null)\n- {\n- // Set Atom entry metadata\n- var atomEntryMetadata = new AtomEntryMetadata();\n- atomEntryMetadata.Title = instance.Title;\n- if (!string.IsNullOrEmpty(instance.Authors))\n- {\n- atomEntryMetadata.Authors = new[] { new AtomPersonMetadata { Name = instance.Authors } };\n- }\n- if (instance.LastUpdated > DateTime.MinValue)\n- {\n- atomEntryMetadata.Updated = instance.LastUpdated;\n- }\n- if (!string.IsNullOrEmpty(instance.Summary))\n- {\n- atomEntryMetadata.Summary = instance.Summary;\n- }\n- entry.SetAnnotation(atomEntryMetadata);\n-\n- // Add package download link\n- entry.MediaResource = new ODataStreamReferenceValue\n- {\n- ContentType = ContentType,\n- ReadLink = BuildLinkForStreamProperty(\"v1\", instance.Id, instance.Version, entityInstanceContext.Request)\n+ new V1FeedPackageAnnotationStrategy(_contentType),\n+ new V2FeedPackageAnnotationStrategy(_contentType)\n};\n}\n- }\n- private void TryAnnotateV2FeedPackage(ODataEntry entry, EntityInstanceContext entityInstanceContext)\n- {\n- var instance = entityInstanceContext.EntityInstance as V2FeedPackage;\n- if (instance != null)\n- {\n- // Patch links to use normalized versions\n- var normalizedVersion = NuGetVersionNormalizer.Normalize(instance.Version);\n- NormalizeNavigationLinks(entry, entityInstanceContext.Request, instance, normalizedVersion);\n-\n- // Set Atom entry metadata\n- var atomEntryMetadata = new AtomEntryMetadata();\n- atomEntryMetadata.Title = instance.Id;\n- if (!string.IsNullOrEmpty(instance.Authors))\n- {\n- atomEntryMetadata.Authors = new[] { new AtomPersonMetadata { Name = instance.Authors } };\n- }\n- if (instance.LastUpdated > DateTime.MinValue)\n- {\n- atomEntryMetadata.Updated = instance.LastUpdated;\n- }\n- if (!string.IsNullOrEmpty(instance.Summary))\n- {\n- atomEntryMetadata.Summary = instance.Summary;\n- }\n- entry.SetAnnotation(atomEntryMetadata);\n-\n- // Add package download link\n- entry.MediaResource = new ODataStreamReferenceValue\n+ public override ODataEntry CreateEntry(SelectExpandNode selectExpandNode, EntityInstanceContext entityInstanceContext)\n{\n- ContentType = ContentType,\n- ReadLink = BuildLinkForStreamProperty(\"v2\", instance.Id, normalizedVersion, entityInstanceContext.Request)\n- };\n- }\n- }\n+ var entry = base.CreateEntry(selectExpandNode, entityInstanceContext);\n- private static void NormalizeNavigationLinks(ODataEntry entry, HttpRequestMessage request, V2FeedPackage instance, string normalizedVersion)\n+ foreach (var annotationStrategy in _annotationStrategies)\n{\n- var idLink = BuildIdLink(instance.Id, normalizedVersion, request);\n-\n- if (entry.ReadLink != null)\n+ if (annotationStrategy.CanAnnotate(entityInstanceContext.EntityInstance))\n{\n- entry.ReadLink = idLink;\n+ annotationStrategy.Annotate(entityInstanceContext.Request, entry, entityInstanceContext.EntityInstance);\n}\n-\n- if (entry.EditLink != null)\n- {\n- entry.EditLink = idLink;\n}\n- if (entry.Id != null)\n- {\n- entry.Id = idLink.ToString();\n- }\n+ return entry;\n}\npublic string ContentType\n{\nget { return _contentType; }\n}\n-\n- private static Uri BuildLinkForStreamProperty(string routePrefix, string id, string version, HttpRequestMessage request)\n- {\n- var url = new UrlHelper(request);\n- var result = url.Route(routePrefix + RouteName.DownloadPackage, new { id, version });\n-\n- var builder = new UriBuilder(request.RequestUri);\n- builder.Path = version == null ? EnsureTrailingSlash(result) : result;\n- builder.Query = string.Empty;\n-\n- return builder.Uri;\n- }\n-\n- private static Uri BuildIdLink(string id, string version, HttpRequestMessage request)\n- {\n- return new Uri($\"{request.RequestUri.Scheme}://{request.RequestUri.Host}{request.RequestUri.LocalPath}(Id='{id}',Version='{version}')\");\n- }\n-\n- private static string EnsureTrailingSlash(string url)\n- {\n- if (url != null && !url.EndsWith(\"/\", StringComparison.OrdinalIgnoreCase))\n- {\n- return url + '/';\n- }\n-\n- return url;\n- }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"new_path": "tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj",
"diff": "<Compile Include=\"Infrastructure\\UserAuditRecordFacts.cs\" />\n<Compile Include=\"OData\\Filter\\ODataFilterFacts.cs\" />\n<Compile Include=\"OData\\SearchService\\SearchHijackerFacts.cs\" />\n+ <Compile Include=\"OData\\Serializers\\V1FeedPackageAnnotationStrategyFacts.cs\" />\n+ <Compile Include=\"OData\\Serializers\\V2FeedPackageAnnotationStrategyFacts.cs\" />\n<Compile Include=\"PasswordValidationRegexTests.cs\" />\n<Compile Include=\"SearchClient\\CorrelatingHttpClientHandlerFacts.cs\" />\n<Compile Include=\"SearchClient\\RequestInspectingHandler.cs\" />\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Refactor NuGetEntityTypeSerializer + unit test coverage (#3879)
|
455,759 |
07.05.2017 11:01:58
| -7,200 |
d2e8c0867f96621fe3c1db74660e0c3c8ce623a5
|
Use NormalizedVersion in URLs contained in PackageAddedNotice
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/ApiController.cs",
"new_path": "src/NuGetGallery/Controllers/ApiController.cs",
"diff": "@@ -500,8 +500,8 @@ private async Task<ActionResult> CreatePackageInternal()\n// Notify user of push\nMessageService.SendPackageAddedNotice(package,\n- Url.Action(\"DisplayPackage\", \"Packages\", routeValues: new { id = package.PackageRegistration.Id, version = package.Version }, protocol: Request.Url.Scheme),\n- Url.Action(\"ReportMyPackage\", \"Packages\", routeValues: new { id = package.PackageRegistration.Id, version = package.Version }, protocol: Request.Url.Scheme),\n+ Url.Action(\"DisplayPackage\", \"Packages\", routeValues: new { id = package.PackageRegistration.Id, version = package.NormalizedVersion }, protocol: Request.Url.Scheme),\n+ Url.Action(\"ReportMyPackage\", \"Packages\", routeValues: new { id = package.PackageRegistration.Id, version = package.NormalizedVersion }, protocol: Request.Url.Scheme),\nUrl.Action(\"Account\", \"Users\", routeValues: null, protocol: Request.Url.Scheme));\nTelemetryService.TrackPackagePushEvent(package, user, User.Identity);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -1235,8 +1235,8 @@ public virtual async Task<ActionResult> VerifyPackage(VerifyPackageRequest formD\n// notify user\n_messageService.SendPackageAddedNotice(package,\n- Url.Action(\"DisplayPackage\", \"Packages\", routeValues: new { id = package.PackageRegistration.Id, version = package.Version }, protocol: Request.Url.Scheme),\n- Url.Action(\"ReportMyPackage\", \"Packages\", routeValues: new { id = package.PackageRegistration.Id, version = package.Version }, protocol: Request.Url.Scheme),\n+ Url.Action(\"DisplayPackage\", \"Packages\", routeValues: new { id = package.PackageRegistration.Id, version = package.NormalizedVersion }, protocol: Request.Url.Scheme),\n+ Url.Action(\"ReportMyPackage\", \"Packages\", routeValues: new { id = package.PackageRegistration.Id, version = package.NormalizedVersion }, protocol: Request.Url.Scheme),\nUrl.Action(\"Account\", \"Users\", routeValues: null, protocol: Request.Url.Scheme));\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/MessageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/MessageServiceFacts.cs",
"diff": "using NuGetGallery.Framework;\nusing NuGetGallery.Infrastructure.Authentication;\nusing Xunit;\n+using NuGet.Versioning;\nnamespace NuGetGallery\n{\n@@ -576,10 +577,17 @@ public void ApiKeyAddedMessageIsCorrect()\npublic class TheSendPackageAddedNoticeMethod\n{\n- [Fact]\n- public void WillSendEmailToAllOwners()\n+ [Theory]\n+ [InlineData(\"1.2.3\")]\n+ [InlineData(\"1.2.3-alpha\")]\n+ [InlineData(\"1.2.3-alpha.1\")]\n+ [InlineData(\"1.2.3+metadata\")]\n+ [InlineData(\"1.2.3-alpha+metadata\")]\n+ [InlineData(\"1.2.3-alpha.1+metadata\")]\n+ public void WillSendEmailToAllOwners(string version)\n{\n// Arrange\n+ var nugetVersion = new NuGetVersion(version);\nvar packageRegistration = new PackageRegistration\n{\nId = \"smangit\",\n@@ -591,14 +599,17 @@ public void WillSendEmailToAllOwners()\n};\nvar package = new Package\n{\n- Version = \"1.2.3\",\n+ Version = version,\nPackageRegistration = packageRegistration\n};\npackageRegistration.Packages.Add(package);\n// Act\nvar messageService = new TestableMessageService();\n- messageService.SendPackageAddedNotice(package, \"http://dummy1\", \"http://dummy2\", \"http://dummy3\");\n+ var packageUrl = $\"https://localhost/packages/{packageRegistration.Id}/{nugetVersion.ToNormalizedString()}\";\n+ var supportUrl = $\"https://localhost/packages/{packageRegistration.Id}/{nugetVersion.ToNormalizedString()}/ReportMyPackage\";\n+ var emailSettingsUrl = \"https://localhost/account\";\n+ messageService.SendPackageAddedNotice(package, packageUrl, supportUrl, emailSettingsUrl);\n// Assert\nvar message = messageService.MockMailSender.Sent.Last();\n@@ -606,9 +617,9 @@ public void WillSendEmailToAllOwners()\nAssert.Equal(\"yung@example.com\", message.To[0].Address);\nAssert.Equal(\"flynt@example.com\", message.To[1].Address);\nAssert.Equal(TestGalleryNoReplyAddress, message.From);\n- Assert.Contains(\"[Joe Shmoe] Package published - smangit 1.2.3\", message.Subject);\n+ Assert.Contains($\"[Joe Shmoe] Package published - {packageRegistration.Id} {nugetVersion.ToNormalizedString()}\", message.Subject);\nAssert.Contains(\n- \"The package [smangit 1.2.3](http://dummy1) was just published on Joe Shmoe. If this was not intended, please [contact support](http://dummy2).\", message.Body);\n+ $\"The package [{packageRegistration.Id} {nugetVersion.ToFullString()}]({packageUrl}) was just published on Joe Shmoe. If this was not intended, please [contact support]({supportUrl}).\", message.Body);\n}\n[Fact]\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Use NormalizedVersion in URLs contained in PackageAddedNotice (#3886)
|
455,737 |
08.05.2017 01:40:17
| 25,200 |
107214320be86f3c23bca9a093c8ea9a4efb34e1
|
Add nullcheck and use TryParse.
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/SemVerLevelKey.cs",
"new_path": "src/NuGetGallery.Core/SemVerLevelKey.cs",
"diff": "@@ -57,8 +57,9 @@ public static class SemVerLevelKey\n// Check the package dependencies for SemVer-compliance.\n// As soon as a SemVer2-compliant dependency version is found that is not SemVer1-compliant,\n// this package in itself is to be identified as to have SemVerLevelKey.SemVer2.\n- var dependencyVersionRange = VersionRange.Parse(dependency.VersionSpec);\n-\n+ VersionRange dependencyVersionRange;\n+ if (dependency.VersionSpec != null && VersionRange.TryParse(dependency.VersionSpec, out dependencyVersionRange))\n+ {\nif ((dependencyVersionRange.MinVersion != null && dependencyVersionRange.MinVersion.IsSemVer2)\n|| (dependencyVersionRange.MaxVersion != null && dependencyVersionRange.MaxVersion.IsSemVer2))\n{\n@@ -66,6 +67,7 @@ public static class SemVerLevelKey\n}\n}\n}\n+ }\nreturn Unknown;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Core.Facts/SemVerLevelKeyFacts.cs",
"new_path": "tests/NuGetGallery.Core.Facts/SemVerLevelKeyFacts.cs",
"diff": "@@ -93,6 +93,7 @@ public void ReturnsSemVer2ForSemVer2CompliantDependenciesThatAreNotSemVer1Compli\n[InlineData(\"1.0.0-alpha\")]\n[InlineData(\"[1.0-alpha, 2.0.0)\")]\n[InlineData(\"[1.0, 2.0.0-alpha)\")]\n+ [InlineData(null)]\npublic void ReturnsUnknownForNonSemVer2CompliantDependenciesThatAreNotSemVer1Compliant(string versionSpec)\n{\n// Arrange\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Add nullcheck and use TryParse. (#3890)
|
455,759 |
08.05.2017 10:42:37
| -7,200 |
84f8b7d0a53e6e9af66baf6673c909ce7c54a655
|
Show full version on package details page
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Auditing/PackageAuditRecord.cs",
"new_path": "src/NuGetGallery.Core/Auditing/PackageAuditRecord.cs",
"diff": "@@ -49,7 +49,7 @@ public PackageAuditRecord(Package package, AuditedPackageAction action)\npublic override string GetPath()\n{\n- return $\"{Id}/{NuGetVersionNormalizer.Normalize(Version)}\"\n+ return $\"{Id}/{NuGetVersionFormatter.Normalize(Version)}\"\n.ToLowerInvariant();\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/NuGetVersionExtensions.cs",
"new_path": "src/NuGetGallery.Core/NuGetVersionExtensions.cs",
"diff": "namespace NuGetGallery\n{\n- public static class NuGetVersionNormalizer\n+ public static class NuGetVersionFormatter\n{\npublic static string Normalize(string version)\n{\n@@ -19,6 +19,19 @@ public static string Normalize(string version)\nreturn parsed.ToNormalizedString();\n}\n+\n+ public static string ToFullStringOrFallback(string version, string fallback = \"\")\n+ {\n+ NuGetVersion nugetVersion;\n+ if (NuGetVersion.TryParse(version, out nugetVersion))\n+ {\n+ return nugetVersion.ToFullString();\n+ }\n+ else\n+ {\n+ return fallback;\n+ }\n+ }\n}\npublic static class NuGetVersionExtensions\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/ApiController.cs",
"new_path": "src/NuGetGallery/Controllers/ApiController.cs",
"diff": "@@ -142,7 +142,7 @@ public virtual async Task<ActionResult> GetPackage(string id, string version)\n}\n// Normalize the version\n- version = NuGetVersionNormalizer.Normalize(version);\n+ version = NuGetVersionFormatter.Normalize(version);\n}\nelse\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -300,7 +300,7 @@ public virtual async Task<ActionResult> UploadPackage(HttpPostedFileBase uploadF\npublic virtual async Task<ActionResult> DisplayPackage(string id, string version)\n{\n- string normalized = NuGetVersionNormalizer.Normalize(version);\n+ string normalized = NuGetVersionFormatter.Normalize(version);\nif (!string.Equals(version, normalized))\n{\n// Permanent redirect to the normalized one (to avoid multiple URLs for the same content)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Infrastructure/PackageIndexEntity.cs",
"new_path": "src/NuGetGallery/Infrastructure/PackageIndexEntity.cs",
"diff": "@@ -136,7 +136,7 @@ public Document ToDocument()\ndocument.Add(new Field(\"Version\", Package.Version.ToStringSafe(), Field.Store.YES, Field.Index.NO));\nstring normalizedVersion = String.IsNullOrEmpty(Package.NormalizedVersion) ?\n- NuGetVersionNormalizer.Normalize(Package.Version) :\n+ NuGetVersionFormatter.Normalize(Package.Version) :\nPackage.NormalizedVersion;\ndocument.Add(new Field(\"NormalizedVersion\", normalizedVersion.ToStringSafe(), Field.Store.YES, Field.Index.NO));\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/OData/QueryInterceptors/NormalizeVersionInterceptor.cs",
"new_path": "src/NuGetGallery/OData/QueryInterceptors/NormalizeVersionInterceptor.cs",
"diff": "@@ -26,7 +26,7 @@ protected override Expression VisitBinary(BinaryExpression node)\n// We have a \"Package.Version == <constant>\" expression!\n// Transform the constant version into a normalized version\n- string newVersion = NuGetVersionNormalizer.Normalize((string)constSide.Value);\n+ string newVersion = NuGetVersionFormatter.Normalize((string)constSide.Value);\n// Create a new expression that checks the new constant against NormalizedVersion instead\nreturn Expression.MakeBinary(\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/OData/SearchService/SearchHijacker.cs",
"new_path": "src/NuGetGallery/OData/SearchService/SearchHijacker.cs",
"diff": "@@ -216,7 +216,7 @@ private static bool IsSubstringOfFunctionCall(SingleValueNode expression)\n}\nelse if (memberSide.Member == VersionMember)\n{\n- return Tuple.Create(Target.Version, NuGetVersionNormalizer.Normalize((string)constSide.Value));\n+ return Tuple.Create(Target.Version, NuGetVersionFormatter.Normalize((string)constSide.Value));\n}\nelse if (memberSide.Member == IdMember)\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/OData/Serializers/V2FeedPackageAnnotationStrategy.cs",
"new_path": "src/NuGetGallery/OData/Serializers/V2FeedPackageAnnotationStrategy.cs",
"diff": "@@ -25,7 +25,7 @@ public override void Annotate(HttpRequestMessage request, ODataEntry entry, obje\n}\n// Patch links to use normalized versions\n- var normalizedVersion = NuGetVersionNormalizer.Normalize(feedPackage.Version);\n+ var normalizedVersion = NuGetVersionFormatter.Normalize(feedPackage.Version);\nNormalizeNavigationLinks(entry, request, feedPackage, normalizedVersion);\n// Set Atom entry metadata\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/DownloadCountObjectMaterializedInterceptor.cs",
"new_path": "src/NuGetGallery/Services/DownloadCountObjectMaterializedInterceptor.cs",
"diff": "@@ -29,7 +29,7 @@ protected void InterceptPackageMaterialized(Package package)\n}\nvar packageNormalizedVersion = String.IsNullOrEmpty(package.NormalizedVersion)\n- ? NuGetVersionNormalizer.Normalize(package.Version)\n+ ? NuGetVersionFormatter.Normalize(package.Version)\n: package.NormalizedVersion;\nint downloadCount;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/PackageFileService.cs",
"new_path": "src/NuGetGallery/Services/PackageFileService.cs",
"diff": "@@ -131,7 +131,7 @@ private static string BuildFileName(Package package)\nreturn BuildFileName(\npackage.PackageRegistration.Id,\nString.IsNullOrEmpty(package.NormalizedVersion) ?\n- NuGetVersionNormalizer.Normalize(package.Version) :\n+ NuGetVersionFormatter.Normalize(package.Version) :\npackage.NormalizedVersion);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/PackageService.cs",
"new_path": "src/NuGetGallery/Services/PackageService.cs",
"diff": "@@ -244,7 +244,7 @@ public virtual Package FindPackageByIdAndVersionStrict(string id, string version\nthrow new ArgumentException(nameof(version));\n}\n- var normalizedVersion = NuGetVersionNormalizer.Normalize(version);\n+ var normalizedVersion = NuGetVersionFormatter.Normalize(version);\n// These string comparisons are case-(in)sensitive depending on SQLServer collation.\n// Case-insensitive collation is recommended, e.g. SQL_Latin1_General_CP1_CI_AS.\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/PackageViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/PackageViewModel.cs",
"diff": "using System;\nusing System.Linq;\nusing System.Collections.Generic;\n+using NuGet.Versioning;\nnamespace NuGetGallery\n{\n@@ -10,13 +11,18 @@ public class PackageViewModel : IPackageVersionModel\n{\nprivate readonly Package _package;\nprivate string _pendingTitle;\n+ private string _fullVersion;\npublic PackageViewModel(Package package)\n{\n_package = package;\n+\n+ _fullVersion = NuGetVersionFormatter.ToFullStringOrFallback(package.Version, fallback: package.Version);\n+\nVersion = String.IsNullOrEmpty(package.NormalizedVersion) ?\n- NuGetVersionNormalizer.Normalize(package.Version) :\n+ NuGetVersionFormatter.Normalize(package.Version) :\npackage.NormalizedVersion;\n+\nDescription = package.Description;\nReleaseNotes = package.ReleaseNotes;\nIconUrl = package.IconUrl;\n@@ -40,6 +46,7 @@ public PackageViewModel(Package package)\nLicenseNames = licenseNames.Split(',').Select(l => l.Trim());\n}\n}\n+\npublic string Description { get; set; }\npublic string ReleaseNotes { get; set; }\npublic string IconUrl { get; set; }\n@@ -69,6 +76,7 @@ public string Id\n}\npublic string Version { get; set; }\n+ public string FullVersion => _fullVersion;\npublic string Title\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"diff": "<div class=\"package-page-heading\">\n<h1 title=\"@Model.Title\">@Model.Title.Abbreviate(40)</h1>\n- <h2>@Model.Version</h2>\n+ <h2>@Model.FullVersion</h2>\n</div>\n@foreach (var line in Model.Description.ToStringSafe().Split('\\n'))\n{\n<td class=\"version\" title=\"@cellTitle\">\n@if (!packageVersion.IsCurrent(Model))\n{\n- <a title=\"@packageVersion.Title @packageVersion.Version\" href=\"@Url.Package(packageVersion) \">\n+ <a title=\"@packageVersion.Title @packageVersion.FullVersion\" href=\"@Url.Package(packageVersion) \">\n@packageVersion.Title.Abbreviate(20)\n@packageVersion.Version\n@if (packageVersion.LatestStableVersion)\n}\nelse\n{\n- <a href=\"@Url.Package(packageVersion)\" title=\"@packageVersion.Title @packageVersion.Version (this version)\">\n+ <a href=\"@Url.Package(packageVersion)\" title=\"@packageVersion.Title @packageVersion.FullVersion (this version)\">\n@packageVersion.Title.Abbreviate(20) @packageVersion.Version (this version)\n</a>\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/PackageFileServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/PackageFileServiceFacts.cs",
"diff": "@@ -439,7 +439,7 @@ public async Task WillSaveTheFileStreamViaTheFileStorageService()\nreturn string.Format(\nConstants.PackageFileSavePathTemplate,\nid.ToLowerInvariant(),\n- NuGetVersionNormalizer.Normalize(version).ToLowerInvariant(), // No matter what ends up getting passed in, the version should be normalized\n+ NuGetVersionFormatter.Normalize(version).ToLowerInvariant(), // No matter what ends up getting passed in, the version should be normalized\nConstants.NuGetPackageFileExtension);\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Show full version on package details page (#3887)
|
455,759 |
08.05.2017 18:40:35
| -7,200 |
d44ebb17c040ce3b2c0c1835b294163d837cc86d
|
Highlight semver2 packages on package details view
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/PackageViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/PackageViewModel.cs",
"diff": "@@ -10,6 +10,7 @@ namespace NuGetGallery\npublic class PackageViewModel : IPackageVersionModel\n{\nprivate readonly Package _package;\n+ private readonly bool _isSemVer2;\nprivate string _pendingTitle;\nprivate string _fullVersion;\n@@ -18,6 +19,7 @@ public PackageViewModel(Package package)\n_package = package;\n_fullVersion = NuGetVersionFormatter.ToFullStringOrFallback(package.Version, fallback: package.Version);\n+ _isSemVer2 = package.SemVerLevelKey == SemVerLevelKey.SemVer2;\nVersion = String.IsNullOrEmpty(package.NormalizedVersion) ?\nNuGetVersionFormatter.Normalize(package.Version) :\n@@ -77,6 +79,7 @@ public string Id\npublic string Version { get; set; }\npublic string FullVersion => _fullVersion;\n+ public bool IsSemVer2 => _isSemVer2;\npublic string Title\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"diff": "</p>\n}\n+ @if (Model.IsSemVer2)\n+ {\n+ <p class=\"message warning\">\n+ This package is only available for download with NuGet client version 4.3.0-preview1 and above.\n+ Reach out to support if you have more questions.\n+ </p>\n+ }\n+\n<div class=\"package-page-heading\">\n<h1 title=\"@Model.Title\">@Model.Title.Abbreviate(40)</h1>\n<h2>@Model.FullVersion</h2>\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Highlight semver2 packages on package details view (#3893)
|
455,759 |
08.05.2017 18:40:49
| -7,200 |
980958b7cf97291a0771552bb5f5c7219ab7de39
|
Fix bug in IsLatest(Stable)SemVer2
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Infrastructure/Lucene/LuceneIndexingService.cs",
"new_path": "src/NuGetGallery/Infrastructure/Lucene/LuceneIndexingService.cs",
"diff": "using System.Linq;\nusing System.Threading.Tasks;\nusing Lucene.Net.Index;\n-using Lucene.Net.Store;\nusing NuGetGallery.Configuration;\nusing NuGetGallery.Diagnostics;\nusing WebBackgrounder;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/PackageService.cs",
"new_path": "src/NuGetGallery/Services/PackageService.cs",
"diff": "@@ -847,7 +847,7 @@ public async Task UpdateIsLatestAsync(PackageRegistration packageRegistration, b\n// If the newest uploaded package is a prerelease package, we need to find an older package that is\n// a release version and set it to IsLatest.\nvar latestSemVer2ReleasePackage = FindPackage(\n- packageRegistration.Packages.Where(p => !p.IsPrerelease && !p.Deleted && p.Listed && p.SemVerLevelKey == SemVerLevelKey.SemVer2));\n+ packageRegistration.Packages.Where(p => !p.IsPrerelease && !p.Deleted && p.Listed && (p.SemVerLevelKey == SemVerLevelKey.SemVer2 || p.SemVerLevelKey == SemVerLevelKey.Unknown)));\nif (latestSemVer2ReleasePackage != null)\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs",
"diff": "@@ -1053,7 +1053,7 @@ public async Task CommitIfCommitChangesIsTrue()\n}\n[Fact]\n- public async Task WillUpdateIsLatest1()\n+ public async Task UpdateIsLatestScenarioForPrereleaseAsAbsoluteLatest()\n{\n// Arrange\nvar packages = new HashSet<Package>();\n@@ -1072,14 +1072,20 @@ public async Task WillUpdateIsLatest1()\n// Assert\nAssert.True(package10A.IsLatest);\n+ Assert.True(package10A.IsLatestSemVer2);\nAssert.False(package10A.IsLatestStable);\n+ Assert.False(package10A.IsLatestStableSemVer2);\n+\nAssert.False(package09.IsLatest);\n+ Assert.False(package09.IsLatestSemVer2);\nAssert.True(package09.IsLatestStable);\n+ Assert.True(package09.IsLatestStableSemVer2);\n+\npackageRepository.Verify();\n}\n[Fact]\n- public async Task WillUpdateIsLatest2()\n+ public async Task UpdateIsLatestScenarioForStableAsAbsoluteLatest()\n{\n// Arrange\nvar packages = new HashSet<Package>();\n@@ -1100,11 +1106,112 @@ public async Task WillUpdateIsLatest2()\n// Assert\nAssert.True(package100.IsLatest);\n+ Assert.True(package100.IsLatestSemVer2);\nAssert.True(package100.IsLatestStable);\n+ Assert.True(package100.IsLatestStableSemVer2);\n+\nAssert.False(package10A.IsLatest);\n+ Assert.False(package10A.IsLatestSemVer2);\nAssert.False(package10A.IsLatestStable);\n+ Assert.False(package10A.IsLatestStableSemVer2);\n+\nAssert.False(package09.IsLatest);\n+ Assert.False(package09.IsLatestSemVer2);\nAssert.False(package09.IsLatestStable);\n+ Assert.False(package09.IsLatestStableSemVer2);\n+\n+ packageRepository.Verify();\n+ }\n+\n+ [Fact]\n+ public async Task UpdateIsLatestScenarioForSemVer2PrereleaseAsAbsoluteLatest()\n+ {\n+ // Arrange\n+ var packages = new HashSet<Package>();\n+ var packageRegistration = new PackageRegistration { Packages = packages };\n+ var semVer2Package = new Package { PackageRegistration = packageRegistration, Version = \"1.0.1-alpha.1\", IsPrerelease = true, SemVerLevelKey = SemVerLevelKey.SemVer2 };\n+ packages.Add(semVer2Package);\n+ var package100 = new Package { PackageRegistration = packageRegistration, Version = \"1.0.0\" };\n+ packages.Add(package100);\n+ var package10A = new Package { PackageRegistration = packageRegistration, Version = \"1.0.0-a\", IsPrerelease = true };\n+ packages.Add(package10A);\n+ var package09 = new Package { PackageRegistration = packageRegistration, Version = \"0.9.0\" };\n+ packages.Add(package09);\n+ var packageRepository = new Mock<IEntityRepository<Package>>(MockBehavior.Strict);\n+ packageRepository.Setup(r => r.CommitChangesAsync())\n+ .Returns(Task.CompletedTask).Verifiable();\n+ var service = CreateService(packageRepository: packageRepository);\n+\n+ // Act\n+ await service.UpdateIsLatestAsync(packageRegistration, true);\n+\n+ // Assert\n+ Assert.True(semVer2Package.IsLatestSemVer2);\n+ Assert.False(semVer2Package.IsLatestStableSemVer2);\n+ Assert.False(semVer2Package.IsLatest);\n+ Assert.False(semVer2Package.IsLatestStable);\n+\n+ Assert.True(package100.IsLatest);\n+ Assert.False(package100.IsLatestSemVer2);\n+ Assert.True(package100.IsLatestStable);\n+ Assert.True(package100.IsLatestStableSemVer2);\n+\n+ Assert.False(package10A.IsLatest);\n+ Assert.False(package10A.IsLatestSemVer2);\n+ Assert.False(package10A.IsLatestStable);\n+ Assert.False(package10A.IsLatestStableSemVer2);\n+\n+ Assert.False(package09.IsLatest);\n+ Assert.False(package09.IsLatestSemVer2);\n+ Assert.False(package09.IsLatestStable);\n+ Assert.False(package09.IsLatestStableSemVer2);\n+\n+ packageRepository.Verify();\n+ }\n+\n+ [Fact]\n+ public async Task UpdateIsLatestScenarioForSemVer2StableAsAbsoluteLatest()\n+ {\n+ // Arrange\n+ var packages = new HashSet<Package>();\n+ var packageRegistration = new PackageRegistration { Packages = packages };\n+ var semVer2Package = new Package { PackageRegistration = packageRegistration, Version = \"1.0.1+metadata\", SemVerLevelKey = SemVerLevelKey.SemVer2 };\n+ packages.Add(semVer2Package);\n+ var package100 = new Package { PackageRegistration = packageRegistration, Version = \"1.0.0\" };\n+ packages.Add(package100);\n+ var package10A = new Package { PackageRegistration = packageRegistration, Version = \"1.0.0-a\", IsPrerelease = true };\n+ packages.Add(package10A);\n+ var package09 = new Package { PackageRegistration = packageRegistration, Version = \"0.9.0\" };\n+ packages.Add(package09);\n+ var packageRepository = new Mock<IEntityRepository<Package>>(MockBehavior.Strict);\n+ packageRepository.Setup(r => r.CommitChangesAsync())\n+ .Returns(Task.CompletedTask).Verifiable();\n+ var service = CreateService(packageRepository: packageRepository);\n+\n+ // Act\n+ await service.UpdateIsLatestAsync(packageRegistration, true);\n+\n+ // Assert\n+ Assert.True(semVer2Package.IsLatestSemVer2);\n+ Assert.True(semVer2Package.IsLatestStableSemVer2);\n+ Assert.False(semVer2Package.IsLatest);\n+ Assert.False(semVer2Package.IsLatestStable);\n+\n+ Assert.True(package100.IsLatest);\n+ Assert.False(package100.IsLatestSemVer2);\n+ Assert.True(package100.IsLatestStable);\n+ Assert.False(package100.IsLatestStableSemVer2);\n+\n+ Assert.False(package10A.IsLatest);\n+ Assert.False(package10A.IsLatestSemVer2);\n+ Assert.False(package10A.IsLatestStable);\n+ Assert.False(package10A.IsLatestStableSemVer2);\n+\n+ Assert.False(package09.IsLatest);\n+ Assert.False(package09.IsLatestSemVer2);\n+ Assert.False(package09.IsLatestStable);\n+ Assert.False(package09.IsLatestStableSemVer2);\n+\npackageRepository.Verify();\n}\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Fix bug in IsLatest(Stable)SemVer2 (#3895)
|
455,759 |
09.05.2017 11:56:18
| -7,200 |
0c290a834978845aa5631b34b9202f63e67d10a4
|
VerifyPackage on ApiController should treat version as optional parameter
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/ApiController.cs",
"new_path": "src/NuGetGallery/Controllers/ApiController.cs",
"diff": "@@ -266,7 +266,7 @@ public async virtual Task<ActionResult> VerifyPackageKeyAsync(string id, string\nprivate async Task<HttpStatusCodeWithBodyResult> VerifyPackageKeyInternalAsync(User user, Credential credential, string id, string version)\n{\n// Verify that the user has permission to push for the specific Id \\ version combination.\n- var package = PackageService.FindPackageByIdAndVersionStrict(id, version);\n+ var package = PackageService.FindPackageByIdAndVersion(id, version, semVerLevelKey: SemVerLevelKey.SemVer2);\nif (package == null)\n{\nreturn new HttpStatusCodeWithBodyResult(\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/ApiControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/ApiControllerFacts.cs",
"diff": "@@ -1052,7 +1052,9 @@ internal TestableApiController SetupController(string keyType, string scopes, Pa\nvar id = package?.PackageRegistration?.Id ?? \"foo\";\nvar version = package?.Version ?? \"1.0.0\";\n- controller.MockPackageService.Setup(s => s.FindPackageByIdAndVersionStrict(id, version)).Returns(package);\n+ controller.MockPackageService\n+ .Setup(s => s.FindPackageByIdAndVersion(id, version, SemVerLevelKey.SemVer2, true))\n+ .Returns(package);\ncontroller.SetCurrentUser(user, scopes);\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
VerifyPackage on ApiController should treat version as optional parameter (#3903)
|
455,759 |
09.05.2017 20:38:02
| -7,200 |
2fb3fda662f9e3a6dd5e1ec9a148a3addf43cd3a
|
UpdateIsLatest not resetting IsLatest(Stable)SemVer2 on previous latest versions
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/PackageService.cs",
"new_path": "src/NuGetGallery/Services/PackageService.cs",
"diff": "@@ -793,7 +793,7 @@ public async Task UpdateIsLatestAsync(PackageRegistration packageRegistration, b\n// TODO: improve setting the latest bit; this is horrible. Trigger maybe?\nvar currentUtcTime = DateTime.UtcNow;\n- foreach (var pv in packageRegistration.Packages.Where(p => p.IsLatest || p.IsLatestStable))\n+ foreach (var pv in packageRegistration.Packages.Where(p => p.IsLatest || p.IsLatestStable || p.IsLatestSemVer2 || p.IsLatestStableSemVer2))\n{\npv.IsLatest = false;\npv.IsLatestStable = false;\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs",
"diff": "@@ -1052,6 +1052,50 @@ public async Task CommitIfCommitChangesIsTrue()\npackageRepository.Verify(r => r.CommitChangesAsync(), Times.Once());\n}\n+ [Fact]\n+ public async Task ResetsCurrentLatestPackageVersionsBeforeUpdate()\n+ {\n+ // Arrange\n+ var packageRegistration = new PackageRegistration();\n+\n+ var previousLatestStable = new Package { PackageRegistration = packageRegistration, Version = \"1.0.0\", IsLatestStable = true };\n+ packageRegistration.Packages.Add(previousLatestStable);\n+ var previousLatest = new Package { PackageRegistration = packageRegistration, Version = \"1.0.0-alpha\", IsLatest = true, IsPrerelease = true };\n+ packageRegistration.Packages.Add(previousLatest);\n+ var previousLatestStableSemVer2 = new Package { PackageRegistration = packageRegistration, Version = \"1.0.1+metadata\", IsLatestStableSemVer2 = true, SemVerLevelKey = SemVerLevelKey.SemVer2 };\n+ packageRegistration.Packages.Add(previousLatestStableSemVer2);\n+ var previousLatestSemVer2 = new Package { PackageRegistration = packageRegistration, Version = \"1.0.1-alpha.1\", IsLatestSemVer2 = true, IsPrerelease = true, SemVerLevelKey = SemVerLevelKey.SemVer2 };\n+ packageRegistration.Packages.Add(previousLatestSemVer2);\n+\n+ // Simulates adding newer versions, to ensure the previous latest are no longer latest at end of test.\n+ var newLatestStable = new Package { PackageRegistration = packageRegistration, Version = \"1.0.1\", IsLatestStable = true };\n+ packageRegistration.Packages.Add(newLatestStable);\n+ var newLatest = new Package { PackageRegistration = packageRegistration, Version = \"1.0.2-alpha\", IsLatest = true, IsPrerelease = true };\n+ packageRegistration.Packages.Add(newLatest);\n+ var newLatestStableSemVer2 = new Package { PackageRegistration = packageRegistration, Version = \"1.0.2+metadata\", IsLatestStableSemVer2 = true, SemVerLevelKey = SemVerLevelKey.SemVer2 };\n+ packageRegistration.Packages.Add(newLatestStableSemVer2);\n+ var newLatestSemVer2 = new Package { PackageRegistration = packageRegistration, Version = \"1.0.3-alpha.1\", IsLatestSemVer2 = true, IsPrerelease = true, SemVerLevelKey = SemVerLevelKey.SemVer2 };\n+ packageRegistration.Packages.Add(newLatestSemVer2);\n+\n+ var packageRepository = new Mock<IEntityRepository<Package>>();\n+\n+ var service = CreateService(packageRepository: packageRepository);\n+\n+ // Act\n+ await service.UpdateIsLatestAsync(packageRegistration, commitChanges: true);\n+\n+ // Assert\n+ Assert.False(previousLatestStable.IsLatestStable);\n+ Assert.False(previousLatest.IsLatest);\n+ Assert.False(previousLatestSemVer2.IsLatestSemVer2);\n+ Assert.False(previousLatestStableSemVer2.IsLatestStableSemVer2);\n+\n+ Assert.True(newLatestStable.IsLatestStable);\n+ Assert.True(newLatest.IsLatest);\n+ Assert.True(newLatestSemVer2.IsLatestSemVer2);\n+ Assert.True(newLatestStableSemVer2.IsLatestStableSemVer2);\n+ }\n+\n[Fact]\npublic async Task UpdateIsLatestScenarioForPrereleaseAsAbsoluteLatest()\n{\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
UpdateIsLatest not resetting IsLatest(Stable)SemVer2 on previous latest versions (#3909)
|
455,759 |
09.05.2017 21:09:24
| -7,200 |
0110e78f870324aa5e2ac216c858321ec8d24f9c
|
Fix malformed URL in redirect after package upload
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -1248,7 +1248,11 @@ public virtual async Task<ActionResult> VerifyPackage(VerifyPackageRequest formD\nTempData[\"Message\"] = String.Format(\nCultureInfo.CurrentCulture, Strings.SuccessfullyUploadedPackage, package.PackageRegistration.Id, package.Version);\n- return RedirectToRoute(RouteName.DisplayPackage, new { package.PackageRegistration.Id, package.NormalizedVersion });\n+ return RedirectToRoute(RouteName.DisplayPackage, new\n+ {\n+ id = package.PackageRegistration.Id,\n+ version = package.NormalizedVersion\n+ });\n}\nprivate async Task<PackageArchiveReader> SafeCreatePackage(NuGetGallery.User currentUser, Stream uploadFile)\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Fix malformed URL in redirect after package upload (#3915)
|
455,759 |
10.05.2017 15:41:24
| -7,200 |
42c5428b8c6d771e2d31f355fb110f4c7932a4d6
|
Minor fix for search results package URLs (when to use version or not in the URL)
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/ListPackageItemViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/ListPackageItemViewModel.cs",
"diff": "@@ -38,7 +38,8 @@ public bool UseVersion\nget\n{\n// only use the version in URLs when necessary. This would happen when the latest version is not the same as the latest stable version.\n- return !(LatestVersion && LatestStableVersion);\n+ return !(!IsSemVer2 && LatestVersion && LatestStableVersion)\n+ && !(IsSemVer2 && LatestStableVersionSemVer2 && LatestVersionSemVer2);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/ViewModels/ListPackageItemViewModelFacts.cs",
"new_path": "tests/NuGetGallery.Facts/ViewModels/ListPackageItemViewModelFacts.cs",
"diff": "@@ -231,5 +231,31 @@ public void UseVersionIfLatestAndStableNotSame()\nlistPackageItemViewModel.LatestStableVersion = true;\nAssert.False(listPackageItemViewModel.UseVersion);\n}\n+\n+ [Fact]\n+ public void UseVersionIfLatestSemVer2AndStableSemVer2NotSame()\n+ {\n+ var package = new Package()\n+ {\n+ SemVerLevelKey = SemVerLevelKey.SemVer2,\n+ IsLatestSemVer2 = true,\n+ IsLatestStableSemVer2 = false\n+ };\n+\n+ var listPackageItemViewModel = new ListPackageItemViewModel(package);\n+ Assert.True(listPackageItemViewModel.UseVersion);\n+\n+ listPackageItemViewModel.LatestVersionSemVer2 = false;\n+ listPackageItemViewModel.LatestStableVersionSemVer2 = true;\n+ Assert.True(listPackageItemViewModel.UseVersion);\n+\n+ listPackageItemViewModel.LatestVersionSemVer2 = false;\n+ listPackageItemViewModel.LatestStableVersionSemVer2 = false;\n+ Assert.True(listPackageItemViewModel.UseVersion);\n+\n+ listPackageItemViewModel.LatestVersionSemVer2 = true;\n+ listPackageItemViewModel.LatestStableVersionSemVer2 = true;\n+ Assert.False(listPackageItemViewModel.UseVersion);\n+ }\n}\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Minor fix for search results package URLs (when to use version or not in the URL)
|
455,759 |
10.05.2017 17:41:45
| -7,200 |
67e60e614df2e96e2edc51c129de3373fe26d496
|
UrlHelper extension for Package should use NormalizedVersion
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/UrlExtensions.cs",
"new_path": "src/NuGetGallery/UrlExtensions.cs",
"diff": "@@ -110,7 +110,7 @@ public static string Package(this UrlHelper url, string id, string version, stri\npublic static string Package(this UrlHelper url, Package package)\n{\n- return url.Package(package.PackageRegistration.Id, package.Version);\n+ return url.Package(package.PackageRegistration.Id, package.NormalizedVersion);\n}\npublic static string Package(this UrlHelper url, IPackageVersionModel package)\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
UrlHelper extension for Package should use NormalizedVersion (#3925)
|
455,759 |
10.05.2017 20:31:01
| -7,200 |
e2b662a16d4ce4729f4e0b294493e7339435b825
|
Default to latest stable semver2 on package details page
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"diff": "<p>\n<code>\nInstall-Package @Model.Id\n- @if (!Model.LatestVersion || !Model.Listed)\n+ @if (!Model.LatestVersionSemVer2 || !Model.Listed)\n{\n<text> -Version @Model.Version</text>\n}\n<tbody>\n@foreach (var packageVersion in Model.PackageVersions)\n{\n- var rowClass = packageVersion.LatestStableVersion ? \"recommended\" : null;\n- var cellTitle = packageVersion.LatestStableVersion ? \"Latest Stable Version\" : null;\n+ var rowClass = packageVersion.LatestStableVersionSemVer2 ? \"recommended\" : null;\n+ var cellTitle = packageVersion.LatestStableVersionSemVer2 ? \"Latest Stable Version\" : null;\nif (!packageVersion.Deleted && (packageVersion.Listed || (Model.IsOwner(User) || User.IsAdministrator())))\n{\n<tr class=\"versionTableRow @rowClass\">\n<a title=\"@packageVersion.Title @packageVersion.FullVersion\" href=\"@Url.Package(packageVersion) \">\n@packageVersion.Title.Abbreviate(20)\n@packageVersion.Version\n- @if (packageVersion.LatestStableVersion)\n+ @if (packageVersion.LatestStableVersionSemVer2)\n{\n@:(latest stable)\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Default to latest stable semver2 on package details page (#3930)
|
455,759 |
11.05.2017 09:40:02
| -7,200 |
d1fa7bfd0219a31705fab87fd4865b302dbdcabf
|
User profile page does not show SemVer 2.0.0 packages
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/PackageService.cs",
"new_path": "src/NuGetGallery/Services/PackageService.cs",
"diff": "@@ -282,49 +282,86 @@ public IEnumerable<Package> FindPackagesByOwner(User user, bool includeUnlisted)\n// Like DisplayPackage we should prefer to show you information from the latest stable version,\n// but show you the latest version (potentially latest UNLISTED version) otherwise.\n+ var mergedResults = new Dictionary<string, Package>(StringComparer.OrdinalIgnoreCase);\n+\n+ MergeLatestPackagesByOwner(user, includeUnlisted, mergedResults);\n+ MergeLatestStablePackagesByOwner(user, includeUnlisted, mergedResults);\n+\n+ return mergedResults.Values;\n+ }\n+\n+ private void MergeLatestStablePackagesByOwner(User user, bool includeUnlisted, Dictionary<string, Package> mergedResults)\n+ {\nIQueryable<Package> latestStablePackageVersions = _packageRepository.GetAll()\n.Where(p =>\np.PackageRegistration.Owners.Any(owner => owner.Key == user.Key)\n- && p.IsLatestStable)\n+ && (p.IsLatestStable || p.IsLatestStableSemVer2))\n.Include(p => p.PackageRegistration)\n.Include(p => p.PackageRegistration.Owners);\n- var latestPackageVersions = _packageRepository.GetAll()\n- .Where(p =>\n- p.PackageRegistration.Owners.Any(owner => owner.Key == user.Key)\n- && p.IsLatest)\n- .Include(p => p.PackageRegistration)\n- .Include(p => p.PackageRegistration.Owners);\n+ foreach (var latestStablePackagesById in latestStablePackageVersions.ToList().GroupBy(p => p.PackageRegistration.Id))\n+ {\n+ Package latestStablePackage;\n+ if (includeUnlisted)\n+ {\n+ latestStablePackage = latestStablePackagesById.Single();\n+ }\n+ else\n+ {\n+ latestStablePackage =\n+ latestStablePackagesById.SingleOrDefault(p => p.IsLatestStableSemVer2)\n+ ?? latestStablePackagesById.SingleOrDefault(p => p.IsLatestStable);\n+ }\n+\n+ mergedResults[latestStablePackage.PackageRegistration.Id] = latestStablePackage;\n+ }\n+ }\n+ private void MergeLatestPackagesByOwner(User user, bool includeUnlisted, Dictionary<string, Package> mergedResults)\n+ {\n+ IQueryable<Package> latestPackageVersions;\nif (includeUnlisted)\n{\nlatestPackageVersions = _packageRegistrationRepository.GetAll()\n.Where(pr => pr.Owners.Where(owner => owner.Username == user.Username).Any())\n- .Select(pr => pr.Packages.OrderByDescending(p => p.Version).FirstOrDefault())\n+ .Select(pr => pr.Packages.OrderByDescending(p => p.Version).First())\n+ .Include(p => p.PackageRegistration)\n+ .Include(p => p.PackageRegistration.Owners);\n+ }\n+ else\n+ {\n+ latestPackageVersions = _packageRepository.GetAll()\n+ .Where(p =>\n+ p.PackageRegistration.Owners.Any(owner => owner.Key == user.Key)\n+ && (p.IsLatest || p.IsLatestSemVer2))\n.Include(p => p.PackageRegistration)\n.Include(p => p.PackageRegistration.Owners);\n}\n- var mergedResults = new Dictionary<string, Package>(StringComparer.OrdinalIgnoreCase);\n- foreach (var package in latestPackageVersions.Where(p => p != null))\n+ foreach (var latestPackagesById in latestPackageVersions.ToList().GroupBy(p => p.PackageRegistration.Id))\n{\n- if (mergedResults.ContainsKey(package.PackageRegistration.Id)\n- && mergedResults[package.PackageRegistration.Id].Created < package.Created)\n+ Package latestPackage;\n+ if (includeUnlisted)\n{\n- mergedResults[package.PackageRegistration.Id] = package;\n+ latestPackage = latestPackagesById.Single();\n}\nelse\n{\n- mergedResults.Add(package.PackageRegistration.Id, package);\n- }\n+ latestPackage =\n+ latestPackagesById.SingleOrDefault(p => p.IsLatestSemVer2)\n+ ?? latestPackagesById.Single(p => p.IsLatest);\n}\n- foreach (var package in latestStablePackageVersions.Where(p => p != null))\n+ if (mergedResults.ContainsKey(latestPackage.PackageRegistration.Id)\n+ && mergedResults[latestPackage.PackageRegistration.Id].Created < latestPackage.Created)\n{\n- mergedResults[package.PackageRegistration.Id] = package;\n+ mergedResults[latestPackage.PackageRegistration.Id] = latestPackage;\n+ }\n+ else\n+ {\n+ mergedResults.Add(latestPackage.PackageRegistration.Id, latestPackage);\n+ }\n}\n-\n- return mergedResults.Values;\n}\npublic IEnumerable<PackageRegistration> FindPackageRegistrationsByOwner(User user)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/Profiles.cshtml",
"new_path": "src/NuGetGallery/Views/Users/Profiles.cshtml",
"diff": "@@ -56,7 +56,7 @@ else if (Model.ShowAllPackages)\n</a>\n</div>\n<div class=\"main\">\n- <h1><a href=\"@Url.Package(package.Id)\">@package.Title</a> <small>Latest version: @package.Version</small></h1>\n+ <h1><a href=\"@Url.Package(package.Id)\">@package.Title</a> <small>Latest version: @package.FullVersion</small></h1>\n<p>\n@if (String.IsNullOrEmpty(package.Description) || package.Description.Length < 350)\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs",
"diff": "@@ -1501,7 +1501,7 @@ public void ReturnsAListedPackage()\n{\nvar owner = new User { Username = \"someone\" };\nvar packageRegistration = new PackageRegistration { Id = \"theId\", Owners = { owner } };\n- var package = new Package { Version = \"1.0\", PackageRegistration = packageRegistration, Listed = true, IsLatest = true, IsLatestStable = true };\n+ var package = new Package { Version = \"1.0\", PackageRegistration = packageRegistration, Listed = true, IsLatestSemVer2 = true, IsLatestStableSemVer2 = true };\npackageRegistration.Packages.Add(package);\nvar context = GetFakeContext();\n@@ -1556,8 +1556,8 @@ public void ReturnsAPackageForEachPackageRegistration()\nvar owner = new User { Username = \"someone\" };\nvar packageRegistrationA = new PackageRegistration { Id = \"idA\", Owners = { owner } };\nvar packageRegistrationB = new PackageRegistration { Id = \"idB\", Owners = { owner } };\n- var packageA = new Package { Version = \"1.0\", PackageRegistration = packageRegistrationA, Listed = true, IsLatest = true, IsLatestStable = true };\n- var packageB = new Package { Version = \"1.0\", PackageRegistration = packageRegistrationB, Listed = true, IsLatest = true, IsLatestStable = true };\n+ var packageA = new Package { Version = \"1.0\", PackageRegistration = packageRegistrationA, Listed = true, IsLatestSemVer2 = true, IsLatestStableSemVer2 = true };\n+ var packageB = new Package { Version = \"1.0\", PackageRegistration = packageRegistrationB, Listed = true, IsLatestSemVer2 = true, IsLatestStableSemVer2 = true };\npackageRegistrationA.Packages.Add(packageA);\npackageRegistrationB.Packages.Add(packageB);\n@@ -1576,7 +1576,30 @@ public void ReturnsAPackageForEachPackageRegistration()\n}\n[Fact]\n- public void ReturnsOnlyLatestStablePackageIfBothExist()\n+ public void ReturnsOnlyLatestStableSemVer2PackageIfBothExist()\n+ {\n+ var owner = new User { Username = \"someone\" };\n+ var packageRegistration = new PackageRegistration { Id = \"theId\", Owners = { owner } };\n+ var latestPackage = new Package { Version = \"2.0.0-alpha\", PackageRegistration = packageRegistration, Listed = true, IsLatest = true };\n+ var latestSemVer2Package = new Package { Version = \"2.0.0-alpha.1\", PackageRegistration = packageRegistration, Listed = true, IsLatestSemVer2 = true };\n+ var latestStablePackage = new Package { Version = \"1.0\", PackageRegistration = packageRegistration, Listed = true, IsLatestStableSemVer2 = true };\n+ packageRegistration.Packages.Add(latestPackage);\n+ packageRegistration.Packages.Add(latestStablePackage);\n+\n+ var context = GetFakeContext();\n+ context.Users.Add(owner);\n+ context.PackageRegistrations.Add(packageRegistration);\n+ context.Packages.Add(latestPackage);\n+ context.Packages.Add(latestStablePackage);\n+ var service = Get<PackageService>();\n+\n+ var packages = service.FindPackagesByOwner(owner, includeUnlisted: false).ToList();\n+ Assert.Equal(1, packages.Count);\n+ Assert.Contains(latestStablePackage, packages);\n+ }\n+\n+ [Fact]\n+ public void ReturnsOnlyLatestStablePackageIfNoLatestStableSemVer2Exist()\n{\nvar owner = new User { Username = \"someone\" };\nvar packageRegistration = new PackageRegistration { Id = \"theId\", Owners = { owner } };\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
User profile page does not show SemVer 2.0.0 packages #3911 (#3933)
|
455,759 |
11.05.2017 16:53:29
| -7,200 |
32cfd7d004979cba6eef390f20184762ae973b4e
|
Fix functional test failure SearchMicrosoftDotNetCuratedFeed
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/OData/Serializers/V2FeedPackageAnnotationStrategy.cs",
"new_path": "src/NuGetGallery/OData/Serializers/V2FeedPackageAnnotationStrategy.cs",
"diff": "@@ -85,7 +85,11 @@ private static void NormalizeNavigationLinks(ODataEntry entry, HttpRequestMessag\nprivate static Uri BuildIdLink(string id, string version, HttpRequestMessage request)\n{\nvar packageIdentityQuery = $\"(Id='{id}',Version='{version}')\";\n- var localPath = request.RequestUri.LocalPath.Replace(packageIdentityQuery, string.Empty);\n+ var localPath = request.RequestUri.LocalPath\n+ // Remove closing brackets from Packages collection\n+ .Replace(\"/Packages()\", \"/Packages\")\n+ // Remove package identity query\n+ .Replace(packageIdentityQuery, string.Empty);\nreturn new Uri($\"{request.RequestUri.Scheme}://{request.RequestUri.Host}{localPath}{packageIdentityQuery}\");\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/OData/Serializers/V2FeedPackageAnnotationStrategyFacts.cs",
"new_path": "tests/NuGetGallery.Facts/OData/Serializers/V2FeedPackageAnnotationStrategyFacts.cs",
"diff": "@@ -83,6 +83,7 @@ public void SetsAtomEntryMetadataAnnotation()\n[Theory]\n[InlineData(\"https://localhost/api/v2/Packages\")]\n+ [InlineData(\"https://localhost/api/v2/Packages()\")]\n[InlineData(\"https://localhost/api/v2/Packages(Id='SomePackageId',Version='1.0.0')\")]\npublic void NormalizesNavigationLinksWhenSet(string requestUri)\n{\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Fix functional test failure SearchMicrosoftDotNetCuratedFeed #3941 (#3942)
|
455,759 |
12.05.2017 11:25:20
| -7,200 |
bd0d98a3f1542bf50e8f13ed2e8b1db4132e853d
|
Fix System.NotSupportedException on User profile page
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/PackageService.cs",
"new_path": "src/NuGetGallery/Services/PackageService.cs",
"diff": "@@ -324,7 +324,8 @@ private void MergeLatestPackagesByOwner(User user, bool includeUnlisted, Diction\n{\nlatestPackageVersions = _packageRegistrationRepository.GetAll()\n.Where(pr => pr.Owners.Where(owner => owner.Username == user.Username).Any())\n- .Select(pr => pr.Packages.OrderByDescending(p => p.Version).First())\n+ .Select(pr => pr.Packages.OrderByDescending(p => p.Version).FirstOrDefault())\n+ .Where(p => p != null)\n.Include(p => p.PackageRegistration)\n.Include(p => p.PackageRegistration.Owners);\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Fix System.NotSupportedException on User profile page (#3943)
|
455,759 |
12.05.2017 11:26:27
| -7,200 |
f2488ba9f9ad1ebd485ac1e9710f26bc5cf475c1
|
Fix Functional Test failure for ODataFeeds.V2FeedExtendedTests.FindPackagesByIdTest
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/OData/Serializers/V2FeedPackageAnnotationStrategy.cs",
"new_path": "src/NuGetGallery/OData/Serializers/V2FeedPackageAnnotationStrategy.cs",
"diff": "@@ -87,10 +87,20 @@ private static Uri BuildIdLink(string id, string version, HttpRequestMessage req\nvar packageIdentityQuery = $\"(Id='{id}',Version='{version}')\";\nvar localPath = request.RequestUri.LocalPath\n// Remove closing brackets from Packages collection\n+ .Replace(\"/GetUpdates\", \"/Packages\")\n+ .Replace(\"/FindPackagesById\", \"/Packages\")\n+ .Replace(\"/Search\", \"/Packages\")\n.Replace(\"/Packages()\", \"/Packages\")\n// Remove package identity query\n.Replace(packageIdentityQuery, string.Empty);\n+ // Ensure any OData queries remaining are stripped off\n+ var queryStartIndex = localPath.IndexOf('(');\n+ if (queryStartIndex != -1)\n+ {\n+ localPath = localPath.Substring(0, queryStartIndex);\n+ }\n+\nreturn new Uri($\"{request.RequestUri.Scheme}://{request.RequestUri.Host}{localPath}{packageIdentityQuery}\");\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/OData/Serializers/V2FeedPackageAnnotationStrategyFacts.cs",
"new_path": "tests/NuGetGallery.Facts/OData/Serializers/V2FeedPackageAnnotationStrategyFacts.cs",
"diff": "@@ -85,6 +85,10 @@ public void SetsAtomEntryMetadataAnnotation()\n[InlineData(\"https://localhost/api/v2/Packages\")]\n[InlineData(\"https://localhost/api/v2/Packages()\")]\n[InlineData(\"https://localhost/api/v2/Packages(Id='SomePackageId',Version='1.0.0')\")]\n+ [InlineData(\"https://localhost/api/v2/FindPackagesById()?id='SomePackageId'\")]\n+ [InlineData(\"https://localhost/api/v2/FindPackagesById(Id='SomePackageId')\")]\n+ [InlineData(\"https://localhost/api/v2/Search()?searchTerm='SomePackageId'\")]\n+ [InlineData(\"https://localhost/api/v2/GetUpdates()?packageIds=='SomePackageId'\")]\npublic void NormalizesNavigationLinksWhenSet(string requestUri)\n{\n// Arrange\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Fix Functional Test failure for ODataFeeds.V2FeedExtendedTests.FindPackagesByIdTest #3947 (#3948)
|
455,759 |
12.05.2017 18:04:30
| -7,200 |
ac11c0090cda5c68a668d290c7ee70a075d55fc8
|
Fix load test failure due to incorrect test setup
|
[
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.LoadTests/LoadTests.cs",
"new_path": "tests/NuGetGallery.LoadTests/LoadTests.cs",
"diff": "@@ -78,7 +78,7 @@ public async Task FindPackagesByIdForPredefinedPackage()\npublic async Task FindPackagesBySpecificIdAndVersion()\n{\nstring packageId = \"Microsoft.Web.Infrastructure\";\n- string version = \"1.0.0.0\";\n+ string version = \"1.0.0\";\nstring url = UrlHelper.V2FeedRootUrl + @\"Packages(Id='\" + packageId + \"',Version='\" + version + \"')\";\nstring expectedText = @\"<id>\" + UrlHelper.V2FeedRootUrl + \"Packages(Id='\" + packageId + \"',Version='\" + version + \"')</id>\";\nvar odataHelper = new ODataHelper();\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Fix load test failure due to incorrect test setup (#3957)
|
455,759 |
16.05.2017 09:20:29
| -7,200 |
647c95975c335ce90b01cff5edf2196a332b5d63
|
Hijack IsLatest(Stable)Version OData filter when semVerLevel=2.0.0
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"ViewModels\\PackageListSearchViewModel.cs\" />\n<Compile Include=\"WebApi\\PlainTextResult.cs\" />\n<Compile Include=\"WebApi\\QueryResult.cs\" />\n+ <Compile Include=\"WebApi\\QueryResultDefaults.cs\" />\n<Compile Include=\"WebApi\\QueryResultExtensions.cs\" />\n<Content Include=\"App_Data\\Files\\Content\\ReadOnly.md\" />\n<Content Include=\"ApplicationInsights.config\">\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/OData/QueryAllowed/ODataQueryFilter.cs",
"new_path": "src/NuGetGallery/OData/QueryAllowed/ODataQueryFilter.cs",
"diff": "@@ -31,6 +31,9 @@ public enum ODataOperators\nTop = 1 << 8\n}\n+ internal const string IsLatestVersion = \"IsLatestVersion\";\n+ internal const string IsAbsoluteLatestVersion = \"IsAbsoluteLatestVersion\";\n+\nprivate static readonly string ResourcesNamespace = \"NuGetGallery.OData.QueryAllowed.Data\";\nprivate HashSet<ODataOperators> _allowedOperatorPatterns = null;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/OData/SearchService/SearchAdaptor.cs",
"new_path": "src/NuGetGallery/OData/SearchService/SearchAdaptor.cs",
"diff": "using System.Web.Routing;\nusing NuGet.Services.Search.Models;\nusing NuGetGallery.Infrastructure.Lucene;\n+using NuGetGallery.OData.QueryFilter;\nusing NuGetGallery.OData.QueryInterceptors;\nusing QueryInterceptor;\n@@ -209,7 +210,9 @@ private static bool TryReadSearchFilter(bool allVersionsInIndex, string url, boo\nstring filter;\nif (queryTerms.TryGetValue(\"$filter\", out filter))\n{\n- if (!ignoreLatestVersionFilter && !(filter.Equals(\"IsLatestVersion\", StringComparison.Ordinal) || filter.Equals(\"IsAbsoluteLatestVersion\", StringComparison.Ordinal)))\n+ if (!ignoreLatestVersionFilter\n+ && !(filter.Equals(ODataQueryFilter.IsLatestVersion, StringComparison.Ordinal)\n+ || filter.Equals(ODataQueryFilter.IsAbsoluteLatestVersion, StringComparison.Ordinal)))\n{\nsearchFilter = null;\nreturn false;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/WebApi/QueryResult.cs",
"new_path": "src/NuGetGallery/WebApi/QueryResult.cs",
"diff": "using System.Net.Http;\nusing System.Threading;\nusing System.Threading.Tasks;\n+using System.Web;\nusing System.Web.Http;\nusing System.Web.Http.OData;\nusing System.Web.Http.OData.Query;\nusing System.Web.Http.Results;\nusing Microsoft.Data.OData;\nusing Microsoft.Data.OData.Query;\n+using NuGetGallery.OData.QueryFilter;\nnamespace NuGetGallery.WebApi\n{\n- public static class QueryResultDefaults\n- {\n- [System.Diagnostics.CodeAnalysis.SuppressMessage(\"Microsoft.Usage\", \"CA2211:NonConstantFieldsShouldNotBeVisible\")]\n- public static ODataQuerySettings DefaultQuerySettings = new ODataQuerySettings()\n- {\n- HandleNullPropagation = HandleNullPropagationOption.False,\n- EnsureStableOrdering = true,\n- EnableConstantParameterization = false\n- };\n- }\npublic class QueryResult<TModel>\n: IHttpActionResult\n@@ -37,6 +29,7 @@ public class QueryResult<TModel>\nprivate readonly long? _totalResults;\nprivate readonly Func<ODataQueryOptions<TModel>, ODataQuerySettings, long?, Uri> _generateNextLink;\nprivate readonly bool _isPagedResult;\n+ private readonly int? _semVerLevelKey;\nprivate readonly ODataValidationSettings _validationSettings;\nprivate readonly ODataQuerySettings _querySettings;\n@@ -59,6 +52,9 @@ public QueryResult(ODataQueryOptions<TModel> queryOptions, IQueryable<TModel> qu\n_totalResults = totalResults;\n_generateNextLink = generateNextLink;\n+ var queryDictionary = HttpUtility.ParseQueryString(queryOptions.Request.RequestUri.Query);\n+ _semVerLevelKey = SemVerLevelKey.ForSemVerLevel(queryDictionary[\"semVerLevel\"]);\n+\nif (_totalResults.HasValue && generateNextLink != null)\n{\n_isPagedResult = true;\n@@ -120,9 +116,24 @@ public IHttpActionResult GetInnerResult()\nqueryResults = _queryable.ToList().AsQueryable();\nif (queryOptions.Filter != null)\n+ {\n+ if (_semVerLevelKey != SemVerLevelKey.Unknown\n+ && (string.Equals(queryOptions.Filter.RawValue, ODataQueryFilter.IsLatestVersion, StringComparison.OrdinalIgnoreCase)\n+ || string.Equals(queryOptions.Filter.RawValue, ODataQueryFilter.IsAbsoluteLatestVersion, StringComparison.OrdinalIgnoreCase)))\n+ {\n+ // The client uses IsLatestVersion and IsAbsoluteLatestVersion by default,\n+ // and just appends semVerLevel=2.0.0 to the query string.\n+ // When semVerLevel=2.0.0, we should not restrict the filter to only return IsLatest(Stable)=true,\n+ // but also include IsLatest(Stable)SemVer2=true. These additional properties are not exposed on the OData entities however.\n+ // As the proper filtering already should 've happened earlier in the pipeline (SQL or search service),\n+ // the OData filter is redundant, so all we need to do here is to avoid\n+ // the OData filter to be applied on an already correctly filtered result set.\n+ }\n+ else\n{\nqueryResults = queryOptions.Filter.ApplyTo(queryResults, _querySettings);\n}\n+ }\nif (queryOptions.OrderBy != null\n&& !(\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/ODataFeedControllerFactsBase.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/ODataFeedControllerFactsBase.cs",
"diff": "@@ -122,14 +122,15 @@ private static IQueryable<Package> CreatePackagesQueryable()\n{\nPackageRegistration = packageRegistration,\nVersion = \"1.0.0.0\",\n- NormalizedVersion = \"1.0.0.0\",\n+ NormalizedVersion = \"1.0.0\",\nSemVerLevelKey = SemVerLevelKey.Unknown\n},\nnew Package\n{\nPackageRegistration = packageRegistration,\nVersion = \"1.0.0.0-alpha\",\n- NormalizedVersion = \"1.0.0.0-alpha\",\n+ NormalizedVersion = \"1.0.0-alpha\",\n+ IsPrerelease = true,\nSemVerLevelKey = SemVerLevelKey.Unknown\n},\nnew Package\n@@ -137,20 +138,24 @@ private static IQueryable<Package> CreatePackagesQueryable()\nPackageRegistration = packageRegistration,\nVersion = \"2.0.0\",\nNormalizedVersion = \"2.0.0\",\n- SemVerLevelKey = SemVerLevelKey.Unknown\n+ SemVerLevelKey = SemVerLevelKey.Unknown,\n+ IsLatestStable = true\n},\nnew Package\n{\nPackageRegistration = packageRegistration,\nVersion = \"2.0.0-alpha\",\nNormalizedVersion = \"2.0.0-alpha\",\n- SemVerLevelKey = SemVerLevelKey.SemVer2\n+ IsPrerelease = true,\n+ SemVerLevelKey = SemVerLevelKey.Unknown,\n+ IsLatest = true\n},\nnew Package\n{\nPackageRegistration = packageRegistration,\nVersion = \"2.0.0-alpha.1\",\nNormalizedVersion = \"2.0.0-alpha.1\",\n+ IsPrerelease = true,\nSemVerLevelKey = SemVerLevelKey.SemVer2\n},\nnew Package\n@@ -158,7 +163,17 @@ private static IQueryable<Package> CreatePackagesQueryable()\nPackageRegistration = packageRegistration,\nVersion = \"2.0.0+metadata\",\nNormalizedVersion = \"2.0.0\",\n- SemVerLevelKey = SemVerLevelKey.SemVer2\n+ SemVerLevelKey = SemVerLevelKey.SemVer2,\n+ IsLatestStableSemVer2 = true\n+ },\n+ new Package\n+ {\n+ PackageRegistration = packageRegistration,\n+ Version = \"2.0.1-alpha.1\",\n+ NormalizedVersion = \"2.0.1-alpha.1\",\n+ IsPrerelease = true,\n+ SemVerLevelKey = SemVerLevelKey.SemVer2,\n+ IsLatestSemVer2 = true\n}\n};\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/ODataV1FeedControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/ODataV1FeedControllerFacts.cs",
"diff": "@@ -23,7 +23,7 @@ public async Task Get_FiltersSemVerV2PackageVersions()\n// Assert\nAssertSemVer2PackagesFilteredFromResult(resultSet);\n- Assert.Equal(NonSemVer2Packages.Count, resultSet.Count);\n+ Assert.Equal(NonSemVer2Packages.Where(p => !p.IsPrerelease).Count(), resultSet.Count);\n}\n[Fact]\n@@ -35,7 +35,7 @@ public async Task GetCount_FiltersSemVerV2PackageVersions()\n\"/api/v1/Packages/$count\");\n// Assert\n- Assert.Equal(NonSemVer2Packages.Count, count);\n+ Assert.Equal(NonSemVer2Packages.Where(p => !p.IsPrerelease).Count(), count);\n}\n[Fact]\n@@ -48,7 +48,7 @@ public async Task FindPackagesById_FiltersSemVerV2PackageVersions()\n// Assert\nAssertSemVer2PackagesFilteredFromResult(resultSet);\n- Assert.Equal(NonSemVer2Packages.Count, resultSet.Count);\n+ Assert.Equal(NonSemVer2Packages.Where(p => !p.IsPrerelease).Count(), resultSet.Count);\n}\n[Fact]\n@@ -61,7 +61,7 @@ public async Task Search_FiltersSemVerV2PackageVersions()\n// Assert\nAssertSemVer2PackagesFilteredFromResult(resultSet);\n- Assert.Equal(NonSemVer2Packages.Count, resultSet.Count);\n+ Assert.Equal(NonSemVer2Packages.Where(p => !p.IsPrerelease).Count(), resultSet.Count);\n}\n[Fact]\n@@ -73,7 +73,7 @@ public async Task SearchCount_FiltersSemVerV2PackageVersions()\n$\"/api/v1/Search/$count?searchTerm='{TestPackageId}'\");\n// Assert\n- Assert.Equal(NonSemVer2Packages.Count, searchCount);\n+ Assert.Equal(NonSemVer2Packages.Where(p => !p.IsPrerelease).Count(), searchCount);\n}\nprotected override ODataV1FeedController CreateController(IEntityRepository<Package> packagesRepository,\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/ODataV2CuratedFeedControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/ODataV2CuratedFeedControllerFacts.cs",
"diff": "@@ -43,7 +43,7 @@ public async Task Get_IncludesSemVerV2PackageVersionsWhenSemVerLevel2OrHigher(st\n$\"/api/v2/curated-feed/{_curatedFeedName}/Packages?semVerLevel={semVerLevel}\");\n// Assert\n- AssertSemVer2PackagesIncludedInResult(resultSet);\n+ AssertSemVer2PackagesIncludedInResult(resultSet, includePrerelease: true);\nAssert.Equal(AllPackages.Count(), resultSet.Count);\n}\n@@ -101,18 +101,35 @@ public async Task FindPackagesById_IncludesSemVerV2PackageVersionsWhenSemVerLeve\n$\"/api/v2/curated-feed/{_curatedFeedName}/FindPackagesById?id='{TestPackageId}'?semVerLevel={semVerLevel}\");\n// Assert\n- AssertSemVer2PackagesIncludedInResult(resultSet);\n+ AssertSemVer2PackagesIncludedInResult(resultSet, includePrerelease: true);\nAssert.Equal(AllPackages.Count(), resultSet.Count);\n}\n[Fact]\n- public async Task Search_FiltersSemVerV2PackageVersions()\n+ public async Task Search_FiltersSemVerV2PackageVersions_ExcludePrerelease()\n{\n// Act\nvar resultSet = await GetCollection<V2FeedPackage>(\nasync (controller, options) => await controller.Search(options, _curatedFeedName, searchTerm: TestPackageId),\n$\"/api/v2/curated-feed/{_curatedFeedName}/Search?searchTerm='{TestPackageId}'\");\n+ // Assert\n+ AssertSemVer2PackagesFilteredFromResult(resultSet);\n+ Assert.Equal(NonSemVer2Packages.Where(p => !p.IsPrerelease).Count(), resultSet.Count);\n+ }\n+\n+ [Fact]\n+ public async Task Search_FiltersSemVerV2PackageVersions_IncludePrerelease()\n+ {\n+ // Act\n+ var resultSet = await GetCollection<V2FeedPackage>(\n+ async (controller, options) => await controller.Search(\n+ options,\n+ _curatedFeedName,\n+ searchTerm: TestPackageId,\n+ includePrerelease: true),\n+ $\"/api/v2/curated-feed/{_curatedFeedName}/Search?searchTerm='{TestPackageId}'&includePrerelease=true\");\n+\n// Assert\nAssertSemVer2PackagesFilteredFromResult(resultSet);\nAssert.Equal(NonSemVer2Packages.Count, resultSet.Count);\n@@ -123,36 +140,133 @@ public async Task Search_FiltersSemVerV2PackageVersions()\n[InlineData(\"2.0.1\")]\n[InlineData(\"3.0.0-alpha\")]\n[InlineData(\"3.0.0\")]\n- public async Task Search_IncludesSemVerV2PackageVersionsWhenSemVerLevel2OrHigher(string semVerLevel)\n+ public async Task Search_IncludesSemVerV2PackageVersionsWhenSemVerLevel2OrHigher_ExcludePrerelease(string semVerLevel)\n{\n// Act\nvar resultSet = await GetCollection<V2FeedPackage>(\nasync (controller, options) => await controller.Search(options, _curatedFeedName, searchTerm: TestPackageId, semVerLevel: semVerLevel),\n- $\"/api/v2/curated-feed/{_curatedFeedName}/Search?searchTerm='{TestPackageId}'?semVerLevel={semVerLevel}\");\n+ $\"/api/v2/curated-feed/{_curatedFeedName}/Search?searchTerm='{TestPackageId}'&semVerLevel={semVerLevel}\");\n+\n+ // Assert\n+ AssertSemVer2PackagesIncludedInResult(resultSet, includePrerelease: false);\n+ Assert.Equal(AllPackages.Where(p => !p.IsPrerelease).Count(), resultSet.Count);\n+ }\n+\n+ [Theory]\n+ [InlineData(\"2.0.0\")]\n+ [InlineData(\"2.0.1\")]\n+ [InlineData(\"3.0.0-alpha\")]\n+ [InlineData(\"3.0.0\")]\n+ public async Task Search_IncludesSemVerV2PackageVersionsWhenSemVerLevel2OrHigher_IncludePrerelease(string semVerLevel)\n+ {\n+ // Act\n+ var resultSet = await GetCollection<V2FeedPackage>(\n+ async (controller, options) => await controller.Search(\n+ options,\n+ _curatedFeedName,\n+ searchTerm: TestPackageId,\n+ includePrerelease: true,\n+ semVerLevel: semVerLevel),\n+ $\"/api/v2/curated-feed/{_curatedFeedName}/Search?searchTerm='{TestPackageId}'?semVerLevel={semVerLevel}&includePrerelease=true\");\n// Assert\n- AssertSemVer2PackagesIncludedInResult(resultSet);\n+ AssertSemVer2PackagesIncludedInResult(resultSet, includePrerelease: true);\nAssert.Equal(AllPackages.Count(), resultSet.Count);\n}\n[Fact]\n- public async Task SearchCount_FiltersSemVerV2PackageVersions()\n+ public async Task SearchCount_FiltersSemVerV2PackageVersions_IncludePrerelease()\n+ {\n+ // Act\n+ var searchCount = await GetInt<V2FeedPackage>(\n+ async (controller, options) => await controller.SearchCount(\n+ options,\n+ _curatedFeedName,\n+ searchTerm: TestPackageId,\n+ includePrerelease: true),\n+ $\"/api/v2/curated-feed/{_curatedFeedName}/Search/$count?searchTerm='{TestPackageId}'&includePrerelease=true\");\n+\n+ // Assert\n+ Assert.Equal(NonSemVer2Packages.Count, searchCount);\n+ }\n+\n+ [Fact]\n+ public async Task SearchCount_FiltersSemVerV2PackageVersions_ExcludePrerelease()\n{\n// Act\nvar searchCount = await GetInt<V2FeedPackage>(\n- async (controller, options) => await controller.SearchCount(options, _curatedFeedName, searchTerm: TestPackageId),\n+ async (controller, options) => await controller.SearchCount(\n+ options,\n+ _curatedFeedName,\n+ searchTerm: TestPackageId,\n+ includePrerelease: false),\n$\"/api/v2/curated-feed/{_curatedFeedName}/Search/$count?searchTerm='{TestPackageId}'\");\n+ // Assert\n+ Assert.Equal(NonSemVer2Packages.Where(p => !p.IsPrerelease).Count(), searchCount);\n+ }\n+\n+ [Fact]\n+ public async Task SearchCount_FiltersSemVerV2PackageVersionsWhenSemVerLevelLowerThan200_IncludePrerelease()\n+ {\n+ // Act\n+ var searchCount = await GetInt<V2FeedPackage>(\n+ async (controller, options) => await controller.SearchCount(\n+ options,\n+ _curatedFeedName,\n+ searchTerm: TestPackageId,\n+ includePrerelease: true,\n+ semVerLevel: \"1.0.0\"),\n+ $\"/api/v2/curated-feed/{_curatedFeedName}/Search/$count?searchTerm='{TestPackageId}'&includePrerelease=true&semVerLevel=1.0.0\");\n+\n// Assert\nAssert.Equal(NonSemVer2Packages.Count, searchCount);\n}\n+ [Fact]\n+ public async Task SearchCount_FiltersSemVerV2PackageVersionsWhenSemVerLevelLowerThan200_ExcludePrerelease()\n+ {\n+ // Act\n+ var searchCount = await GetInt<V2FeedPackage>(\n+ async (controller, options) => await controller.SearchCount(\n+ options,\n+ _curatedFeedName,\n+ searchTerm: TestPackageId,\n+ includePrerelease: false,\n+ semVerLevel: \"1.0.0\"),\n+ $\"/api/v2/curated-feed/{_curatedFeedName}/Search/$count?searchTerm='{TestPackageId}'&semVerLevel=1.0.0\");\n+\n+ // Assert\n+ Assert.Equal(NonSemVer2Packages.Where(p => !p.IsPrerelease).Count(), searchCount);\n+ }\n+\n[Theory]\n[InlineData(\"2.0.0\")]\n[InlineData(\"2.0.1\")]\n[InlineData(\"3.0.0-alpha\")]\n[InlineData(\"3.0.0\")]\n- public async Task SearchCount_IncludesSemVerV2PackageVersionsWhenSemVerLevel2OrHigher(string semVerLevel)\n+ public async Task SearchCount_IncludesSemVerV2PackageVersionsWhenSemVerLevel2OrHigher_IncludePrerelease(string semVerLevel)\n+ {\n+ // Act\n+ var searchCount = await GetInt<V2FeedPackage>(\n+ async (controller, options) => await controller.SearchCount(\n+ options,\n+ _curatedFeedName,\n+ searchTerm: TestPackageId,\n+ includePrerelease: true,\n+ semVerLevel: semVerLevel),\n+ $\"/api/v2/curated-feed/{_curatedFeedName}/Search/$count?searchTerm='{TestPackageId}'&includePrerelease=true&semVerLevel={semVerLevel}\");\n+\n+ // Assert\n+ Assert.Equal(AllPackages.Count(), searchCount);\n+ }\n+\n+ [Theory]\n+ [InlineData(\"2.0.0\")]\n+ [InlineData(\"2.0.1\")]\n+ [InlineData(\"3.0.0-alpha\")]\n+ [InlineData(\"3.0.0\")]\n+ public async Task SearchCount_IncludesSemVerV2PackageVersionsWhenSemVerLevel2OrHigher_ExcludePrerelease(string semVerLevel)\n{\n// Act\nvar searchCount = await GetInt<V2FeedPackage>(\n@@ -160,7 +274,7 @@ public async Task SearchCount_IncludesSemVerV2PackageVersionsWhenSemVerLevel2OrH\n$\"/api/v2/curated-feed/{_curatedFeedName}/Search/$count?searchTerm='{TestPackageId}'&semVerLevel={semVerLevel}\");\n// Assert\n- Assert.Equal(AllPackages.Count(), searchCount);\n+ Assert.Equal(AllPackages.Where(p => !p.IsPrerelease).Count(), searchCount);\n}\nprotected override ODataV2CuratedFeedController CreateController(\n@@ -212,9 +326,9 @@ private void AssertSemVer2PackagesFilteredFromResult(IEnumerable<V2FeedPackage>\n}\n}\n- private void AssertSemVer2PackagesIncludedInResult(IReadOnlyCollection<V2FeedPackage> resultSet)\n+ private void AssertSemVer2PackagesIncludedInResult(IReadOnlyCollection<V2FeedPackage> resultSet, bool includePrerelease)\n{\n- foreach (var package in SemVer2Packages)\n+ foreach (var package in SemVer2Packages.Where(p => p.IsPrerelease == includePrerelease))\n{\n// Assert all of the SemVer2 packages are included in the result.\n// Whilst at it, also check the NormalizedVersion on the OData feed.\n@@ -224,7 +338,7 @@ private void AssertSemVer2PackagesIncludedInResult(IReadOnlyCollection<V2FeedPac\n&& string.Equals(feedPackage.Id, package.PackageRegistration.Id)));\n}\n- foreach (var package in NonSemVer2Packages)\n+ foreach (var package in NonSemVer2Packages.Where(p => p.IsPrerelease == includePrerelease))\n{\n// Assert all of the non-SemVer2 packages are included in the result.\n// Whilst at it, also check the NormalizedVersion on the OData feed.\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/ODataV2FeedControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/ODataV2FeedControllerFacts.cs",
"diff": "@@ -103,18 +103,117 @@ public async Task FindPackagesById_IncludesSemVerV2PackageVersionsWhenSemVerLeve\n}\n[Fact]\n- public async Task Search_FiltersSemVerV2PackageVersionsByDefault()\n+ public async Task Search_FiltersSemVerV2PackageVersionsByDefault_IncludePrerelease()\n{\n// Act\nvar resultSet = await GetCollection<V2FeedPackage>(\n- async (controller, options) => await controller.Search(options, searchTerm: TestPackageId),\n- $\"/api/v2/Search?searchTerm='{TestPackageId}'\");\n+ async (controller, options) => await controller.Search(\n+ options,\n+ searchTerm: TestPackageId,\n+ includePrerelease: true),\n+ $\"/api/v2/Search?searchTerm='{TestPackageId}'&includePrerelease=true\");\n// Assert\nAssertSemVer2PackagesFilteredFromResult(resultSet);\nAssert.Equal(NonSemVer2Packages.Count, resultSet.Count);\n}\n+ [Fact]\n+ public async Task Search_FiltersSemVerV2PackageVersionsByDefault_ExcludePrerelease()\n+ {\n+ // Act\n+ var resultSet = await GetCollection<V2FeedPackage>(\n+ async (controller, options) => await controller.Search(\n+ options,\n+ searchTerm: TestPackageId,\n+ includePrerelease: false),\n+ $\"/api/v2/Search?searchTerm='{TestPackageId}'&includePrerelease=false\");\n+\n+ // Assert\n+ AssertSemVer2PackagesFilteredFromResult(resultSet);\n+ Assert.Equal(NonSemVer2Packages.Where(p => !p.IsPrerelease).Count(), resultSet.Count);\n+ }\n+\n+ [Fact]\n+ public async Task SearchIsAbsoluteLatestVersion_ReturnsLatestSemVer2_WhenSemVerLevel200()\n+ {\n+ // Act\n+ var resultSet = await GetCollection<V2FeedPackage>(\n+ async (controller, options) => await controller.Search(\n+ options,\n+ searchTerm: TestPackageId,\n+ includePrerelease: true,\n+ semVerLevel: SemVerLevelKey.SemVerLevel2),\n+ $\"/api/v2/Search?$filter=IsAbsoluteLatestVersion&searchTerm='{TestPackageId}'&includePrerelease=true&semVerLevel=2.0.0\");\n+\n+ // Assert\n+ Assert.Equal(SemVer2Packages.Single(p => p.IsLatestSemVer2).Version, resultSet.Single().Version);\n+ }\n+\n+ [Fact]\n+ public async Task SearchIsAbsoluteLatestVersion_ReturnsLatest_WhenHigherPrereleaseAvailableAndIncludePrereleaseTrueAndSemVerLevelUndefined()\n+ {\n+ // Act\n+ var resultSet = await GetCollection<V2FeedPackage>(\n+ async (controller, options) => await controller.Search(\n+ options,\n+ searchTerm: TestPackageId,\n+ includePrerelease: true,\n+ semVerLevel: null),\n+ $\"/api/v2/Search?$filter=IsAbsoluteLatestVersion&searchTerm='{TestPackageId}'&includePrerelease=true\");\n+\n+ // Assert\n+ Assert.Equal(NonSemVer2Packages.Single(p => p.IsLatest).Version, resultSet.Single().Version);\n+ }\n+\n+ [Fact]\n+ public async Task SearchIsLatestVersion_ReturnsLatestStableSemVer2_WhenSemVerLevel200()\n+ {\n+ // Act\n+ var resultSet = await GetCollection<V2FeedPackage>(\n+ async (controller, options) => await controller.Search(\n+ options,\n+ searchTerm: TestPackageId,\n+ includePrerelease: true,\n+ semVerLevel: SemVerLevelKey.SemVerLevel2),\n+ $\"/api/v2/Search?$filter=IsLatestVersion&searchTerm='{TestPackageId}'&includePrerelease=true&semVerLevel=2.0.0\");\n+\n+ // Assert\n+ Assert.Equal(SemVer2Packages.Single(p => p.IsLatestStableSemVer2).Version, resultSet.Single().Version);\n+ }\n+\n+ [Fact]\n+ public async Task SearchIsLatestVersion_ReturnsLatestStable_WhenIncludePrereleaseFalseAndSemVerLevelUndefined()\n+ {\n+ // Act\n+ var resultSet = await GetCollection<V2FeedPackage>(\n+ async (controller, options) => await controller.Search(\n+ options,\n+ searchTerm: TestPackageId,\n+ includePrerelease: false,\n+ semVerLevel: null),\n+ $\"/api/v2/Search?$filter=IsLatestVersion&searchTerm='{TestPackageId}'\");\n+\n+ // Assert\n+ Assert.Equal(NonSemVer2Packages.Single(p => p.IsLatestStable).Version, resultSet.Single().Version);\n+ }\n+\n+ [Fact]\n+ public async Task SearchIsLatestVersion_ReturnsLatestStable_WhenIncludePrereleaseFalseAndSemVerLevel100()\n+ {\n+ // Act\n+ var resultSet = await GetCollection<V2FeedPackage>(\n+ async (controller, options) => await controller.Search(\n+ options,\n+ searchTerm: TestPackageId,\n+ includePrerelease: false,\n+ semVerLevel: \"1.0.0\"),\n+ $\"/api/v2/Search?$filter=IsLatestVersion&searchTerm='{TestPackageId}'&semVerLevel=1.0.0\");\n+\n+ // Assert\n+ Assert.Equal(NonSemVer2Packages.Single(p => p.IsLatestStable).Version, resultSet.Single().Version);\n+ }\n+\n[Theory]\n[InlineData(\"2.0.0\")]\n[InlineData(\"2.0.1\")]\n@@ -124,8 +223,12 @@ public async Task Search_IncludesSemVerV2PackageVersionsWhenSemVerLevel2OrHigher\n{\n// Act\nvar resultSet = await GetCollection<V2FeedPackage>(\n- (controller, options) => controller.Search(options, searchTerm: TestPackageId, semVerLevel: semVerLevel),\n- $\"/api/v2/Search?searchTerm='{TestPackageId}'?semVerLevel={semVerLevel}\");\n+ (controller, options) => controller.Search(\n+ options,\n+ searchTerm: TestPackageId,\n+ includePrerelease: true,\n+ semVerLevel: semVerLevel),\n+ $\"/api/v2/Search?searchTerm='{TestPackageId}'?includePrerelease=true&semVerLevel={semVerLevel}\");\n// Assert\nAssertSemVer2PackagesIncludedInResult(resultSet);\n@@ -137,8 +240,11 @@ public async Task SearchCount_FiltersSemVerV2PackageVersionsByDefault()\n{\n// Act\nvar searchCount = await GetInt<V2FeedPackage>(\n- async (controller, options) => await controller.SearchCount(options, searchTerm: TestPackageId),\n- $\"/api/v2/Search/$count?searchTerm='{TestPackageId}'\");\n+ async (controller, options) => await controller.SearchCount(\n+ options,\n+ searchTerm: TestPackageId,\n+ includePrerelease: true),\n+ $\"/api/v2/Search/$count?searchTerm='{TestPackageId}'&includePrerelease=true\");\n// Assert\nAssert.Equal(NonSemVer2Packages.Count, searchCount);\n@@ -153,8 +259,12 @@ public async Task SearchCount_IncludesSemVerV2PackageVersionsWhenSemVerLevel2OrH\n{\n// Act\nvar searchCount = await GetInt<V2FeedPackage>(\n- async (controller, options) => await controller.SearchCount(options, searchTerm: TestPackageId, semVerLevel: semVerLevel),\n- $\"/api/v2/Search/$count?searchTerm='{TestPackageId}'&semVerLevel={semVerLevel}\");\n+ async (controller, options) => await controller.SearchCount(\n+ options,\n+ searchTerm: TestPackageId,\n+ includePrerelease: true,\n+ semVerLevel: semVerLevel),\n+ $\"/api/v2/Search/$count?searchTerm='{TestPackageId}'&includePrerelease=true&semVerLevel={semVerLevel}\");\n// Assert\nAssert.Equal(AllPackages.Count(), searchCount);\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Hijack IsLatest(Stable)Version OData filter when semVerLevel=2.0.0 (#3966)
|
455,759 |
16.05.2017 19:10:31
| -7,200 |
40bd08cdb5f53f6bf50fbb901e5a7bfa73c34453
|
Detect if package only differ by metadata and show optimal user-facing error message
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -282,13 +282,35 @@ public virtual async Task<ActionResult> UploadPackage(HttpPostedFileBase uploadF\nreturn View();\n}\n- var package = _packageService.FindPackageByIdAndVersionStrict(nuspec.GetId(), nuspec.GetVersion().ToStringSafe());\n- if (package != null)\n+ var nuspecVersion = nuspec.GetVersion();\n+ var existingPackage = _packageService.FindPackageByIdAndVersionStrict(nuspec.GetId(), nuspecVersion.ToStringSafe());\n+ if (existingPackage != null)\n+ {\n+ // Determine if the package versions only differ by metadata,\n+ // and provide the most optimal the user-facing error message.\n+ var existingPackageVersion = new NuGetVersion(existingPackage.Version);\n+ if ((existingPackageVersion.HasMetadata || nuspecVersion.HasMetadata)\n+ && !string.Equals(existingPackageVersion.Metadata, nuspecVersion.Metadata))\n{\nModelState.AddModelError(\nstring.Empty,\nstring.Format(\n- CultureInfo.CurrentCulture, Strings.PackageExistsAndCannotBeModified, package.PackageRegistration.Id, package.Version));\n+ CultureInfo.CurrentCulture,\n+ Strings.PackageVersionDiffersOnlyByMetadataAndCannotBeModified,\n+ existingPackage.PackageRegistration.Id,\n+ existingPackage.Version));\n+ }\n+ else\n+ {\n+ ModelState.AddModelError(\n+ string.Empty,\n+ string.Format(\n+ CultureInfo.CurrentCulture,\n+ Strings.PackageExistsAndCannotBeModified,\n+ existingPackage.PackageRegistration.Id,\n+ existingPackage.Version));\n+ }\n+\nreturn View();\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.Designer.cs",
"new_path": "src/NuGetGallery/Strings.Designer.cs",
"diff": "@@ -19,7 +19,7 @@ namespace NuGetGallery {\n// class via a tool like ResGen or Visual Studio.\n// To add or remove a member, edit your .ResX file then rerun ResGen\n// with the /str option, or rebuild your VS project.\n- [global::System.CodeDom.Compiler.GeneratedCodeAttribute(\"System.Resources.Tools.StronglyTypedResourceBuilder\", \"4.0.0.0\")]\n+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute(\"System.Resources.Tools.StronglyTypedResourceBuilder\", \"15.0.0.0\")]\n[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\n[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]\npublic class Strings {\n@@ -653,6 +653,15 @@ public class Strings {\n}\n}\n+ /// <summary>\n+ /// Looks up a localized string similar to Package versions that differ only by metadata cannot be uploaded. A package with ID '{0}' and version '{1}' already exists and cannot be modified..\n+ /// </summary>\n+ public static string PackageVersionDiffersOnlyByMetadataAndCannotBeModified {\n+ get {\n+ return ResourceManager.GetString(\"PackageVersionDiffersOnlyByMetadataAndCannotBeModified\", resourceCulture);\n+ }\n+ }\n+\n/// <summary>\n/// Looks up a localized string similar to A package with ID '{0}' and version '{1}' does not exist..\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.resx",
"new_path": "src/NuGetGallery/Strings.resx",
"diff": "@@ -443,4 +443,7 @@ The {1} Team</value>\n<data name=\"SecurityPolicy_RequireMinClientVersionForPush\" xml:space=\"preserve\">\n<value>Your account requires client version '{0}' or higher to be able to push packages. Please contact support@nuget.org to get more details.</value>\n</data>\n+ <data name=\"PackageVersionDiffersOnlyByMetadataAndCannotBeModified\" xml:space=\"preserve\">\n+ <value>Package versions that differ only by metadata cannot be uploaded. A package with ID '{0}' and version '{1}' already exists and cannot be modified.</value>\n+ </data>\n</root>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"diff": "@@ -1094,7 +1094,7 @@ public async Task WillShowTheViewWithErrorsWhenThePackageAlreadyExists()\nfakeUploadedFile.Setup(x => x.InputStream).Returns(fakeFileStream);\nvar fakePackageService = new Mock<IPackageService>();\nfakePackageService.Setup(x => x.FindPackageByIdAndVersionStrict(It.IsAny<string>(), It.IsAny<string>())).Returns(\n- new Package { PackageRegistration = new PackageRegistration { Id = \"theId\" }, Version = \"theVersion\" });\n+ new Package { PackageRegistration = new PackageRegistration { Id = \"theId\" }, Version = \"1.0.0\" });\nvar controller = CreateController(\npackageService: fakePackageService);\ncontroller.SetCurrentUser(TestUtility.FakeUser);\n@@ -1104,7 +1104,30 @@ public async Task WillShowTheViewWithErrorsWhenThePackageAlreadyExists()\nAssert.NotNull(result);\nAssert.False(controller.ModelState.IsValid);\nAssert.Equal(\n- String.Format(Strings.PackageExistsAndCannotBeModified, \"theId\", \"theVersion\"),\n+ String.Format(Strings.PackageExistsAndCannotBeModified, \"theId\", \"1.0.0\"),\n+ controller.ModelState[String.Empty].Errors[0].ErrorMessage);\n+ }\n+\n+ [Fact]\n+ public async Task WillShowTheViewWithErrorsWhenThePackageAlreadyExistsAndOnlyDiffersByMetadata()\n+ {\n+ var fakeUploadedFile = new Mock<HttpPostedFileBase>();\n+ fakeUploadedFile.Setup(x => x.FileName).Returns(\"theFile.nupkg\");\n+ var fakeFileStream = TestPackage.CreateTestPackageStream(\"theId\", \"1.0.0+metadata2\");\n+ fakeUploadedFile.Setup(x => x.InputStream).Returns(fakeFileStream);\n+ var fakePackageService = new Mock<IPackageService>();\n+ fakePackageService.Setup(x => x.FindPackageByIdAndVersionStrict(It.IsAny<string>(), It.IsAny<string>())).Returns(\n+ new Package { PackageRegistration = new PackageRegistration { Id = \"theId\" }, Version = \"1.0.0+metadata\" });\n+ var controller = CreateController(\n+ packageService: fakePackageService);\n+ controller.SetCurrentUser(TestUtility.FakeUser);\n+\n+ var result = await controller.UploadPackage(fakeUploadedFile.Object) as ViewResult;\n+\n+ Assert.NotNull(result);\n+ Assert.False(controller.ModelState.IsValid);\n+ Assert.Equal(\n+ String.Format(Strings.PackageVersionDiffersOnlyByMetadataAndCannotBeModified, \"theId\", \"1.0.0+metadata\"),\ncontroller.ModelState[String.Empty].Errors[0].ErrorMessage);\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Detect if package only differ by metadata and show optimal user-facing error message (#3970)
|
455,759 |
18.05.2017 09:28:35
| -7,200 |
73278d0f73de12970c2fad76425e2cd18f7cbfe0
|
Update Semver2 package details message with final nuget client version
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"diff": "@if (Model.IsSemVer2)\n{\n<p class=\"message warning\">\n- This package is only available for download with NuGet client version 4.3.0-preview1 and above.\n+ This package is only available for download with Visual Studio 2017 (version 15.3) and above or with NuGet client 4.3.0 and above.\nReach out to support if you have more questions.\n</p>\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Update Semver2 package details message with final nuget client version #3897 (#3988)
|
455,759 |
01.06.2017 09:10:50
| -7,200 |
b0edded209d7c30234d7d2532d4f4164bc0daf5d
|
On package validation failure an actionable error message should be displayed.
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/PackageService.cs",
"new_path": "src/NuGetGallery/Services/PackageService.cs",
"diff": "@@ -760,7 +760,7 @@ private static void ValidateNuGetPackageMetadata(PackageMetadata packageMetadata\nthrow new EntityException(Strings.NuGetPackagePropertyTooLong, \"Title\", \"256\");\n}\n- if (packageMetadata.Version != null && packageMetadata.Version.ToString().Length > 64)\n+ if (packageMetadata.Version != null && packageMetadata.Version.ToFullString().Length > 64)\n{\nthrow new EntityException(Strings.NuGetPackagePropertyTooLong, \"Version\", \"64\");\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
On package validation failure an actionable error message should be displayed. #3916 (#4031)
|
455,743 |
02.06.2017 15:21:22
| 25,200 |
e671c33e3117da67df3de68338e7bb105a401534
|
Redesign Forgot Password Page
Redesigned the Forgot Password and Password Sent Confirmation Pages
|
[
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -197,6 +197,9 @@ body {\n.page-package-details .install-tabs .tab-pane .copy-button {\ndisplay: table-cell;\n}\n+.page-forgot-password .forgot-form {\n+ margin-top: 80px;\n+}\n.page-sign-in .provider-button {\nmargin-top: 70px;\nline-height: 2em;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css.map",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css.map",
"diff": "Binary files a/src/Bootstrap/dist/css/bootstrap-theme.css.map and b/src/Bootstrap/dist/css/bootstrap-theme.css.map differ\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.min.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.min.css",
"diff": "-html{position:relative;min-height:100%}.row-gap{margin-top:50px}.search-container{padding-top:16px;padding-bottom:16px}.main-container{padding-bottom:75px}.navbar-logo{margin:8px 20px 0 0}.footer{position:absolute;bottom:0;width:100%;padding-top:60px;font-size:.7em;color:#e3ebf1;background-color:#002440}.footer a{color:#e3ebf1}body{margin-bottom:520px}@media (min-width:992px){body{margin-bottom:330px}}.footer{height:520px}@media (min-width:992px){.footer{height:330px}}.borderless>tbody>tr>td{border:none}.no-clickonce{display:none}.tag{padding:2px 10px;margin:0 2px;line-height:2em;background-color:#eff9ff}.banner{padding:10px}.banner.banner-bright{font-size:1.25em;background:#ff0}.banner.banner-info{background:#f4f4f4}.ms-Icon-ul{margin-left:24px}.ms-Icon-ul li{position:relative}.ms-Icon-ul li i.ms-Icon{position:absolute;left:-24px}.page-home .jumbotron h1{margin:32px}.page-home .what-is-nuget{padding-bottom:75px;font-size:1.15em}.page-home .triangle:after{position:absolute;bottom:-7px;display:block;width:0;content:\"\";border-color:#fff transparent;border-style:solid;border-width:7px 7px 0}.page-home .triangle-left:after{left:15px}.page-home .triangle-right:after{right:15px}.page-home .circuit-board{position:relative;width:804px;height:471px;margin:0 auto;margin-top:50px;background-image:url(../img/circuit-board.png);background-repeat:no-repeat;background-position:center bottom}.page-home .circuit-board .circuit-board-label{position:absolute;height:75px;color:#000;background-color:#fff;-webkit-box-shadow:0 0 3px #000;box-shadow:0 0 3px #000}.page-home .circuit-board .circuit-board-label h3,.page-home .circuit-board .circuit-board-label h5{margin:9px 0 0 0}.page-home .circuit-board .circuit-board-pd{top:0;left:167px;float:left;width:200px}.page-home .circuit-board .circuit-board-pv{top:173px;left:3px;float:left;width:144px}.page-home .circuit-board .circuit-board-up{top:159px;right:3px;float:right;width:144px}.page-package-details h4>span{margin-bottom:3px;border-bottom:1px solid #d8d8d8}.page-package-details .dependency-group li span{color:#666}.page-package-details .no-border{border:0}.page-package-details #show-hidden-versions:focus,.page-package-details #show-hidden-versions:hover{text-decoration:none}.page-package-details .package-details-info .ms-Icon-ul li{margin-bottom:15px}.page-package-details .owner-list li{margin-bottom:5px}.page-package-details .install-tabs{font-size:.8em}.page-package-details .install-tabs ul{margin-left:0}.page-package-details .install-tabs .nav-tabs>li{padding:0;margin-left:5px}.page-package-details .install-tabs .nav-tabs>li>a{padding:5px 10px;margin:0;color:#000;background-color:#eaeaea;border:0}.page-package-details .install-tabs .nav-tabs>li.active>a{color:#fff;background-color:#002440;border:0}.page-package-details .install-tabs .tab-pane{display:table}.page-package-details .install-tabs .tab-pane .install-script{display:table-cell;width:100%;padding:8px 10px;font-family:Consolas,Menlo,Monaco,\"Courier New\",monospace;color:#fff;background-color:#002440}.page-package-details .install-tabs .tab-pane .install-script span::before{content:\"PM> \"}.page-package-details .install-tabs .tab-pane .copy-button{display:table-cell}.page-sign-in .provider-button{margin-top:70px;line-height:2em}.page-sign-in .provider-button img{margin-bottom:1px}.page-sign-in .or-row{margin:30px}.page-pages .pages-container{margin-bottom:70px}.page-pages h1{margin-bottom:40px}.page-pages h2{margin-top:40px;margin-bottom:20px}.page-pages h3{margin-top:40px;margin-bottom:10px}.page-pages p{margin-bottom:24px}\n+html{position:relative;min-height:100%}.row-gap{margin-top:50px}.search-container{padding-top:16px;padding-bottom:16px}.main-container{padding-bottom:75px}.navbar-logo{margin:8px 20px 0 0}.footer{position:absolute;bottom:0;width:100%;padding-top:60px;font-size:.7em;color:#e3ebf1;background-color:#002440}.footer a{color:#e3ebf1}body{margin-bottom:520px}@media (min-width:992px){body{margin-bottom:330px}}.footer{height:520px}@media (min-width:992px){.footer{height:330px}}.borderless>tbody>tr>td{border:none}.no-clickonce{display:none}.tag{padding:2px 10px;margin:0 2px;line-height:2em;background-color:#eff9ff}.banner{padding:10px}.banner.banner-bright{font-size:1.25em;background:#ff0}.banner.banner-info{background:#f4f4f4}.ms-Icon-ul{margin-left:24px}.ms-Icon-ul li{position:relative}.ms-Icon-ul li i.ms-Icon{position:absolute;left:-24px}.page-home .jumbotron h1{margin:32px}.page-home .what-is-nuget{padding-bottom:75px;font-size:1.15em}.page-home .triangle:after{position:absolute;bottom:-7px;display:block;width:0;content:\"\";border-color:#fff transparent;border-style:solid;border-width:7px 7px 0}.page-home .triangle-left:after{left:15px}.page-home .triangle-right:after{right:15px}.page-home .circuit-board{position:relative;width:804px;height:471px;margin:0 auto;margin-top:50px;background-image:url(../img/circuit-board.png);background-repeat:no-repeat;background-position:center bottom}.page-home .circuit-board .circuit-board-label{position:absolute;height:75px;color:#000;background-color:#fff;-webkit-box-shadow:0 0 3px #000;box-shadow:0 0 3px #000}.page-home .circuit-board .circuit-board-label h3,.page-home .circuit-board .circuit-board-label h5{margin:9px 0 0 0}.page-home .circuit-board .circuit-board-pd{top:0;left:167px;float:left;width:200px}.page-home .circuit-board .circuit-board-pv{top:173px;left:3px;float:left;width:144px}.page-home .circuit-board .circuit-board-up{top:159px;right:3px;float:right;width:144px}.page-package-details h4>span{margin-bottom:3px;border-bottom:1px solid #d8d8d8}.page-package-details .dependency-group li span{color:#666}.page-package-details .no-border{border:0}.page-package-details #show-hidden-versions:focus,.page-package-details #show-hidden-versions:hover{text-decoration:none}.page-package-details .package-details-info .ms-Icon-ul li{margin-bottom:15px}.page-package-details .owner-list li{margin-bottom:5px}.page-package-details .install-tabs{font-size:.8em}.page-package-details .install-tabs ul{margin-left:0}.page-package-details .install-tabs .nav-tabs>li{padding:0;margin-left:5px}.page-package-details .install-tabs .nav-tabs>li>a{padding:5px 10px;margin:0;color:#000;background-color:#eaeaea;border:0}.page-package-details .install-tabs .nav-tabs>li.active>a{color:#fff;background-color:#002440;border:0}.page-package-details .install-tabs .tab-pane{display:table}.page-package-details .install-tabs .tab-pane .install-script{display:table-cell;width:100%;padding:8px 10px;font-family:Consolas,Menlo,Monaco,\"Courier New\",monospace;color:#fff;background-color:#002440}.page-package-details .install-tabs .tab-pane .install-script span::before{content:\"PM> \"}.page-package-details .install-tabs .tab-pane .copy-button{display:table-cell}.page-forgot-password .forgot-form{margin-top:80px}.page-sign-in .provider-button{margin-top:70px;line-height:2em}.page-sign-in .provider-button img{margin-bottom:1px}.page-sign-in .or-row{margin:30px}.page-pages .pages-container{margin-bottom:70px}.page-pages h1{margin-bottom:40px}.page-pages h2{margin-top:40px;margin-bottom:20px}.page-pages h3{margin-top:40px;margin-bottom:10px}.page-pages p{margin-bottom:24px}\n/*# sourceMappingURL=bootstrap-theme.min.css.map */\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.min.css.map",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.min.css.map",
"diff": "Binary files a/src/Bootstrap/dist/css/bootstrap-theme.min.css.map and b/src/Bootstrap/dist/css/bootstrap-theme.min.css.map differ\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/Bootstrap/less/theme/page-forgot-password.less",
"diff": "+.page-forgot-password {\n+ .forgot-form {\n+ margin-top: 80px;\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Content/gallery/css/bootstrap-theme.css",
"new_path": "src/NuGetGallery/Content/gallery/css/bootstrap-theme.css",
"diff": "@@ -197,6 +197,9 @@ body {\n.page-package-details .install-tabs .tab-pane .copy-button {\ndisplay: table-cell;\n}\n+.page-forgot-password .forgot-form {\n+ margin-top: 80px;\n+}\n.page-sign-in .provider-button {\nmargin-top: 70px;\nline-height: 2em;\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Redesign Forgot Password Page (#4036)
Redesigned the Forgot Password and Password Sent Confirmation Pages
|
455,747 |
05.06.2017 14:41:35
| 25,200 |
95f00cd9bb97b158234eddef3c1925d4ff75ccba
|
Fix the date format on stats page
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Statistics/_PivotTable.cshtml",
"new_path": "src/NuGetGallery/Views/Statistics/_PivotTable.cshtml",
"diff": "</h1>\n<div data-bind=\"if: $data && LastUpdatedUtc\" class=\"last-updated\">\n- <span data-bind=\"text: 'Statistics last updated at ' + moment(LastUpdatedUtc).format('YYYY-MM-dd HH:mm:ss') + ' UTC.'\"></span>\n+ <span data-bind=\"text: 'Statistics last updated at ' + moment(LastUpdatedUtc).format('YYYY-MM-DD HH:mm:ss') + ' UTC.'\"></span>\n</div>\n<div data-bind=\"if: $data\">\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Fix the date format on stats page (#4057)
|
455,731 |
06.06.2017 10:17:12
| 25,200 |
0aea0dd3be549a7d2ccb54f6f0e16edc05526c02
|
Update telemetry processors
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Start/OwinStartup.cs",
"new_path": "src/NuGetGallery/App_Start/OwinStartup.cs",
"diff": "@@ -68,7 +68,7 @@ public static void Configuration(IAppBuilder app)\n// Add processors\ntelemetryProcessorChainBuilder.Use(next =>\n{\n- var processor = new TelemetryResponseCodeProcessor(next);\n+ var processor = new RequestTelemetryProcessor(next);\nprocessor.SuccessfulResponseCodes.Add(400);\nprocessor.SuccessfulResponseCodes.Add(404);\n@@ -76,6 +76,9 @@ public static void Configuration(IAppBuilder app)\nreturn processor;\n});\n+ telemetryProcessorChainBuilder.Use(\n+ next => new ExceptionTelemetryProcessor(next, Telemetry.TelemetryClient));\n+\n// Note: sampling rate must be a factor 100/N where N is a whole number\n// e.g.: 50 (= 100/2), 33.33 (= 100/3), 25 (= 100/4), ...\n// https://azure.microsoft.com/en-us/documentation/articles/app-insights-sampling/\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<HintPath>..\\..\\packages\\NuGet.Services.KeyVault.1.0.0.0\\lib\\net45\\NuGet.Services.KeyVault.dll</HintPath>\n<Private>True</Private>\n</Reference>\n- <Reference Include=\"NuGet.Services.Logging, Version=2.2.1.0, Culture=neutral, processorArchitecture=MSIL\">\n- <HintPath>..\\..\\packages\\NuGet.Services.Logging.2.2.1\\lib\\net452\\NuGet.Services.Logging.dll</HintPath>\n+ <Reference Include=\"NuGet.Services.Logging, Version=2.2.3.0, Culture=neutral, processorArchitecture=MSIL\">\n+ <HintPath>..\\..\\packages\\NuGet.Services.Logging.2.2.3\\lib\\net452\\NuGet.Services.Logging.dll</HintPath>\n<Private>True</Private>\n</Reference>\n<Reference Include=\"NuGet.Services.Platform.Client, Version=3.0.29.0, Culture=neutral, processorArchitecture=MSIL\">\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Telemetry/Telemetry.cs",
"new_path": "src/NuGetGallery/Telemetry/Telemetry.cs",
"diff": "@@ -9,13 +9,18 @@ namespace NuGetGallery\n{\ninternal static class Telemetry\n{\n- private static readonly TelemetryClient _telemetryClient = new TelemetryClient();\n+ static Telemetry()\n+ {\n+ TelemetryClient = new TelemetryClient();\n+ }\n+\n+ internal static TelemetryClient TelemetryClient { get; }\npublic static void TrackEvent(string eventName, IDictionary<string, string> properties = null, IDictionary<string, double> metrics = null)\n{\ntry\n{\n- _telemetryClient.TrackEvent(eventName, properties, metrics);\n+ TelemetryClient.TrackEvent(eventName, properties, metrics);\n}\ncatch\n{\n@@ -27,7 +32,7 @@ public static void TrackException(Exception exception, IDictionary<string, strin\n{\ntry\n{\n- _telemetryClient.TrackException(exception, properties, metrics);\n+ TelemetryClient.TrackException(exception, properties, metrics);\n}\ncatch\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/packages.config",
"new_path": "src/NuGetGallery/packages.config",
"diff": "<package id=\"NuGet.Packaging.Core\" version=\"4.3.0-preview1-2524\" targetFramework=\"net46\" />\n<package id=\"NuGet.Protocol\" version=\"4.3.0-preview1-2524\" targetFramework=\"net46\" />\n<package id=\"NuGet.Services.KeyVault\" version=\"1.0.0.0\" targetFramework=\"net46\" />\n- <package id=\"NuGet.Services.Logging\" version=\"2.2.1.0\" targetFramework=\"net46\" />\n+ <package id=\"NuGet.Services.Logging\" version=\"2.2.3.0\" targetFramework=\"net46\" />\n<package id=\"NuGet.Services.Platform.Client\" version=\"3.0.29-r-master\" targetFramework=\"net46\" />\n<package id=\"NuGet.Versioning\" version=\"4.3.0-preview1-2524\" targetFramework=\"net46\" />\n<package id=\"ODataNullPropagationVisitor\" version=\"0.5.4237.2641\" targetFramework=\"net46\" />\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Update telemetry processors (#4059)
|
455,794 |
06.06.2017 12:46:52
| 25,200 |
60726005d768027035398480fdbf576d89f78d88
|
Reorder SemVer2Latest migration to match deployment history
|
[
{
"change_type": "RENAME",
"old_path": "src/NuGetGallery/Migrations/201704242001472_AddSemVer2LatestVersionColumns.Designer.cs",
"new_path": "src/NuGetGallery/Migrations/201706061829243_AddSemVer2LatestVersionColumns.Designer.cs",
"diff": "@@ -13,7 +13,7 @@ public sealed partial class AddSemVer2LatestVersionColumns : IMigrationMetadata\nstring IMigrationMetadata.Id\n{\n- get { return \"201704242001472_AddSemVer2LatestVersionColumns\"; }\n+ get { return \"201706061829243_AddSemVer2LatestVersionColumns\"; }\n}\nstring IMigrationMetadata.Source\n"
},
{
"change_type": "RENAME",
"old_path": "src/NuGetGallery/Migrations/201704242001472_AddSemVer2LatestVersionColumns.cs",
"new_path": "src/NuGetGallery/Migrations/201706061829243_AddSemVer2LatestVersionColumns.cs",
"diff": ""
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"Migrations\\201705041614287_UserSecurityPolicies_SubscriptionColumn.Designer.cs\">\n<DependentUpon>201705041614287_UserSecurityPolicies_SubscriptionColumn.cs</DependentUpon>\n</Compile>\n+ <Compile Include=\"Migrations\\201706061829243_AddSemVer2LatestVersionColumns.cs\" />\n+ <Compile Include=\"Migrations\\201706061829243_AddSemVer2LatestVersionColumns.Designer.cs\">\n+ <DependentUpon>201706061829243_AddSemVer2LatestVersionColumns.cs</DependentUpon>\n+ </Compile>\n<Compile Include=\"Security\\SecurePushSubscription.cs\" />\n<Compile Include=\"Security\\IUserSecurityPolicySubscription.cs\" />\n<Compile Include=\"OData\\Serializers\\FeedPackageAnnotationStrategy.cs\" />\n<Compile Include=\"Security\\UserSecurityPolicyEvaluationContext.cs\" />\n<Compile Include=\"Security\\SecurityPolicyResult.cs\" />\n<Compile Include=\"Security\\UserSecurityPolicySubscriptionContext.cs\" />\n- <Compile Include=\"Migrations\\201704242001472_AddSemVer2LatestVersionColumns.cs\" />\n- <Compile Include=\"Migrations\\201704242001472_AddSemVer2LatestVersionColumns.Designer.cs\">\n- <DependentUpon>201704242001472_AddSemVer2LatestVersionColumns.cs</DependentUpon>\n- </Compile>\n<Compile Include=\"Telemetry\\ClientInformationTelemetryEnricher.cs\" />\n<Compile Include=\"Telemetry\\QuietExceptionLogger.cs\" />\n<Compile Include=\"Infrastructure\\Authentication\\CredentialBuilder.cs\" />\n<EmbeddedResource Include=\"Migrations\\201705041614287_UserSecurityPolicies_SubscriptionColumn.resx\">\n<DependentUpon>201705041614287_UserSecurityPolicies_SubscriptionColumn.cs</DependentUpon>\n</EmbeddedResource>\n- <EmbeddedResource Include=\"Migrations\\201704242001472_AddSemVer2LatestVersionColumns.resx\">\n- <DependentUpon>201704242001472_AddSemVer2LatestVersionColumns.cs</DependentUpon>\n+ <EmbeddedResource Include=\"Migrations\\201706061829243_AddSemVer2LatestVersionColumns.resx\">\n+ <DependentUpon>201706061829243_AddSemVer2LatestVersionColumns.cs</DependentUpon>\n</EmbeddedResource>\n<EmbeddedResource Include=\"OData\\QueryAllowed\\Data\\apiv1packages.json\" />\n<EmbeddedResource Include=\"OData\\QueryAllowed\\Data\\apiv1search.json\" />\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Reorder SemVer2Latest migration to match deployment history (#4062)
|
455,776 |
07.06.2017 16:31:23
| 25,200 |
23a4a1542ca26d4d5526511bb45543dd97733de1
|
[Redesign] Statistics Most Downloaded Packages/Version
|
[
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -227,4 +227,50 @@ body {\n.page-pages p {\nmargin-bottom: 24px;\n}\n+.page-statistics-most-downloaded h2 {\n+ margin-top: 4px;\n+ margin-bottom: 40px;\n+ font-size: 1.5em;\n+ color: gray;\n+}\n+.page-statistics-most-downloaded .table {\n+ table-layout: fixed;\n+}\n+.page-statistics-most-downloaded .table thead {\n+ padding-bottom: 4px;\n+ margin-bottom: 10px;\n+}\n+.page-statistics-most-downloaded .table thead th {\n+ font-size: 1.5em;\n+ font-weight: normal;\n+}\n+.page-statistics-most-downloaded .table thead .packages th:nth-child(1) {\n+ width: 10%;\n+}\n+.page-statistics-most-downloaded .table thead .packages th:nth-child(2) {\n+ width: 70%;\n+}\n+.page-statistics-most-downloaded .table thead .packages th:nth-child(3) {\n+ width: 20%;\n+}\n+.page-statistics-most-downloaded .table thead .package-versions th:nth-child(1) {\n+ width: 10%;\n+}\n+.page-statistics-most-downloaded .table thead .package-versions th:nth-child(2) {\n+ width: 50%;\n+}\n+.page-statistics-most-downloaded .table thead .package-versions th:nth-child(3) {\n+ width: 20%;\n+}\n+.page-statistics-most-downloaded .table thead .package-versions th:nth-child(4) {\n+ width: 20%;\n+}\n+.page-statistics-most-downloaded .table tbody {\n+ margin-bottom: 20px;\n+ font-size: 1.25em;\n+}\n+.page-statistics-most-downloaded .table tbody td {\n+ overflow: hidden;\n+ text-overflow: ellipsis;\n+}\n/*# sourceMappingURL=bootstrap-theme.css.map */\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css.map",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css.map",
"diff": "Binary files a/src/Bootstrap/dist/css/bootstrap-theme.css.map and b/src/Bootstrap/dist/css/bootstrap-theme.css.map differ\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.min.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.min.css",
"diff": "-html{position:relative;min-height:100%}.row-gap{margin-top:50px}.search-container{padding-top:16px;padding-bottom:16px}.main-container{padding-bottom:75px}.navbar-logo{margin:8px 20px 0 0}.footer{position:absolute;bottom:0;width:100%;padding-top:60px;font-size:.7em;color:#e3ebf1;background-color:#002440}.footer a{color:#e3ebf1}body{margin-bottom:520px}@media (min-width:992px){body{margin-bottom:330px}}.footer{height:520px}@media (min-width:992px){.footer{height:330px}}.borderless>tbody>tr>td{border:none}.no-clickonce{display:none}.tag{padding:2px 10px;margin:0 2px;line-height:2em;background-color:#eff9ff}.banner{padding:10px}.banner.banner-bright{font-size:1.25em;background:#ff0}.banner.banner-info{background:#f4f4f4}.ms-Icon-ul{margin-left:24px}.ms-Icon-ul li{position:relative}.ms-Icon-ul li i.ms-Icon{position:absolute;left:-24px}.page-home .jumbotron h1{margin:32px}.page-home .what-is-nuget{padding-bottom:75px;font-size:1.15em}.page-home .triangle:after{position:absolute;bottom:-7px;display:block;width:0;content:\"\";border-color:#fff transparent;border-style:solid;border-width:7px 7px 0}.page-home .triangle-left:after{left:15px}.page-home .triangle-right:after{right:15px}.page-home .circuit-board{position:relative;width:804px;height:471px;margin:0 auto;margin-top:50px;background-image:url(../img/circuit-board.png);background-repeat:no-repeat;background-position:center bottom}.page-home .circuit-board .circuit-board-label{position:absolute;height:75px;color:#000;background-color:#fff;-webkit-box-shadow:0 0 3px #000;box-shadow:0 0 3px #000}.page-home .circuit-board .circuit-board-label h3,.page-home .circuit-board .circuit-board-label h5{margin:9px 0 0 0}.page-home .circuit-board .circuit-board-pd{top:0;left:167px;float:left;width:200px}.page-home .circuit-board .circuit-board-pv{top:173px;left:3px;float:left;width:144px}.page-home .circuit-board .circuit-board-up{top:159px;right:3px;float:right;width:144px}.page-package-details h4>span{margin-bottom:3px;border-bottom:1px solid #d8d8d8}.page-package-details .dependency-group li span{color:#666}.page-package-details .no-border{border:0}.page-package-details #show-hidden-versions:focus,.page-package-details #show-hidden-versions:hover{text-decoration:none}.page-package-details .package-details-info .ms-Icon-ul li{margin-bottom:15px}.page-package-details .owner-list li{margin-bottom:5px}.page-package-details .install-tabs{font-size:.8em}.page-package-details .install-tabs ul{margin-left:0}.page-package-details .install-tabs .nav-tabs>li{padding:0;margin-left:5px}.page-package-details .install-tabs .nav-tabs>li>a{padding:5px 10px;margin:0;color:#000;background-color:#eaeaea;border:0}.page-package-details .install-tabs .nav-tabs>li.active>a{color:#fff;background-color:#002440;border:0}.page-package-details .install-tabs .tab-pane{display:table}.page-package-details .install-tabs .tab-pane .install-script{display:table-cell;width:100%;padding:8px 10px;font-family:Consolas,Menlo,Monaco,\"Courier New\",monospace;color:#fff;background-color:#002440}.page-package-details .install-tabs .tab-pane .install-script span::before{content:\"PM> \"}.page-package-details .install-tabs .tab-pane .copy-button{display:table-cell}.page-forgot-password .forgot-form{margin-top:80px}.page-sign-in .provider-button{margin-top:70px;line-height:2em}.page-sign-in .provider-button img{margin-bottom:1px}.page-sign-in .or-row{margin:30px}.page-pages .pages-container{margin-bottom:70px}.page-pages h1{margin-bottom:40px}.page-pages h2{margin-top:40px;margin-bottom:20px}.page-pages h3{margin-top:40px;margin-bottom:10px}.page-pages p{margin-bottom:24px}\n+html{position:relative;min-height:100%}.row-gap{margin-top:50px}.search-container{padding-top:16px;padding-bottom:16px}.main-container{padding-bottom:75px}.navbar-logo{margin:8px 20px 0 0}.footer{position:absolute;bottom:0;width:100%;padding-top:60px;font-size:.7em;color:#e3ebf1;background-color:#002440}.footer a{color:#e3ebf1}body{margin-bottom:520px}@media (min-width:992px){body{margin-bottom:330px}}.footer{height:520px}@media (min-width:992px){.footer{height:330px}}.borderless>tbody>tr>td{border:none}.no-clickonce{display:none}.tag{padding:2px 10px;margin:0 2px;line-height:2em;background-color:#eff9ff}.banner{padding:10px}.banner.banner-bright{font-size:1.25em;background:#ff0}.banner.banner-info{background:#f4f4f4}.ms-Icon-ul{margin-left:24px}.ms-Icon-ul li{position:relative}.ms-Icon-ul li i.ms-Icon{position:absolute;left:-24px}.page-home .jumbotron h1{margin:32px}.page-home .what-is-nuget{padding-bottom:75px;font-size:1.15em}.page-home .triangle:after{position:absolute;bottom:-7px;display:block;width:0;content:\"\";border-color:#fff transparent;border-style:solid;border-width:7px 7px 0}.page-home .triangle-left:after{left:15px}.page-home .triangle-right:after{right:15px}.page-home .circuit-board{position:relative;width:804px;height:471px;margin:0 auto;margin-top:50px;background-image:url(../img/circuit-board.png);background-repeat:no-repeat;background-position:center bottom}.page-home .circuit-board .circuit-board-label{position:absolute;height:75px;color:#000;background-color:#fff;-webkit-box-shadow:0 0 3px #000;box-shadow:0 0 3px #000}.page-home .circuit-board .circuit-board-label h3,.page-home .circuit-board .circuit-board-label h5{margin:9px 0 0 0}.page-home .circuit-board .circuit-board-pd{top:0;left:167px;float:left;width:200px}.page-home .circuit-board .circuit-board-pv{top:173px;left:3px;float:left;width:144px}.page-home .circuit-board .circuit-board-up{top:159px;right:3px;float:right;width:144px}.page-package-details h4>span{margin-bottom:3px;border-bottom:1px solid #d8d8d8}.page-package-details .dependency-group li span{color:#666}.page-package-details .no-border{border:0}.page-package-details #show-hidden-versions:focus,.page-package-details #show-hidden-versions:hover{text-decoration:none}.page-package-details .package-details-info .ms-Icon-ul li{margin-bottom:15px}.page-package-details .owner-list li{margin-bottom:5px}.page-package-details .install-tabs{font-size:.8em}.page-package-details .install-tabs ul{margin-left:0}.page-package-details .install-tabs .nav-tabs>li{padding:0;margin-left:5px}.page-package-details .install-tabs .nav-tabs>li>a{padding:5px 10px;margin:0;color:#000;background-color:#eaeaea;border:0}.page-package-details .install-tabs .nav-tabs>li.active>a{color:#fff;background-color:#002440;border:0}.page-package-details .install-tabs .tab-pane{display:table}.page-package-details .install-tabs .tab-pane .install-script{display:table-cell;width:100%;padding:8px 10px;font-family:Consolas,Menlo,Monaco,\"Courier New\",monospace;color:#fff;background-color:#002440}.page-package-details .install-tabs .tab-pane .install-script span::before{content:\"PM> \"}.page-package-details .install-tabs .tab-pane .copy-button{display:table-cell}.page-forgot-password .forgot-form{margin-top:80px}.page-sign-in .provider-button{margin-top:70px;line-height:2em}.page-sign-in .provider-button img{margin-bottom:1px}.page-sign-in .or-row{margin:30px}.page-pages .pages-container{margin-bottom:70px}.page-pages h1{margin-bottom:40px}.page-pages h2{margin-top:40px;margin-bottom:20px}.page-pages h3{margin-top:40px;margin-bottom:10px}.page-pages p{margin-bottom:24px}.page-statistics-most-downloaded h2{margin-top:4px;margin-bottom:40px;font-size:1.5em;color:gray}.page-statistics-most-downloaded .table{table-layout:fixed}.page-statistics-most-downloaded .table thead{padding-bottom:4px;margin-bottom:10px}.page-statistics-most-downloaded .table thead th{font-size:1.5em;font-weight:400}.page-statistics-most-downloaded .table thead .packages th:nth-child(1){width:10%}.page-statistics-most-downloaded .table thead .packages th:nth-child(2){width:70%}.page-statistics-most-downloaded .table thead .packages th:nth-child(3){width:20%}.page-statistics-most-downloaded .table thead .package-versions th:nth-child(1){width:10%}.page-statistics-most-downloaded .table thead .package-versions th:nth-child(2){width:50%}.page-statistics-most-downloaded .table thead .package-versions th:nth-child(3){width:20%}.page-statistics-most-downloaded .table thead .package-versions th:nth-child(4){width:20%}.page-statistics-most-downloaded .table tbody{margin-bottom:20px;font-size:1.25em}.page-statistics-most-downloaded .table tbody td{overflow:hidden;text-overflow:ellipsis}\n/*# sourceMappingURL=bootstrap-theme.min.css.map */\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.min.css.map",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.min.css.map",
"diff": "Binary files a/src/Bootstrap/dist/css/bootstrap-theme.min.css.map and b/src/Bootstrap/dist/css/bootstrap-theme.min.css.map differ\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/all.less",
"new_path": "src/Bootstrap/less/theme/all.less",
"diff": "@import \"page-forgot-password.less\";\n@import \"page-sign-in.less\";\n@import \"page-pages.less\";\n+@import \"page-statistics-most-downloaded.less\";\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/Bootstrap/less/theme/page-statistics-most-downloaded.less",
"diff": "+.page-statistics-most-downloaded {\n+ @subtitle-text-size: 1.5em;\n+ @margin-small: 4px;\n+\n+ h2 {\n+ font-size: @subtitle-text-size;\n+ color: gray;\n+ margin-top: @margin-small;\n+ margin-bottom: 40px;\n+ }\n+\n+ .table {\n+ table-layout: fixed;\n+\n+ thead {\n+ padding-bottom: @margin-small;\n+ margin-bottom: 10px;\n+\n+ th {\n+ font-size: @subtitle-text-size;\n+ font-weight: normal;\n+ }\n+\n+ .packages {\n+ th:nth-child(1) {\n+ width: 10%;\n+ }\n+\n+ th:nth-child(2) {\n+ width: 70%;\n+ }\n+\n+ th:nth-child(3) {\n+ width: 20%;\n+ }\n+ }\n+\n+ .package-versions {\n+ th:nth-child(1) {\n+ width: 10%;\n+ }\n+\n+ th:nth-child(2) {\n+ width: 50%;\n+ }\n+\n+ th:nth-child(3) {\n+ width: 20%;\n+ }\n+\n+ th:nth-child(4) {\n+ width: 20%;\n+ }\n+ }\n+ }\n+\n+ tbody {\n+ font-size: 1.25em;\n+ margin-bottom: 20px;\n+\n+ td {\n+ overflow: hidden;\n+ text-overflow: ellipsis;\n+ }\n+ }\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Content/gallery/css/bootstrap-theme.css",
"new_path": "src/NuGetGallery/Content/gallery/css/bootstrap-theme.css",
"diff": "@@ -227,4 +227,50 @@ body {\n.page-pages p {\nmargin-bottom: 24px;\n}\n+.page-statistics-most-downloaded h2 {\n+ margin-top: 4px;\n+ margin-bottom: 40px;\n+ font-size: 1.5em;\n+ color: gray;\n+}\n+.page-statistics-most-downloaded .table {\n+ table-layout: fixed;\n+}\n+.page-statistics-most-downloaded .table thead {\n+ padding-bottom: 4px;\n+ margin-bottom: 10px;\n+}\n+.page-statistics-most-downloaded .table thead th {\n+ font-size: 1.5em;\n+ font-weight: normal;\n+}\n+.page-statistics-most-downloaded .table thead .packages th:nth-child(1) {\n+ width: 10%;\n+}\n+.page-statistics-most-downloaded .table thead .packages th:nth-child(2) {\n+ width: 70%;\n+}\n+.page-statistics-most-downloaded .table thead .packages th:nth-child(3) {\n+ width: 20%;\n+}\n+.page-statistics-most-downloaded .table thead .package-versions th:nth-child(1) {\n+ width: 10%;\n+}\n+.page-statistics-most-downloaded .table thead .package-versions th:nth-child(2) {\n+ width: 50%;\n+}\n+.page-statistics-most-downloaded .table thead .package-versions th:nth-child(3) {\n+ width: 20%;\n+}\n+.page-statistics-most-downloaded .table thead .package-versions th:nth-child(4) {\n+ width: 20%;\n+}\n+.page-statistics-most-downloaded .table tbody {\n+ margin-bottom: 20px;\n+ font-size: 1.25em;\n+}\n+.page-statistics-most-downloaded .table tbody td {\n+ overflow: hidden;\n+ text-overflow: ellipsis;\n+}\n/*# sourceMappingURL=bootstrap-theme.css.map */\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Statistics/PackageVersions.cshtml",
"new_path": "src/NuGetGallery/Views/Statistics/PackageVersions.cshtml",
"diff": "@{\nViewBag.Title = \"Package Version Download Statistics\";\nViewBag.Tab = \"Statistics\";\n+ Layout = \"~/Views/Shared/Gallery/Layout.cshtml\";\n}\n-<h1 class=\"statistics-report-title\">Most Downloaded Package Versions (Top 500 Over the Last 6 Weeks)</h1>\n-<table class=\"sexy-table\">\n+<section role=\"main\" class=\"container main-container page-statistics-most-downloaded\">\n+ <div class=\"row\">\n+ <div class=\"col\">\n+ <h1>Most Downloaded Package Versions</h1>\n+ </div>\n+ </div>\n+ <div class=\"row\">\n+ <div class=\"col\">\n+ <h2>Top 500 Over the Last 6 Weeks</h2>\n+ </div>\n+ </div>\n+ <div class=\"row\">\n+ <table class=\"table borderless\">\n+ <caption class=\"sr-only\">\n+ The package versions with the most downloads.\n+ </caption>\n<thead>\n- <tr>\n- <th scope=\"col\"></th><th scope=\"col\" class=\"first\">Package</th><th scope=\"col\">Version</th><th scope=\"col\">Downloads</th>\n+ <tr class=\"package-versions\">\n+ <th scope=\"col\"> <span class=\"sr-only\">#</span></th>\n+ <th scope=\"col\">Package</th>\n+ <th scope=\"col\">Version</th>\n+ <th scope=\"col\">Downloads</th>\n</tr>\n</thead>\n+\n<tbody>\n@{\nvar index = 0;\n-\nforeach (var item in Model.DownloadPackageVersionsAll)\n{\nindex++;\n<tr>\n- <td class=\"statistics-rank\">@index</td>\n+ <td scope=\"row\">@index</td>\n<td><a href=\"@Url.Package(item.PackageId)\">@item.PackageId</a></td>\n<td><a href=\"@Url.Package(item.PackageId, item.PackageVersion)\">@item.PackageVersion</a></td>\n- <td class=\"statistics-number\"><a href=\"@Url.StatisticsPackageDownloadsDetail(item.PackageId, item.PackageVersion)\">@Model.DisplayDownloads(item.Downloads)</a></td>\n+ <td><a href=\"@Url.StatisticsPackageDownloadsDetail(item.PackageId, item.PackageVersion)\">@Model.DisplayDownloads(item.Downloads)</a></td>\n</tr>\n}\n}\n</tbody>\n</table>\n+ </div>\n+ <div class=\"row\">\n@Html.Partial(\"_LastUpdated\", Model)\n+ </div>\n+</section>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Statistics/Packages.cshtml",
"new_path": "src/NuGetGallery/Views/Statistics/Packages.cshtml",
"diff": "@{\nViewBag.Title = \"Package Download Statistics\";\nViewBag.Tab = \"Statistics\";\n+ Layout = \"~/Views/Shared/Gallery/Layout.cshtml\";\n}\n-<div>\n- <h1 class=\"statistics-report-title\">Most Downloaded Packages (Top 100 Over the Last 6 Weeks)</h1>\n- <table class=\"sexy-table\">\n+<section role=\"main\" class=\"container main-container page-statistics-most-downloaded\">\n+ <div class=\"row\">\n+ <div class=\"col\">\n+ <h1>Most Downloaded Packages</h1>\n+ </div>\n+ </div>\n+ <div class=\"row\">\n+ <div class=\"col\">\n+ <h2>Top 100 Over the Last 6 Weeks</h2>\n+ </div>\n+ </div>\n+ <div class=\"row\">\n+ <table class=\"table borderless\">\n+ <caption class=\"sr-only\">\n+ The packages with the most downloads.\n+ </caption>\n<thead>\n- <tr>\n- <th scope=\"col\"></th>\n- <th scope=\"col\" class=\"first\">Package</th>\n+ <tr class=\"packages\">\n+ <th scope=\"col\"> <span class=\"sr-only\">#</span></th>\n+ <th scope=\"col\">Package</th>\n<th scope=\"col\">Downloads</th>\n</tr>\n</thead>\n+\n<tbody>\n@{\nvar index = 0;\n-\nforeach (var item in Model.DownloadPackagesAll)\n{\nindex++;\n<tr>\n- <td class=\"statistics-rank\">@index</td>\n+ <td scope=\"row\">@index</td>\n<td><a href=\"@Url.Package(item.PackageId)\">@item.PackageId</a></td>\n- <td class=\"statistics-number\"><a href=\"@Url.StatisticsPackageDownloadByVersion(item.PackageId)\">@Model.DisplayDownloads(item.Downloads)</a></td>\n+ <td><a href=\"@Url.StatisticsPackageDownloadByVersion(item.PackageId)\">@Model.DisplayDownloads(item.Downloads)</a></td>\n</tr>\n}\n}\n</tbody>\n</table>\n+ </div>\n+ <div class=\"row\">\n@Html.Partial(\"_LastUpdated\", Model)\n</div>\n+</section>\n+\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
[Redesign] Statistics Most Downloaded Packages/Version (#4042)
|
455,759 |
09.06.2017 18:28:15
| -7,200 |
09de95d251b115c6d0e43ae66c9c1f41c6ee4100
|
v2 package-versions auto-complete endpoint should exclude deleted versions
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Queries/AutoCompleteDatabasePackageVersionsQuery.cs",
"new_path": "src/NuGetGallery/Queries/AutoCompleteDatabasePackageVersionsQuery.cs",
"diff": "@@ -14,7 +14,7 @@ public class AutoCompleteDatabasePackageVersionsQuery\nprivate const string _sqlFormat = @\"SELECT p.[Version]\nFROM Packages p (NOLOCK)\nJOIN PackageRegistrations pr (NOLOCK) on pr.[Key] = p.PackageRegistrationKey\n-WHERE {0} AND pr.ID = {{0}}\n+WHERE p.[Deleted] <> 1 AND {0} AND pr.ID = {{0}}\n{1}\";\npublic AutoCompleteDatabasePackageVersionsQuery(IEntitiesContext entities)\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
v2 package-versions auto-complete endpoint should exclude deleted versions #4092 (#4093)
|
455,759 |
09.06.2017 18:28:52
| -7,200 |
ac7a89de285153542b0fbd94eb86e109f1e17884
|
Remove auto-refresh AJAX call for total stats on home page
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/stats.js",
"new_path": "src/NuGetGallery/Scripts/stats.js",
"diff": "// var section = $('section.aggstatserr');\n// section.show();\n});\n-\n- setTimeout(function () { getStats(currData); }, 30000);\n}\nfunction update(data, currData, key) {\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Remove auto-refresh AJAX call for total stats on home page #4090 (#4091)
|
455,759 |
09.06.2017 21:20:28
| -7,200 |
a8fed25e16d45b66be2ef53ca7e1e52499def27f
|
v2 package-versions auto-complete endpoint should exclude unlisted versions
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Queries/AutoCompleteDatabasePackageVersionsQuery.cs",
"new_path": "src/NuGetGallery/Queries/AutoCompleteDatabasePackageVersionsQuery.cs",
"diff": "@@ -14,7 +14,7 @@ public class AutoCompleteDatabasePackageVersionsQuery\nprivate const string _sqlFormat = @\"SELECT p.[Version]\nFROM Packages p (NOLOCK)\nJOIN PackageRegistrations pr (NOLOCK) on pr.[Key] = p.PackageRegistrationKey\n-WHERE p.[Deleted] <> 1 AND {0} AND pr.ID = {{0}}\n+WHERE p.[Deleted] <> 1 AND p.[Listed] = 1 AND {0} AND pr.ID = {{0}}\n{1}\";\npublic AutoCompleteDatabasePackageVersionsQuery(IEntitiesContext entities)\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
v2 package-versions auto-complete endpoint should exclude unlisted versions #4092 (#4099)
|
455,743 |
09.06.2017 17:06:35
| 25,200 |
4b1cfe3ad7cc82491327d04e2760df46a13aa130
|
Darken tags' font color by 5%
|
[
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -78,6 +78,7 @@ body h3 {\npadding: 2px 10px;\nmargin: 0 2px;\nline-height: 2em;\n+ color: #266daa;\nbackground-color: #eff9ff;\n}\n.banner {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/base.less",
"new_path": "src/Bootstrap/less/theme/base.less",
"diff": "@@ -101,6 +101,7 @@ body {\n}\n.tag {\n+ color: #266daa;\nbackground-color: #eff9ff;\npadding: 2px 10px;\nline-height: 2em;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Content/gallery/css/bootstrap-theme.css",
"new_path": "src/NuGetGallery/Content/gallery/css/bootstrap-theme.css",
"diff": "@@ -78,6 +78,7 @@ body h3 {\npadding: 2px 10px;\nmargin: 0 2px;\nline-height: 2em;\n+ color: #266daa;\nbackground-color: #eff9ff;\n}\n.banner {\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Darken tags' font color by 5% (#4106)
|
455,743 |
12.06.2017 13:46:12
| 25,200 |
3ffbaf6a3f236c171250821b4a186a596a306ac3
|
Fixed contrast of links on alerts
|
[
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -78,9 +78,13 @@ body h3 {\npadding: 2px 10px;\nmargin: 0 2px;\nline-height: 2em;\n- color: #266daa;\n+ color: #2e6da4;\nbackground-color: #eff9ff;\n}\n+.tag:hover,\n+.tag:focus {\n+ color: #23527c;\n+}\n.banner {\npadding-bottom: 10px;\n}\n@@ -96,6 +100,13 @@ body h3 {\n.banner.banner-bright {\nbackground: yellow;\n}\n+.alert a {\n+ color: #2e6da4;\n+}\n+.alert a:hover,\n+.alert a:focus {\n+ color: #23527c;\n+}\n.alert-transient .alert {\npadding: 10px;\nmargin: 0;\n"
},
{
"change_type": "DELETE",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css.map",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css.map",
"diff": "Binary files a/src/Bootstrap/dist/css/bootstrap-theme.css.map and /dev/null differ\n"
},
{
"change_type": "DELETE",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.min.css",
"new_path": null,
"diff": "-html{position:relative;min-height:100%}.row-gap{margin-top:50px}.search-container{padding-top:16px;padding-bottom:16px}.main-container{padding-bottom:75px}.main-container .page-subheading{color:#777}.navbar-logo{margin:8px 20px 0 0}.footer{position:absolute;bottom:0;width:100%;padding-top:60px;font-size:.7em;color:#e3ebf1;background-color:#002440}.footer a{color:#e3ebf1}body{margin-bottom:520px}@media (min-width:992px){body{margin-bottom:330px}}body h1,body h2,body h3,body p{margin-bottom:24px}body h2,body h3{margin-top:40px}.navbar-seperated .seperator{display:block;padding:11px 0;font-weight:100;color:#fff}.navbar-seperated .seperator>span::after{content:\" | \"}.footer{height:520px}@media (min-width:992px){.footer{height:330px}}.btn-search{height:36px}.borderless>tbody>tr>td{border:none}.no-clickonce{display:none}.tag{padding:2px 10px;margin:0 2px;line-height:2em;background-color:#eff9ff}.banner{padding-top:10px;padding-bottom:10px}.banner.banner-bright{font-size:1.25em;background:#ff0}.banner.banner-info{background:#f4f4f4}.ms-Icon-ul{margin-left:24px}.ms-Icon-ul li{position:relative}.ms-Icon-ul li i.ms-Icon{position:absolute;left:-24px}.list-packages{border-top:1px solid #dbdbdb}.list-packages .package{padding-top:20px;padding-bottom:20px;font-size:15px;border-bottom:1px solid #dbdbdb}@media screen and (max-width:768px){.list-packages .package img{max-width:60px;max-height:60px}}.list-packages .package img{margin-right:auto;margin-left:auto}.list-packages .package .package-header h2{display:inline;font-weight:300}.list-packages .package .package-header .package-by{margin-left:10px;color:#000}.list-packages .package .package-statistics{margin-top:10px;line-height:20px;color:#666}.list-packages .package .package-statistics .package-statistics-middle{padding-right:10px;padding-left:10px;margin-right:10px;margin-left:10px;border-color:#dbdbdb;border-width:1px;border-right-style:solid;border-left-style:solid}.list-packages .package .package-details{margin-top:10px;line-height:20px;color:#000}.list-packages .package .package-tags{margin-top:10px;margin-left:-2px}.page-about .contributors .contributor{padding:5px}.page-about .contributors .contributor .avatar{width:75px;height:75px}.page-package-details h4>span{margin-bottom:3px;border-bottom:1px solid #d8d8d8}.page-package-details .dependency-group li span{color:#666}.page-package-details .no-border{border:0}.page-package-details #show-hidden-versions:focus,.page-package-details #show-hidden-versions:hover{text-decoration:none}.page-package-details .package-details-info .ms-Icon-ul li{margin-bottom:15px}.page-package-details .owner-list li{margin-bottom:5px}.page-package-details .install-tabs{font-size:.8em}.page-package-details .install-tabs ul{margin-left:0}.page-package-details .install-tabs .nav-tabs>li{padding:0;margin-left:5px}.page-package-details .install-tabs .nav-tabs>li>a{padding:5px 10px;margin:0;color:#000;background-color:#eaeaea;border:0}.page-package-details .install-tabs .nav-tabs>li.active>a{color:#fff;background-color:#002440;border:0}.page-package-details .install-tabs .tab-pane{display:table}.page-package-details .install-tabs .tab-pane .install-script{display:table-cell;width:100%;padding:8px 10px;font-family:Consolas,Menlo,Monaco,\"Courier New\",monospace;color:#fff;background-color:#002440}.page-package-details .install-tabs .tab-pane .install-script span::before{content:\"PM> \"}.page-package-details .install-tabs .tab-pane .copy-button{display:table-cell}.page-downloads .list-tools li{margin-top:20px}.page-forgot-password .forgot-form{margin-top:80px}.page-home .jumbotron h1{margin:32px}.page-home .what-is-nuget{padding-bottom:75px;font-size:1.15em}.page-home .triangle:after{position:absolute;bottom:-7px;display:block;width:0;content:\"\";border-color:#fff transparent;border-style:solid;border-width:7px 7px 0}.page-home .triangle-left:after{left:30px}.page-home .triangle-right:after{right:30px}.page-home .circuit-board{position:relative;width:768px;height:482px;margin:0 auto;margin-top:50px;background-image:url(../img/circuit-board.svg),url(../img/circuit-board.png);background-repeat:no-repeat;background-position:center bottom}.page-home .circuit-board .circuit-board-label{position:absolute;height:75px;color:#000;background-color:#fff;-webkit-box-shadow:0 0 3px #000;box-shadow:0 0 3px #000}.page-home .circuit-board .circuit-board-label h3,.page-home .circuit-board .circuit-board-label h5{margin:9px 0 0 0}.page-home .circuit-board .circuit-board-pd{top:0;left:135px;float:left;width:200px}.page-home .circuit-board .circuit-board-pv{top:136px;left:0;float:left;width:144px}.page-home .circuit-board .circuit-board-up{top:159px;right:0;float:right;width:144px}.page-list-packages h1{margin-bottom:33px}.page-list-packages .pager{float:right;margin-top:75px;margin-bottom:0}.page-pages .pages-container{margin-bottom:70px}.page-profile .profile-title{margin-top:50px;margin-bottom:20px}.page-profile .profile-title h1{display:inline;font-size:2.285em;font-weight:300}.page-profile .profile-title .verified{margin-left:16px;font-size:14px;color:#068918}.page-profile .pager{float:right}.page-profile .profile-details img{margin-top:50px}.page-profile .profile-details .statistics{font-weight:300;color:#000}.page-profile .profile-details .statistics .statistic{padding:0;margin-top:20px}.page-profile .profile-details .statistics .statistic .value{font-size:34px}.page-profile .profile-details .statistics .statistic .description{font-size:24px}.page-report-abuse .report-form{margin-top:40px}.page-report-abuse .report-form #alreadycontactedowner-label{display:inline}.page-report-abuse .report-form .infringement-claim-requirements h2{margin-top:15px;margin-bottom:15px;font-size:16px;font-weight:600;color:#000}.page-sign-in .provider-button{margin-top:70px;line-height:2em}.page-sign-in .provider-button img{margin-bottom:1px}.page-sign-in .or-row{margin:30px}.page-statistics-most-downloaded h2{margin-top:4px;margin-bottom:40px;font-size:1.5em;color:gray}.page-statistics-most-downloaded .table{table-layout:fixed}.page-statistics-most-downloaded .table thead{padding-bottom:4px;margin-bottom:10px}.page-statistics-most-downloaded .table thead th{font-size:1.5em;font-weight:400}.page-statistics-most-downloaded .table thead .packages th:nth-child(1){width:10%}.page-statistics-most-downloaded .table thead .packages th:nth-child(2){width:70%}.page-statistics-most-downloaded .table thead .packages th:nth-child(3){width:20%}.page-statistics-most-downloaded .table thead .package-versions th:nth-child(1){width:10%}.page-statistics-most-downloaded .table thead .package-versions th:nth-child(2){width:50%}.page-statistics-most-downloaded .table thead .package-versions th:nth-child(3){width:20%}.page-statistics-most-downloaded .table thead .package-versions th:nth-child(4){width:20%}.page-statistics-most-downloaded .table tbody{margin-bottom:20px;font-size:1.25em}.page-statistics-most-downloaded .table tbody td{overflow:hidden;text-overflow:ellipsis}.page-statistics-overview .stats-title-text{margin-bottom:10px;font-size:1.6em}.page-statistics-overview .chart{width:98%;height:300px}.page-statistics-overview circle.graph-dot{fill:#4682b4}.page-statistics-overview circle.graph-dot:hover{fill:orange}.page-statistics-overview rect.graph-bar{fill:#4682b4}.page-statistics-overview rect.graph-bar:hover{fill:orange}.page-statistics-overview line.graph-line{stroke:#4682b4;stroke-width:2}.page-statistics-overview text.graph-x-axis-text{font-size:.8em}.page-statistics-overview text.graph-x-axis-date{font-size:.6em}.page-statistics-overview text.graph-y-axis-text{font-size:.9em}\n-/*# sourceMappingURL=bootstrap-theme.min.css.map */\n\\ No newline at end of file\n"
},
{
"change_type": "DELETE",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.min.css.map",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.min.css.map",
"diff": "Binary files a/src/Bootstrap/dist/css/bootstrap-theme.min.css.map and /dev/null differ\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/base.less",
"new_path": "src/Bootstrap/less/theme/base.less",
"diff": "@@ -101,11 +101,16 @@ body {\n}\n.tag {\n- color: #266daa;\n+ color: @link-color-darker;\nbackground-color: #eff9ff;\npadding: 2px 10px;\nline-height: 2em;\nmargin: 0 2px;\n+\n+ &:hover,\n+ &:focus {\n+ color: @link-hover-color;\n+ }\n}\n.banner {\n@@ -127,6 +132,17 @@ body {\n}\n}\n+.alert {\n+ a {\n+ color: @link-color-darker;\n+\n+ &:hover,\n+ &:focus {\n+ color: @link-hover-color;\n+ }\n+ }\n+}\n+\n.alert-transient {\n.alert {\nmargin: 0;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/variables.less",
"new_path": "src/Bootstrap/less/variables.less",
"diff": "//** Global textual link color.\n@link-color: @brand-primary;\n+//** Darker link color, for higher contrast when needed by accessibility\n+@link-color-darker: darken(@link-color, 5%);\n//** Link hover color set via `darken()` function.\n@link-hover-color: darken(@link-color, 15%);\n//** Link hover decoration.\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Content/gallery/css/bootstrap-theme.css",
"new_path": "src/NuGetGallery/Content/gallery/css/bootstrap-theme.css",
"diff": "@@ -78,9 +78,13 @@ body h3 {\npadding: 2px 10px;\nmargin: 0 2px;\nline-height: 2em;\n- color: #266daa;\n+ color: #2e6da4;\nbackground-color: #eff9ff;\n}\n+.tag:hover,\n+.tag:focus {\n+ color: #23527c;\n+}\n.banner {\npadding-bottom: 10px;\n}\n@@ -96,6 +100,13 @@ body h3 {\n.banner.banner-bright {\nbackground: yellow;\n}\n+.alert a {\n+ color: #2e6da4;\n+}\n+.alert a:hover,\n+.alert a:focus {\n+ color: #23527c;\n+}\n.alert-transient .alert {\npadding: 10px;\nmargin: 0;\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Fixed contrast of links on alerts (#4107)
|
455,737 |
13.06.2017 14:35:25
| 25,200 |
5461d47be33071ad674d4c72d0bebe22e3e23cb0
|
Update package details table
[Redesign]Update package details table
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/common.js",
"new_path": "src/NuGetGallery/Scripts/gallery/common.js",
"diff": "};\nnuget.configureExpander = function (prefix, lessMessage, moreMessage) {\n- var hidden = $('#' + prefix);\n+ var hidden = $('.' + prefix);\nvar show = $('#show-' + prefix);\nvar showText = $('#show-' + prefix + ' span');\nvar showIcon = $('#show-' + prefix + ' i');\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/DisplayPackage.cshtml",
"diff": "<h2>Dependencies</h2>\nif (Model.Dependencies.DependencySets.Any())\n{\n- <ul class=\"list-unstyled panel-collapse collapse\" id=\"dependency-groups\">\n+ <ul class=\"list-unstyled panel-collapse collapse dependency-groups\">\n@foreach (var dependencySet in Model.Dependencies.DependencySets)\n{\nvar dependencySetTitle = dependencySet.Key;\n</li>\n}\n</ul>\n- <button type=\"button\" data-toggle=\"collapse\" class=\"btn btn-link btn-expander\" data-target=\"#dependency-groups\"\n+ <button type=\"button\" data-toggle=\"collapse\" class=\"btn btn-link btn-expander\" data-target=\".dependency-groups\"\naria-expanded=\"false\" aria-controls=\"dependency-groups\" id=\"show-dependency-groups\">\n<i class=\"ms-Icon ms-Icon--ChevronDown\" aria-hidden=\"true\"></i>\n<span>Show</span>\nif (!packageVersion.Deleted && (packageVersion.Listed || (Model.IsOwner(User) || User.IsAdministrator())))\n{\nrowCount++;\n- if (rowCount == 6)\n- {\n- @:</tbody><tbody class=\"collapse no-border\" id=\"hidden-versions\">\n- }\n-\n- <tr>\n+ <tr class=\"@(rowCount >= 6 ? \"collapse\" : \"\")\">\n<td>\n@if (packageVersion.IsCurrent(Model))\n{\nelse if (packageVersion.Deleted)\n{\nrowCount++;\n- if (rowCount == 6)\n- {\n- @:</tbody><tbody class=\"panel-collapse collapse no-border\" id=\"hidden-versions\">\n- }\n-\n- <tr class=\"versionTableRow deleted\">\n+ <tr class=\"versionTableRow deleted @(rowCount >= 6 ? \"collapse\" : \"\")\">\n<td class=\"version\">\n<s>@packageVersion.FullVersion</s> (deleted)\n</td>\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Update package details table (#4111)
[Redesign]Update package details table
|
455,759 |
14.06.2017 07:36:58
| -7,200 |
d91a591b3c919278ab092437029161415f1fff6b
|
Adding unit tests to assert autocomplete service hijack properly constructs query strings
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Queries/AutoCompleteServiceQuery.cs",
"new_path": "src/NuGetGallery/Queries/AutoCompleteServiceQuery.cs",
"diff": "@@ -35,6 +35,19 @@ public AutoCompleteServiceQuery(IAppConfiguration configuration)\nstring queryString,\nbool? includePrerelease,\nstring semVerLevel = null)\n+ {\n+ queryString = BuildQueryString(queryString, includePrerelease, semVerLevel);\n+\n+ var endpoints = await _serviceDiscoveryClient.GetEndpointsForResourceType(_autocompleteServiceResourceType);\n+ endpoints = endpoints.Select(e => new Uri(e + queryString)).AsEnumerable();\n+\n+ var result = await _httpClient.GetStringAsync(endpoints);\n+ var resultObject = JObject.Parse(result);\n+\n+ return resultObject[\"data\"].Select(entry => entry.ToString());\n+ }\n+\n+ internal string BuildQueryString(string queryString, bool? includePrerelease, string semVerLevel = null)\n{\nqueryString += $\"&prerelease={includePrerelease ?? false}\";\n@@ -44,13 +57,12 @@ public AutoCompleteServiceQuery(IAppConfiguration configuration)\nqueryString += $\"&semVerLevel={semVerLevel}\";\n}\n- var endpoints = await _serviceDiscoveryClient.GetEndpointsForResourceType(_autocompleteServiceResourceType);\n- endpoints = endpoints.Select(e => new Uri(e + \"?\" + queryString)).AsEnumerable();\n-\n- var result = await _httpClient.GetStringAsync(endpoints);\n- var resultObject = JObject.Parse(result);\n+ if (string.IsNullOrEmpty(queryString))\n+ {\n+ return string.Empty;\n+ }\n- return resultObject[\"data\"].Select(entry => entry.ToString());\n+ return \"?\" + queryString.TrimStart('&');\n}\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/AutocompleteServicePackageIdsQueryFacts.cs",
"new_path": "tests/NuGetGallery.Facts/AutocompleteServicePackageIdsQueryFacts.cs",
"diff": "@@ -43,5 +43,22 @@ public async Task ExecuteReturnsResultsForSpecificQuery()\nvar result = await query.Execute(\"jquery\", false);\nAssert.Contains(\"jquery\", result, StringComparer.OrdinalIgnoreCase);\n}\n+\n+ [Theory]\n+ [InlineData(true, null, \"?take=30&q=Json&prerelease=True\")]\n+ [InlineData(true, \"2.0.0\", \"?take=30&q=Json&prerelease=True&semVerLevel=2.0.0\")]\n+ [InlineData(false, null, \"?take=30&q=Json&prerelease=False\")]\n+ [InlineData(false, \"2.0.0\", \"?take=30&q=Json&prerelease=False&semVerLevel=2.0.0\")]\n+ public void PackageIdQueryBuildsCorrectQueryString(bool includePrerelease, string semVerLevel, string expectedQueryString)\n+ {\n+ // Arrange\n+ var query = new AutoCompleteServicePackageIdsQuery(GetConfiguration());\n+\n+ // Act\n+ var actualQueryString = query.BuildQueryString(\"take=30&q=Json\", includePrerelease, semVerLevel);\n+\n+ // Assert\n+ Assert.Equal(expectedQueryString, actualQueryString);\n+ }\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/AutocompleteServicePackageVersionsQueryFacts.cs",
"new_path": "tests/NuGetGallery.Facts/AutocompleteServicePackageVersionsQueryFacts.cs",
"diff": "@@ -16,7 +16,7 @@ private IAppConfiguration GetConfiguration()\n{\nvar mockConfiguration = new Mock<IAppConfiguration>();\nmockConfiguration.SetupGet(c => c.ServiceDiscoveryUri).Returns(new Uri(\"https://api.nuget.org/v3/index.json\"));\n- mockConfiguration.SetupGet(c => c.AutocompleteServiceResourceType).Returns(\"SearchAutocompleteService/3.0.0-rc\");\n+ mockConfiguration.SetupGet(c => c.AutocompleteServiceResourceType).Returns(\"SearchAutocompleteService\");\nreturn mockConfiguration.Object;\n}\n@@ -24,7 +24,7 @@ private IAppConfiguration GetConfiguration()\npublic async Task ExecuteThrowsForEmptyId()\n{\nvar query = new AutoCompleteServicePackageVersionsQuery(GetConfiguration());\n- await Assert.ThrowsAsync<ArgumentNullException>(async () => await query.Execute(\"\", false));\n+ await Assert.ThrowsAsync<ArgumentNullException>(async () => await query.Execute(string.Empty, false));\n}\n[Fact]\n@@ -34,5 +34,22 @@ public async Task ExecuteReturnsResultsForSpecificQuery()\nvar result = await query.Execute(\"newtonsoft.json\", false);\nAssert.True(result.Any());\n}\n+\n+ [Theory]\n+ [InlineData(true, null, \"?id=Newtonsoft.Json&prerelease=True\")]\n+ [InlineData(true, \"2.0.0\", \"?id=Newtonsoft.Json&prerelease=True&semVerLevel=2.0.0\")]\n+ [InlineData(false, null, \"?id=Newtonsoft.Json&prerelease=False\")]\n+ [InlineData(false, \"2.0.0\", \"?id=Newtonsoft.Json&prerelease=False&semVerLevel=2.0.0\")]\n+ public void PackageVersionsQueryBuildsCorrectQueryString(bool includePrerelease, string semVerLevel, string expectedQueryString)\n+ {\n+ // Arrange\n+ var query = new AutoCompleteServicePackageVersionsQuery(GetConfiguration());\n+\n+ // Act\n+ var actualQueryString = query.BuildQueryString(\"id=Newtonsoft.Json\", includePrerelease, semVerLevel);\n+\n+ // Assert\n+ Assert.Equal(expectedQueryString, actualQueryString);\n+ }\n}\n}\n\\ No newline at end of file\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
#4097 Adding unit tests to assert autocomplete service hijack properly constructs query strings (#4121)
|
455,794 |
14.06.2017 15:55:12
| 25,200 |
a5486f8733e280fbd74860ebc4a29048d8062d1f
|
Preserve original 409 exception in AI logs
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/Auditing/CloudAuditingService.cs",
"new_path": "src/NuGetGallery.Core/Auditing/CloudAuditingService.cs",
"diff": "@@ -116,7 +116,7 @@ private static async Task WriteBlob(string auditData, string fullPath, CloudBloc\nthrow new InvalidOperationException(String.Format(\nCultureInfo.CurrentCulture,\nCoreStrings.CloudAuditingService_DuplicateAuditRecord,\n- fullPath));\n+ fullPath), ex);\n}\nthrow;\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Preserve original 409 exception in AI logs (#4136)
|
455,759 |
16.06.2017 17:18:33
| -7,200 |
b5be98f7126f7cd1707c728b5b03d3560baf73d8
|
System.ArgumentNullException GET packages/DisplayPackage
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Infrastructure/CookieTempDataProvider.cs",
"new_path": "src/NuGetGallery/Infrastructure/CookieTempDataProvider.cs",
"diff": "@@ -58,6 +58,14 @@ void ITempDataProvider.SaveTempData(ControllerContext controllerContext, IDictio\n}\nforeach (var key in cookie.Values.AllKeys)\n{\n+ // As the index setter on HttpCookie does not guard against null keys,\n+ // we should guard against ArgumentNullException on Dictionary.Insert\n+ // when key == null.\n+ if (key == null)\n+ {\n+ continue;\n+ }\n+\ndictionary[key] = cookie[key];\n}\ncookie.Expires = DateTime.MinValue;\n@@ -79,6 +87,14 @@ protected virtual void SaveTempData(ControllerContext controllerContext, IDictio\ncookie.Secure = true;\nforeach (var item in values)\n{\n+ // As the index setter on HttpCookie does not guard against null keys,\n+ // we should guard against ArgumentNullException on Dictionary.Insert\n+ // when key == null.\n+ if (item.Key == null)\n+ {\n+ continue;\n+ }\n+\ncookie[item.Key] = Convert.ToString(item.Value, CultureInfo.InvariantCulture);\n}\n_httpContext.Response.Cookies.Add(cookie);\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Infrastructure/CookieTempDataProviderFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Infrastructure/CookieTempDataProviderFacts.cs",
"diff": "@@ -35,6 +35,30 @@ public void RetrievesValuesFromCookie()\nAssert.Equal(\"How am I funny?\", tempData[\"QUESTION\"]);\n}\n+\n+ [Fact]\n+ public void DoesNotThrowWhenKeyValuesFromCookieContainsNullKey()\n+ {\n+ var cookies = new HttpCookieCollection();\n+ var cookie = new HttpCookie(\"__Controller::TempData\");\n+ cookie.HttpOnly = true;\n+ cookies.Add(cookie);\n+ cookie[\"message\"] = \"Say hello to my little friend\";\n+ cookie[\"question\"] = \"How am I funny?\";\n+ cookie[null] = \"This should be ignored.\";\n+ var httpContext = new Mock<HttpContextBase>();\n+ httpContext.Setup(c => c.Request.Cookies).Returns(cookies);\n+ ITempDataProvider provider = new CookieTempDataProvider(httpContext.Object);\n+ var controllerContext = new ControllerContext();\n+\n+ var tempData = provider.LoadTempData(controllerContext);\n+\n+ Assert.Equal(2, tempData.Count);\n+ Assert.Equal(\"Say hello to my little friend\", tempData[\"message\"]);\n+ Assert.Equal(\"How am I funny?\", tempData[\"question\"]);\n+ Assert.Equal(\"How am I funny?\", tempData[\"QUESTION\"]);\n+ }\n+\n[Fact]\npublic void WithNullCookieReturnsEmptyDictionary()\n{\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
System.ArgumentNullException GET packages/DisplayPackage #4204 (#4210)
|
455,737 |
20.06.2017 12:00:42
| 25,200 |
3c49dc15ee488d9f9d0c202b2acccb79fd819e57
|
Adding built theme css.
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Content/gallery/css/bootstrap-theme.css",
"new_path": "src/NuGetGallery/Content/gallery/css/bootstrap-theme.css",
"diff": "@@ -534,6 +534,9 @@ img.package-icon {\n.page-stats-per-package .stats-table-footer tr {\nborder: none;\n}\n+.page-stats-per-package #hidden-rows {\n+ border-top: none;\n+}\n.page-stats-per-package #loading-placeholder {\ndisplay: none;\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Adding built theme css.
|
455,776 |
26.06.2017 11:12:55
| 25,200 |
f41869eaf80ead316aa647abdc0f345c435f5562
|
[Redesign] Toggle "slider"
|
[
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -181,6 +181,75 @@ img.package-icon {\nmargin-top: 10px;\nmargin-left: -2px;\n}\n+.switch-container {\n+ display: -webkit-box;\n+ display: -webkit-flex;\n+ display: -ms-flexbox;\n+ display: flex;\n+\n+ -webkit-box-align: center;\n+ -webkit-align-items: center;\n+ -ms-flex-align: center;\n+ align-items: center;\n+}\n+.switch-container .switch {\n+ display: -webkit-box;\n+ display: -webkit-flex;\n+ display: -ms-flexbox;\n+ display: flex;\n+ margin: 10px;\n+\n+ -webkit-box-align: center;\n+ -webkit-align-items: center;\n+ -ms-flex-align: center;\n+ align-items: center;\n+}\n+.switch-container .switch .slider-descriptor {\n+ margin: auto;\n+}\n+.switch-container .switch input {\n+ display: none;\n+}\n+.switch-container .switch input:checked ~ .slider {\n+ background-color: #337ab7;\n+}\n+.switch-container .switch input:checked ~ .slider:before {\n+ -webkit-transform: translateX(25px);\n+ -ms-transform: translateX(25px);\n+ -o-transform: translateX(25px);\n+ transform: translateX(25px);\n+}\n+.switch-container .switch input:disabled ~ .slider {\n+ background-color: gray;\n+}\n+.switch-container .switch .slider {\n+ position: relative;\n+ width: 50px;\n+ height: 25px;\n+ margin-right: 10px;\n+ margin-left: 10px;\n+ background-color: #337ab7;\n+ border-radius: 25px;\n+ -webkit-transition: .4s;\n+ -o-transition: .4s;\n+ transition: .4s;\n+}\n+.switch-container .switch .slider:before {\n+ position: absolute;\n+ bottom: 5px;\n+ left: 5px;\n+ width: 15px;\n+ height: 15px;\n+ content: \"\";\n+ background-color: white;\n+ border-radius: 15px;\n+ -webkit-transition: .4s;\n+ -o-transition: .4s;\n+ transition: .4s;\n+}\n+.switch-container label:not(.switch) {\n+ margin: auto;\n+}\n.page-about .contributors .contributor {\npadding: 5px;\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/Bootstrap/less/theme/common-slider.less",
"diff": "+//** Width of the entire slider\n+@slider-full-width: 50px;\n+//** Height of the entire slider\n+@slider-full-height: 25px;\n+//** Distance between the slider and any labels.\n+@slider-label-margin: 10px;\n+//** Amount of time it takes for the slider to transition between states.\n+@slider-transition: .4s;\n+//** The border (in px) between the inner radius and the outer radius\n+@slider-inner-border: 5px;\n+\n+//** The color of the slider's background when unchecked\n+@slider-color-unchecked: @brand-primary;\n+//** The color of the slider's background when checked\n+@slider-color-checked: @brand-primary;\n+//** The color of the slider's foreground\n+@slider-color-toggle: white;\n+//** The color of the slider's background when disabled\n+@slider-color-disabled: gray;\n+\n+.switch-container {\n+ display: flex;\n+ align-items: center;\n+\n+ .switch {\n+ margin: @slider-label-margin;\n+ display: flex;\n+ align-items: center;\n+\n+ .slider-descriptor {\n+ margin: auto;\n+ }\n+\n+ // The checkbox that controls the slider.\n+ input {\n+ // Hide it! Because the slider and checkbox are parented by a <label>, they handle click events identically.\n+ display: none;\n+\n+ // The following selectors change the state of the slider based on the state of the checkbox.\n+ &:checked ~ .slider {\n+ background-color: @slider-color-checked;\n+\n+ &:before {\n+ // Animate the slider's toggle from on state to the other.\n+ @slider-inner-translate-x: (@slider-full-width - @slider-full-height);\n+\n+ -webkit-transform: translateX(@slider-inner-translate-x);\n+ -ms-transform: translateX(@slider-inner-translate-x);\n+ transform: translateX(@slider-inner-translate-x);\n+ }\n+ }\n+\n+ &:disabled ~ .slider {\n+ background-color: @slider-color-disabled;\n+ }\n+ }\n+\n+ // The slider that reacts to the checkbox.\n+ .slider {\n+ position: relative;\n+ height: @slider-full-height;\n+ width: @slider-full-width;\n+ margin-left: @slider-label-margin;\n+ margin-right: @slider-label-margin;\n+ background-color: @slider-color-unchecked;\n+ -webkit-transition: @slider-transition;\n+ transition: @slider-transition;\n+ border-radius: @slider-full-height;\n+\n+ // The slider's toggle.\n+ &:before {\n+ @slider-inner-radius: (@slider-full-height - 2 * @slider-inner-border);\n+\n+ position: absolute;\n+ content: \"\";\n+ height: @slider-inner-radius;\n+ width: @slider-inner-radius;\n+ left: @slider-inner-border;\n+ bottom: @slider-inner-border;\n+ background-color: @slider-color-toggle;\n+ -webkit-transition: @slider-transition;\n+ transition: @slider-transition;\n+ border-radius: @slider-inner-radius;\n+ }\n+ }\n+ }\n+\n+ // The label describing the checkbox inside the slider.\n+ label:not(.switch) {\n+ margin: auto;\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Content/gallery/css/bootstrap-theme.css",
"new_path": "src/NuGetGallery/Content/gallery/css/bootstrap-theme.css",
"diff": "@@ -181,6 +181,75 @@ img.package-icon {\nmargin-top: 10px;\nmargin-left: -2px;\n}\n+.switch-container {\n+ display: -webkit-box;\n+ display: -webkit-flex;\n+ display: -ms-flexbox;\n+ display: flex;\n+\n+ -webkit-box-align: center;\n+ -webkit-align-items: center;\n+ -ms-flex-align: center;\n+ align-items: center;\n+}\n+.switch-container .switch {\n+ display: -webkit-box;\n+ display: -webkit-flex;\n+ display: -ms-flexbox;\n+ display: flex;\n+ margin: 10px;\n+\n+ -webkit-box-align: center;\n+ -webkit-align-items: center;\n+ -ms-flex-align: center;\n+ align-items: center;\n+}\n+.switch-container .switch .slider-descriptor {\n+ margin: auto;\n+}\n+.switch-container .switch input {\n+ display: none;\n+}\n+.switch-container .switch input:checked ~ .slider {\n+ background-color: #337ab7;\n+}\n+.switch-container .switch input:checked ~ .slider:before {\n+ -webkit-transform: translateX(25px);\n+ -ms-transform: translateX(25px);\n+ -o-transform: translateX(25px);\n+ transform: translateX(25px);\n+}\n+.switch-container .switch input:disabled ~ .slider {\n+ background-color: gray;\n+}\n+.switch-container .switch .slider {\n+ position: relative;\n+ width: 50px;\n+ height: 25px;\n+ margin-right: 10px;\n+ margin-left: 10px;\n+ background-color: #337ab7;\n+ border-radius: 25px;\n+ -webkit-transition: .4s;\n+ -o-transition: .4s;\n+ transition: .4s;\n+}\n+.switch-container .switch .slider:before {\n+ position: absolute;\n+ bottom: 5px;\n+ left: 5px;\n+ width: 15px;\n+ height: 15px;\n+ content: \"\";\n+ background-color: white;\n+ border-radius: 15px;\n+ -webkit-transition: .4s;\n+ -o-transition: .4s;\n+ transition: .4s;\n+}\n+.switch-container label:not(.switch) {\n+ margin: auto;\n+}\n.page-about .contributors .contributor {\npadding: 5px;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ExtensionMethods.cs",
"new_path": "src/NuGetGallery/ExtensionMethods.cs",
"diff": "@@ -317,6 +317,20 @@ public static HtmlString ShowCheckboxFor<TModel>(this HtmlHelper<TModel> html, E\nreturn html.CheckBoxFor(expression, htmlAttributes);\n}\n+ public static HtmlString ShowSliderFor<TModel>(this HtmlHelper<TModel> html, Expression<Func<TModel, bool>> expression)\n+ {\n+ return new HtmlString(@\"\n+<div class=\"\"switch-container\"\">\n+ <label class=\"\"switch\"\">\n+ <p class=\"\"slider-descriptor\"\">No</p>\" +\n+ ShowCheckboxFor(html, expression) + @\"\n+ <div class=\"\"slider\"\"></div>\n+ <p class=\"\"slider-descriptor\"\">Yes</p>\n+ </label>\" +\n+ ShowLabelFor(html, expression) + @\"\n+</div>\");\n+ }\n+\npublic static HtmlString ShowTextAreaFor<TModel, TProperty>(this HtmlHelper<TModel> html, Expression<Func<TModel, TProperty>> expression, int rows, int columns)\n{\nvar htmlAttributes = GetHtmlAttributes(html, expression);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/ReportAbuseViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/ReportAbuseViewModel.cs",
"diff": "@@ -15,7 +15,7 @@ public class ReportAbuseViewModel\npublic string PackageId { get; set; }\npublic string PackageVersion { get; set; }\n- [Display(Name = \"Yes! I have already tried to contact the package owner about this problem.\")]\n+ [Display(Name = \"I have already tried to contact the package owner about this problem.\")]\npublic bool AlreadyContactedOwner { get; set; }\n[NotEqual(ReportPackageReason.HasABugOrFailedToInstall, ErrorMessage = \"Unfortunately we cannot provide support for bugs in NuGet Packages. Please contact owner(s) for assistance.\")]\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/ReportAbuse.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/ReportAbuse.cshtml",
"diff": "@Html.ShowValidationMessagesFor(m => m.Reason)\n</div>\n<div class=\"form-group @Html.HasErrorFor(m => m.AlreadyContactedOwner)\">\n- @Html.ShowCheckboxFor(m => m.AlreadyContactedOwner)\n- @Html.ShowLabelFor(m => m.AlreadyContactedOwner)\n+ @Html.ShowSliderFor(m => m.AlreadyContactedOwner)\n@Html.ShowValidationMessagesFor(m => m.AlreadyContactedOwner)\n</div>\n<div class=\"form-group @Html.HasErrorFor(m => m.Message)\">\n@Html.ShowValidationMessagesFor(m => m.Message)\n</div>\n<div class=\"form-group @Html.HasErrorFor(m => m.CopySender)\">\n- @Html.ShowCheckboxFor(m => m.CopySender)\n- @Html.ShowLabelFor(m => m.CopySender)\n+ @Html.ShowSliderFor(m => m.CopySender)\n@Html.ShowValidationMessagesFor(m => m.CopySender)\n</div>\n<div class=\"form-group infringement-claim-requirements @Html.HasErrorFor(m => m.Signature)\">\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
[Redesign] Toggle "slider" (#4265)
|
455,794 |
26.06.2017 15:12:26
| 25,200 |
95190d3715aba00dc3ab31ab53f7862492746db7
|
Fix InvalidOperationException from profile when multiple version are set to latest
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/PackageService.cs",
"new_path": "src/NuGetGallery/Services/PackageService.cs",
"diff": "@@ -301,16 +301,18 @@ private void MergeLatestStablePackagesByOwner(User user, bool includeUnlisted, D\nforeach (var latestStablePackagesById in latestStablePackageVersions.ToList().GroupBy(p => p.PackageRegistration.Id))\n{\n+ // Use First() instead of Single() to get the latest package, in case there are multiple latest due to concurrency issue\n+ // see: https://github.com/NuGet/NuGetGallery/issues/2514\nPackage latestStablePackage;\nif (includeUnlisted)\n{\n- latestStablePackage = latestStablePackagesById.Single();\n+ latestStablePackage = latestStablePackagesById.First();\n}\nelse\n{\nlatestStablePackage =\n- latestStablePackagesById.SingleOrDefault(p => p.IsLatestStableSemVer2)\n- ?? latestStablePackagesById.SingleOrDefault(p => p.IsLatestStable);\n+ latestStablePackagesById.FirstOrDefault(p => p.IsLatestStableSemVer2)\n+ ?? latestStablePackagesById.FirstOrDefault(p => p.IsLatestStable);\n}\nmergedResults[latestStablePackage.PackageRegistration.Id] = latestStablePackage;\n@@ -339,18 +341,20 @@ private void MergeLatestPackagesByOwner(User user, bool includeUnlisted, Diction\n.Include(p => p.PackageRegistration.Owners);\n}\n+ // Use First() instead of Single() to get the latest package, in case there are multiple latest due to concurrency issue\n+ // see: https://github.com/NuGet/NuGetGallery/issues/2514\nforeach (var latestPackagesById in latestPackageVersions.ToList().GroupBy(p => p.PackageRegistration.Id))\n{\nPackage latestPackage;\nif (includeUnlisted)\n{\n- latestPackage = latestPackagesById.Single();\n+ latestPackage = latestPackagesById.First();\n}\nelse\n{\nlatestPackage =\n- latestPackagesById.SingleOrDefault(p => p.IsLatestSemVer2)\n- ?? latestPackagesById.Single(p => p.IsLatest);\n+ latestPackagesById.FirstOrDefault(p => p.IsLatestSemVer2)\n+ ?? latestPackagesById.First(p => p.IsLatest);\n}\nif (mergedResults.ContainsKey(latestPackage.PackageRegistration.Id)\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs",
"diff": "@@ -1566,6 +1566,29 @@ public void ReturnsOnlyLatestStablePackageIfNoLatestStableSemVer2Exist()\nAssert.Equal(1, packages.Count);\nAssert.Contains(latestStablePackage, packages);\n}\n+\n+ [Fact]\n+ public void ReturnsFirstIfMultiplePackagesSetToLatest()\n+ {\n+ // Verify behavior to work around IsLatest concurrency issue: https://github.com/NuGet/NuGetGallery/issues/2514\n+ var owner = new User { Username = \"someone\" };\n+ var packageRegistration = new PackageRegistration { Id = \"theId\", Owners = { owner } };\n+ var package1 = new Package { Version = \"1.0\", PackageRegistration = packageRegistration, Listed = true, IsLatest = true, IsLatestStable = true };\n+ var package2 = new Package { Version = \"2.0\", PackageRegistration = packageRegistration, Listed = true, IsLatest = true, IsLatestStable = true };\n+ packageRegistration.Packages.Add(package2);\n+ packageRegistration.Packages.Add(package1);\n+\n+ var context = GetFakeContext();\n+ context.Users.Add(owner);\n+ context.PackageRegistrations.Add(packageRegistration);\n+ context.Packages.Add(package2);\n+ context.Packages.Add(package1);\n+ var service = Get<PackageService>();\n+\n+ var packages = service.FindPackagesByOwner(owner, includeUnlisted: false);\n+ Assert.Equal(1, packages.Count());\n+ Assert.Contains(package2, packages);\n+ }\n}\npublic class TheMarkPackageListedMethod\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Fix InvalidOperationException from profile when multiple version are set to latest (#4282)
|
455,776 |
27.06.2017 14:32:41
| 25,200 |
886bc9470d9597252db5f02dadb37aeda492c76a
|
[Redesign] Manage Packages Page
|
[
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -157,19 +157,16 @@ img.package-icon {\nmargin-left: 10px;\ncolor: #000;\n}\n-.list-packages .package .package-statistics {\n+.list-packages .package .package-list {\nmargin-top: 10px;\nline-height: 20px;\ncolor: #666;\n}\n-.list-packages .package .package-statistics .package-statistics-middle {\n- padding-right: 10px;\n+.list-packages .package .package-list li + li {\npadding-left: 10px;\n- margin-right: 10px;\nmargin-left: 10px;\nborder-color: #dbdbdb;\nborder-width: 1px;\n- border-right-style: solid;\nborder-left-style: solid;\n}\n.list-packages .package .package-details {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/common-list-packages.less",
"new_path": "src/Bootstrap/less/theme/common-list-packages.less",
"diff": "}\n}\n- .package-statistics {\n+ .package-list {\nmargin-top: @padding-large-vertical;\nline-height: 20px;\ncolor: @gray-light;\n- .package-statistics-middle {\n+ li+li {\nmargin-left: @padding-small-horizontal;\n- margin-right: @padding-small-horizontal;\npadding-left: @padding-small-horizontal;\n- padding-right: @padding-small-horizontal;\nborder-left-style: solid;\n- border-right-style: solid;\nborder-width: 1px;\nborder-color: @gray-lighter;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Start/AppActivator.cs",
"new_path": "src/NuGetGallery/App_Start/AppActivator.cs",
"diff": "@@ -208,6 +208,10 @@ private static void BundlingPostStart()\n.Include(\"~/Scripts/gallery/page-display-package.js\");\nBundleTable.Bundles.Add(displayPackageScriptBundle);\n+ var managePackagesScriptBundle = new ScriptBundle(\"~/Scripts/gallery/page-manage-packages.min.js\")\n+ .Include(\"~/Scripts/gallery/page-manage-packages.js\");\n+ BundleTable.Bundles.Add(managePackagesScriptBundle);\n+\nvar aboutScriptBundle = new ScriptBundle(\"~/Scripts/gallery/page-about.min.js\")\n.Include(\"~/Scripts/gallery/page-about.js\");\nBundleTable.Bundles.Add(aboutScriptBundle);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Content/gallery/css/bootstrap-theme.css",
"new_path": "src/NuGetGallery/Content/gallery/css/bootstrap-theme.css",
"diff": "@@ -157,19 +157,16 @@ img.package-icon {\nmargin-left: 10px;\ncolor: #000;\n}\n-.list-packages .package .package-statistics {\n+.list-packages .package .package-list {\nmargin-top: 10px;\nline-height: 20px;\ncolor: #666;\n}\n-.list-packages .package .package-statistics .package-statistics-middle {\n- padding-right: 10px;\n+.list-packages .package .package-list li + li {\npadding-left: 10px;\n- margin-right: 10px;\nmargin-left: 10px;\nborder-color: #dbdbdb;\nborder-width: 1px;\n- border-right-style: solid;\nborder-left-style: solid;\n}\n.list-packages .package .package-details {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/UsersController.cs",
"new_path": "src/NuGetGallery/Controllers/UsersController.cs",
"diff": "@@ -164,11 +164,7 @@ public virtual ActionResult Packages()\n{\nvar user = GetCurrentUser();\nvar packages = _packageService.FindPackagesByOwner(user, includeUnlisted: true)\n- .Select(p => new PackageViewModel(p)\n- {\n- DownloadCount = p.PackageRegistration.DownloadCount,\n- Version = null\n- }).ToList();\n+ .Select(p => new ListPackageItemViewModel(p)).ToList();\nvar model = new ManagePackagesViewModel\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"Services\\NoLessSecureDestinationRedirectPolicy.cs\" />\n<Compile Include=\"Services\\ReflowPackageService.cs\" />\n<Compile Include=\"Services\\TelemetryService.cs\" />\n+ <Compile Include=\"ViewModels\\ManagePackagesListViewModel.cs\" />\n<Compile Include=\"ViewModels\\ScopeViewModel.cs\" />\n<Compile Include=\"ViewModels\\PackageListSearchViewModel.cs\" />\n<Compile Include=\"WebApi\\PlainTextResult.cs\" />\n<Content Include=\"Views\\Pages\\_PagesView.cshtml\" />\n<Content Include=\"Views\\Shared\\_SearchBar.cshtml\" />\n<Content Include=\"Views\\Pages\\Downloads.cshtml\" />\n+ <Content Include=\"Views\\Users\\_UserPackagesList.cshtml\" />\n</ItemGroup>\n<ItemGroup>\n<CodeAnalysisDictionary Include=\"Properties\\CodeAnalysisDictionary.xml\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/ManagePackagesViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/ManagePackagesViewModel.cs",
"diff": "@@ -6,6 +6,6 @@ namespace NuGetGallery\n{\npublic class ManagePackagesViewModel\n{\n- public IEnumerable<PackageViewModel> Packages { get; set; }\n+ public IEnumerable<ListPackageItemViewModel> Packages { get; set; }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Shared/_ListPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Shared/_ListPackage.cshtml",
"diff": "</span>\n</div>\n- <div class=\"package-statistics\">\n+ <ul class=\"package-list list-inline\">\n+ <li>\n<span>\n<i class=\"ms-Icon ms-Icon--Download\" aria-hidden=\"true\"></i>\n@Model.TotalDownloadCount.ToNuGetNumberString() total @(Model.TotalDownloadCount == 1 ? \"download\" : \"downloads\")\n</span>\n- <span class=\"package-statistics-middle\">\n+ </li>\n+ <li>\n+ <span>\n<i class=\"ms-Icon ms-Icon--History\" aria-hidden=\"true\"></i>\nlast updated <span data-datetime=\"@Model.LastUpdated.ToJavaScriptUTC()\"></span>\n</span>\n+ </li>\n+ <li>\n<span>\n<i class=\"ms-Icon ms-Icon--Flag\" aria-hidden=\"true\"></i>\nLatest version: <span class=\"text-nowrap\">@Model.FullVersion @(Model.Prerelease ? \"(prerelease)\" : \"\")</span>\n</span>\n- </div>\n+ </li>\n+ </ul>\n<div class=\"package-details\">\n@Model.ShortDescription\n}\n</div>\n}\n+\n+ @if (Model.IsOwner(User))\n+ {\n+ <ul class=\"package-list list-inline\">\n+ <li>\n+ <a href=\"@Url.EditPackage(Model.Id, Model.Version)\">\n+ <span>\n+ <i class=\"ms-Icon ms-Icon--Edit\" aria-hidden=\"true\"></i>\n+ Edit Package\n+ </span>\n+ </a>\n+ </li>\n+ <li>\n+ <a href=\"@Url.ManagePackageOwners(Model)\">\n+ <span>\n+ <i class=\"ms-Icon ms-Icon--People\" aria-hidden=\"true\"></i>\n+ Manage Owners\n+ </span>\n+ </a>\n+ </li>\n+ <li>\n+ <a href=\"@Url.DeletePackage(Model)\">\n+ <span>\n+ <i class=\"ms-Icon ms-Icon--Delete\" aria-hidden=\"true\"></i>\n+ Delete Package\n+ </span>\n+ </a>\n+ </li>\n+ </ul>\n+ }\n</div>\n</article>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/Packages.cshtml",
"new_path": "src/NuGetGallery/Views/Users/Packages.cshtml",
"diff": "@{\nViewBag.Title = \"Manage My Package\";\nViewBag.Tab = \"Packages\";\n+ Layout = \"~/Views/Shared/Gallery/Layout.cshtml\";\n}\n-<h1 class=\"page-heading\">Manage My Packages</h1>\n-\n-\n-@if (Model.Packages.Any())\n-{\n- <section id=\"published\">\n- <h1>Packages</h1>\n- <p>These packages are currently published for the world to see.</p>\n-\n- @PrintPublishedPackages(Model.Packages.Where(p => p.Listed && !p.Deleted), canEdit: true, canDelete: true)\n- </section>\n-\n- var unlistedPackages = Model.Packages.Where(p => !p.Listed && !p.Deleted);\n- if (unlistedPackages.Any())\n- {\n- <section id=\"unlisted\">\n- <h1>Unlisted Packages</h1>\n- <p>These packages are currently unlisted.</p>\n-\n- @PrintPublishedPackages(unlistedPackages, canEdit: false, canDelete: true)\n- </section>\n- }\n-\n- var deletedPackages = Model.Packages.Where(p => p.Deleted);\n- if (deletedPackages.Any())\n- {\n- <section id=\"deleted\">\n- <h1>Deleted Packages</h1>\n- <p>These packages have been deleted.</p>\n+<section role=\"main\" class=\"container main-container page-manage-packages page-package-details\">\n+ <h1>Manage Packages</h1>\n+ @{\n+ var listedPackages = Model.Packages.Where(p => p.Listed);\n+ var unlistedPackages = Model.Packages.Where(p => !p.Listed);\n- @PrintPublishedPackages(deletedPackages, canEdit: false, canDelete: false)\n- </section>\n- }\n+ @Html.Partial(\"_UserPackagesList\", new ManagePackagesListViewModel(listedPackages, \"Published\"))\n+ @Html.Partial(\"_UserPackagesList\", new ManagePackagesListViewModel(unlistedPackages, \"Unlisted\"))\n}\n-else\n-{\n- <section id=\"published\">\n- <h1>No Packages!</h1>\n- <p>\n- You don't have any packages. Maybe now is a good time to\n- <a href=\"@Url.UploadPackage()\" class=\"silverButtonBig\">upload a package</a>.\n- </p>\n</section>\n-}\n-@helper PrintPublishedPackages(IEnumerable<PackageViewModel> packages, bool canEdit, bool canDelete)\n-{\n- var totalDownloads = 0;\n- var totalPackages = packages.Count();\n-\n- if (totalPackages > 0)\n- {\n- <table class=\"sexy-table sexy-table-full\">\n- <thead>\n- <tr>\n- <th class=\"first actions\">Actions</th>\n- <th>Package</th>\n- <th>Package ID</th>\n- <th>Description</th>\n- <th class=\"last\">Downloads</th>\n-\n- </tr>\n- </thead>\n- <tbody>\n- @foreach (var package in packages)\n- {\n- <tr>\n- <td class=\"actions\">\n- @if (canEdit)\n- {\n- <a href=\"@Url.EditPackage(package.Id, package.Version)\" title=\"Edit\" class=\"table-action-link\" aria-label=\"Edit package details\">\n- <i class=\"icon-edit\"></i>\n- </a>\n- }\n- @if (canDelete)\n- {\n- <a href=\"@Url.DeletePackage(package)\" title=\"Delete\" class=\"table-action-link\" aria-label=\"Delete package\">\n- <i class=\"icon-trash\"></i>\n- </a>\n- }\n- </td>\n- <td>\n- <a href=\"@Url.Package(package)\" title=\"View package page for @package.Id\">@package.Title.Abbreviate(25)</a>\n- </td>\n- <td>@package.Id.Abbreviate(25)</td>\n- <td>\n- @if (String.IsNullOrEmpty(package.Description) || package.Description.Length < 65)\n- {\n- @package.Description\n- }\n- else\n- {\n- @package.Description.Substring(0, 65)\n- <a href=\"@Url.Package(package)\" title=\"View package page.\">...</a>\n- }\n- </td>\n-\n- <td class=\"last\">@package.DownloadCount</td>\n- </tr>\n- totalDownloads += package.DownloadCount;\n- }\n- </tbody>\n- <tfoot>\n- <tr>\n- <td colspan=\"4\">\n- @if (totalPackages > 1)\n- {\n- @(string.Format(\"You have a total of {0} packages.\", totalPackages))\n- }\n- else\n- {\n- @(\"You have one package.\")\n- }\n- </td>\n- <td class=\"total last\">\n- @totalDownloads\n- </td>\n- </tr>\n- </tfoot>\n- </table>\n- }\n- else\n- {\n- <p><b>You don't have any packages here.</b></p>\n- }\n+@section BottomScripts {\n+ @Scripts.Render(\"~/Scripts/gallery/page-manage-packages.min.js\")\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
[Redesign] Manage Packages Page (#4254)
|
455,776 |
29.06.2017 16:22:50
| 25,200 |
1032cc019112062bb7d3df8e199a015a0f9086b2
|
[Redesign] Contact Support page
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -676,14 +676,13 @@ public virtual ActionResult ReportMyPackage(string id, string version)\nreturn RedirectToAction(\"ReportAbuse\", new { id, version });\n}\n- var model = new ReportAbuseViewModel\n+ var model = new ReportMyPackageViewModel\n{\nReasonChoices = ReportMyPackageReasons,\nConfirmedUser = user.Confirmed,\nPackageId = id,\nPackageVersion = package.Version,\n- CopySender = true,\n- Signature = user.Username\n+ CopySender = true\n};\nreturn View(model);\n@@ -756,7 +755,7 @@ public virtual async Task<ActionResult> ReportAbuse(string id, string version, R\n[RequiresAccountConfirmation(\"contact support about your package\")]\n[ValidateAntiForgeryToken]\n[ValidateSpamPrevention]\n- public virtual async Task<ActionResult> ReportMyPackage(string id, string version, ReportAbuseViewModel reportForm)\n+ public virtual async Task<ActionResult> ReportMyPackage(string id, string version, ReportMyPackageViewModel reportForm)\n{\n// Html Encode the message\nreportForm.Message = System.Web.HttpUtility.HtmlEncode(reportForm.Message);\n@@ -787,10 +786,9 @@ public virtual async Task<ActionResult> ReportMyPackage(string id, string versio\n};\nvar subject = $\"Owner Support Request for '{package.PackageRegistration.Id}' version {package.Version}\";\n- var requestorEmailAddress = user != null ? user.EmailAddress : reportForm.Email;\nvar reason = EnumHelper.GetDescription(reportForm.Reason.Value);\n- await _supportRequestService.AddNewSupportRequestAsync(subject, reportForm.Message, requestorEmailAddress, reason, user, package);\n+ await _supportRequestService.AddNewSupportRequestAsync(subject, reportForm.Message, from.Address, reason, user, package);\n_messageService.ReportMyPackage(request);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"Services\\ReflowPackageService.cs\" />\n<Compile Include=\"Services\\TelemetryService.cs\" />\n<Compile Include=\"ViewModels\\ManagePackagesListViewModel.cs\" />\n+ <Compile Include=\"ViewModels\\ReportMyPackageViewModel.cs\" />\n<Compile Include=\"ViewModels\\ScopeViewModel.cs\" />\n<Compile Include=\"ViewModels\\PackageListSearchViewModel.cs\" />\n<Compile Include=\"WebApi\\PlainTextResult.cs\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/common.js",
"new_path": "src/NuGetGallery/Scripts/gallery/common.js",
"diff": "return false;\n}\n+ function initializeJQueryValidator() {\n+ // Add validator that ensures provided value is NOT equal to a specified value.\n+ $.validator.addMethod('notequal', function (value, element, params) {\n+ return value !== params;\n+ });\n+\n+ // Add unobtrusive adapters for mandatory checkboxes and notequal values\n+ $.validator.unobtrusive.adapters.addBool(\"mandatory\", \"required\");\n+ $.validator.unobtrusive.adapters.addSingleVal('notequal', 'disallowed');\n+\n+ // Source: https://stackoverflow.com/questions/18754020/bootstrap-3-with-jquery-validation-plugin\n+ // Set the JQuery validation plugin's defaults to use classes recognized by Bootstrap.\n+ $.validator.setDefaults({\n+ highlight: function (element) {\n+ $(element).closest('.form-group').addClass('has-error');\n+ },\n+ unhighlight: function (element) {\n+ $(element).closest('.form-group').removeClass('has-error');\n+ },\n+ errorElement: 'span',\n+ errorClass: 'help-block',\n+ errorPlacement: function (error, element) {\n+ if (element.parent('.input-group').length) {\n+ error.insertAfter(element.parent());\n+ } else {\n+ error.insertAfter(element);\n+ }\n+ }\n+ });\n+ }\n+\nnuget.parseNumber = function (unparsedValue) {\nunparsedValue = ('' + unparsedValue).replace(/,/g, '');\nvar parsedValue = parseInt(unparsedValue);\nwindow.nuget = nuget;\n- // Source: https://stackoverflow.com/questions/18754020/bootstrap-3-with-jquery-validation-plugin\n- // Set the JQuery validation plugin's defaults to use classes recognized by Bootstrap.\n- $.validator.setDefaults({\n- highlight: function (element) {\n- $(element).closest('.form-group').addClass('has-error');\n- },\n- unhighlight: function (element) {\n- $(element).closest('.form-group').removeClass('has-error');\n- },\n- errorElement: 'span',\n- errorClass: 'help-block',\n- errorPlacement: function (error, element) {\n- if (element.parent('.input-group').length) {\n- error.insertAfter(element.parent());\n- } else {\n- error.insertAfter(element);\n- }\n- }\n- });\n+ initializeJQueryValidator();\n})();\n$(function () {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/ReportAbuseViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/ReportAbuseViewModel.cs",
"diff": "namespace NuGetGallery\n{\n- public class ReportAbuseViewModel\n+ public class ReportAbuseViewModel : ReportMyPackageViewModel\n{\n- public static readonly string NoReasonSpecifiedText = \"Select a reason\";\n-\n- public string PackageId { get; set; }\n- public string PackageVersion { get; set; }\n-\n[Display(Name = \"I have already tried to contact the package owner about this problem.\")]\npublic bool AlreadyContactedOwner { get; set; }\n- [NotEqual(ReportPackageReason.HasABugOrFailedToInstall, ErrorMessage = \"Unfortunately we cannot provide support for bugs in NuGet Packages. Please contact owner(s) for assistance.\")]\n- [Required(ErrorMessage = \"You must select a reason for reporting the package.\")]\n- [Display(Name = \"Reason\")]\n- public ReportPackageReason? Reason { get; set; }\n-\n- [Display(Name = \"Send me a copy\")]\n- public bool CopySender { get; set; }\n-\n- [Required(ErrorMessage = \"Please enter a message.\")]\n- [AllowHtml]\n- [StringLength(4000)]\n- [Display(Name = \"Abuse Report\")]\n- public string Message { get; set; }\n-\n[Required(ErrorMessage = \"Please enter your email address.\")]\n[StringLength(4000)]\n[Display(Name = \"Your Email Address\")]\n@@ -44,10 +25,6 @@ public class ReportAbuseViewModel\n[Display(Name = \"Signature\")]\npublic string Signature { get; set; }\n- public bool ConfirmedUser { get; set; }\n-\n- public IEnumerable<ReportPackageReason> ReasonChoices { get; set; }\n-\npublic ReportAbuseViewModel()\n{\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/ReportAbuse.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/ReportAbuse.cshtml",
"diff": "}\n<section class=\"container main-container page-report-abuse\">\n- <h1 class=\"page-heading\">Report Abuse</h1>\n+ <div class=\"row report-form\">\n+ <div class=\"col-md-offset-1 col-md-10\">\n+ <h1 class=\"page-heading text-center\">Report Abuse by <a href=\"@Url.Package(@Model.PackageId, Model.PackageVersion)\">@Model.PackageId @Model.PackageVersion</a></h1>\n@ViewHelpers.AlertWarning(isAlertRole: true, htmlContent:\n@<text>\n)\n<p>\n- Please provide a detailed abuse report. Include exactly what the package did, for example if you are reporting a package with a virus or malicious code,\n- please provide evidence to support your claim! We cannot delete packages without evidence that they exhibit malicious behavior.\n+ Please provide a detailed abuse report with evidence to support your claim! We cannot delete packages without evidence that they exhibit malicious behavior.\n</p>\n@if (!Model.ConfirmedUser)\n<a href=\"@Url.LogOn(returnUrl)\">sign in now before you complete this form.</a>\n</p>\n}\n-\n- <div class=\"row report-form\">\n- <div class=\"col-sm-offset-2 col-sm-8\">\n@using (Html.BeginForm())\n{\n@Html.AntiForgeryToken()\n</div>\n<div id=\"form-field-reason\" class=\"form-group @Html.HasErrorFor(m => m.Reason)\">\n@Html.ShowLabelFor(m => m.Reason)\n+ <p>Please select the reason for contacting support about this package.</p>\n@Html.ShowEnumDropDownListFor(m => m.Reason, Model.ReasonChoices, \"<Choose a Reason>\")\n@Html.ShowValidationMessagesFor(m => m.Reason)\n</div>\n</div>\n<div class=\"form-group @Html.HasErrorFor(m => m.Message)\">\n@Html.ShowLabelFor(m => m.Message)\n- <p>In addition to selecting the reason for reporting the package, you must provide details of the problem here.</p>\n+ <p>Please provide a detailed description of the problem.</p>\n@Html.ShowTextAreaFor(m => m.Message, 10, 50)\n@Html.ShowValidationMessagesFor(m => m.Message)\n</div>\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"diff": "@@ -1018,12 +1018,10 @@ public async Task HtmlEncodesMessageContent()\nmessageService: messageService,\nhttpContext: httpContext);\ncontroller.SetCurrentUser(user);\n- var model = new ReportAbuseViewModel\n+ var model = new ReportMyPackageViewModel\n{\n- Email = \"frodo@hobbiton.example.com\",\nMessage = \"I like the cut of your jib. It's <b>bold</b>.\",\n- Reason = ReportPackageReason.IsFraudulent,\n- AlreadyContactedOwner = true,\n+ Reason = ReportPackageReason.IsFraudulent\n};\nTestUtility.SetupUrlHelper(controller, httpContext);\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
[Redesign] Contact Support page (#4259)
|
455,776 |
29.06.2017 16:51:10
| 25,200 |
bd9d20c900b7c847f575ca8fdd8f27a6f9407026
|
[Redesign] Curated Feed Management Pages
|
[
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -642,6 +642,26 @@ img.package-icon {\n.page-stats-per-package #stats-graph-svg .bartext {\nfont-size: 1em;\n}\n+.page-manage-curated-feed .package-owners .owner {\n+ margin-bottom: 10px;\n+}\n+.page-manage-curated-feed .feed-packages-list {\n+ margin-bottom: 40px;\n+}\n+.page-manage-curated-feed .feed-packages-list .package {\n+ margin-bottom: 10px;\n+}\n+.page-manage-curated-feed .feed-packages-list .package .id {\n+ float: left;\n+}\n+.page-manage-curated-feed .feed-packages-list .package .controls {\n+ float: right;\n+}\n+.page-manage-curated-feed .feed-packages-list .package .controls i {\n+ position: relative;\n+ top: 3px;\n+ margin-right: 10px;\n+}\n.page-upload .loading:after {\ndisplay: inline-block;\n/* ascii code for the ellipsis character */\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/all.less",
"new_path": "src/Bootstrap/less/theme/all.less",
"diff": "@import \"page-errors.less\";\n@import \"page-statistics-overview.less\";\n@import \"page-statistics-per-package.less\";\n+@import \"page-manage-curated-feed.less\";\n@import \"page-upload.less\";\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/Bootstrap/less/theme/page-manage-curated-feed.less",
"diff": "+.page-manage-curated-feed {\n+ .package-owners {\n+ .owner {\n+ margin-bottom: @padding-large-vertical;\n+ }\n+ }\n+\n+ .feed-packages-list {\n+ margin-bottom: 40px;\n+\n+ .package {\n+ margin-bottom: @padding-large-vertical;\n+\n+ .id {\n+ float: left;\n+ }\n+\n+ .controls {\n+ float: right;\n+\n+ i {\n+ margin-right: 10px;\n+ position: relative;\n+ top: 3px;\n+ }\n+ }\n+ }\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Content/gallery/css/bootstrap-theme.css",
"new_path": "src/NuGetGallery/Content/gallery/css/bootstrap-theme.css",
"diff": "@@ -642,6 +642,26 @@ img.package-icon {\n.page-stats-per-package #stats-graph-svg .bartext {\nfont-size: 1em;\n}\n+.page-manage-curated-feed .package-owners .owner {\n+ margin-bottom: 10px;\n+}\n+.page-manage-curated-feed .feed-packages-list {\n+ margin-bottom: 40px;\n+}\n+.page-manage-curated-feed .feed-packages-list .package {\n+ margin-bottom: 10px;\n+}\n+.page-manage-curated-feed .feed-packages-list .package .id {\n+ float: left;\n+}\n+.page-manage-curated-feed .feed-packages-list .package .controls {\n+ float: right;\n+}\n+.page-manage-curated-feed .feed-packages-list .package .controls i {\n+ position: relative;\n+ top: 3px;\n+ margin-right: 10px;\n+}\n.page-upload .loading:after {\ndisplay: inline-block;\n/* ascii code for the ellipsis character */\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/CuratedFeedsController.cs",
"new_path": "src/NuGetGallery/Controllers/CuratedFeedsController.cs",
"diff": "@@ -41,7 +41,7 @@ public virtual ActionResult CuratedFeed(string name)\nnew CuratedFeedViewModel\n{\nName = curatedFeed.Name,\n- Managers = curatedFeed.Managers.Select(user => user.Username),\n+ Managers = curatedFeed.Managers,\nIncludedPackages = curatedFeed.Packages\n.Where(cp => cp.Included)\n.Select(\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/CuratedFeedViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/CuratedFeedViewModel.cs",
"diff": "@@ -7,7 +7,7 @@ namespace NuGetGallery\npublic class CuratedFeedViewModel\n{\npublic string Name { get; set; }\n- public IEnumerable<string> Managers { get; set; }\n+ public IEnumerable<User> Managers { get; set; }\npublic IEnumerable<string> ExcludedPackages { get; set; }\npublic IEnumerable<IncludedPackage> IncludedPackages { get; set; }\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/CuratedFeedsControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/CuratedFeedsControllerFacts.cs",
"diff": "@@ -104,7 +104,7 @@ public void WillPassTheCuratedFeedManagersToTheView()\nvar viewModel = (controller.CuratedFeed(\"aName\") as ViewResult).Model as CuratedFeedViewModel;\nAssert.NotNull(viewModel);\n- Assert.Equal(controller.Fakes.User.Username, viewModel.Managers.First());\n+ Assert.Equal(controller.Fakes.User, viewModel.Managers.First());\n}\n[Fact]\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
[Redesign] Curated Feed Management Pages (#4300)
|
455,776 |
29.06.2017 16:57:09
| 25,200 |
207cb54d9327fb5aee03201441c2c190f6517f47
|
[Redesign] Email Confirmation
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/UsersController.cs",
"new_path": "src/NuGetGallery/Controllers/UsersController.cs",
"diff": "@@ -82,12 +82,7 @@ public partial class UsersController\n[Authorize]\npublic virtual ActionResult ConfirmationRequired()\n{\n- User user = GetCurrentUser();\n- var model = new ConfirmationViewModel\n- {\n- ConfirmingNewAccount = !(user.Confirmed),\n- UnconfirmedEmailAddress = user.UnconfirmedEmailAddress,\n- };\n+ var model = new ConfirmationViewModel(GetCurrentUser());\nreturn View(model);\n}\n@@ -108,16 +103,14 @@ public virtual ActionResult ConfirmationRequiredPost()\n{\n_messageService.SendNewAccountEmail(new MailAddress(user.UnconfirmedEmailAddress, user.Username), confirmationUrl);\n- model = new ConfirmationViewModel\n+ model = new ConfirmationViewModel(user)\n{\n- ConfirmingNewAccount = !(user.Confirmed),\n- UnconfirmedEmailAddress = user.UnconfirmedEmailAddress,\n- SentEmail = true,\n+ SentEmail = true\n};\n}\nelse\n{\n- model = new ConfirmationViewModel {AlreadyConfirmed = true};\n+ model = new ConfirmationViewModel(user);\n}\nreturn View(model);\n}\n@@ -275,40 +268,29 @@ public virtual async Task<ActionResult> ResetPassword(string username, string to\n[Authorize]\npublic virtual async Task<ActionResult> Confirm(string username, string token)\n{\n- // We don't want Login to have us as a return URL\n+ // We don't want Login to go to this page as a return URL\n// By having this value present in the dictionary BUT null, we don't put \"returnUrl\" on the Login link at all\nViewData[Constants.ReturnUrlViewDataKey] = null;\n+ var user = GetCurrentUser();\n+\nif (!String.Equals(username, User.Identity.Name, StringComparison.OrdinalIgnoreCase))\n{\n- return View(new ConfirmationViewModel\n+ return View(new ConfirmationViewModel(user)\n{\nWrongUsername = true,\nSuccessfulConfirmation = false,\n});\n}\n- var user = GetCurrentUser();\n-\n- var alreadyConfirmed = user.UnconfirmedEmailAddress == null;\n-\nstring existingEmail = user.EmailAddress;\n- var model = new ConfirmationViewModel\n- {\n- ConfirmingNewAccount = String.IsNullOrEmpty(existingEmail),\n- SuccessfulConfirmation = !alreadyConfirmed,\n- AlreadyConfirmed = alreadyConfirmed\n- };\n+ var model = new ConfirmationViewModel(user);\n- if (!alreadyConfirmed)\n+ if (!model.AlreadyConfirmed)\n{\n-\ntry\n{\n- if (!(await _userService.ConfirmEmailAddress(user, token)))\n- {\n- model.SuccessfulConfirmation = false;\n- }\n+ model.SuccessfulConfirmation = await _userService.ConfirmEmailAddress(user, token);\n}\ncatch (EntityException)\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Content Include=\"Views\\Authentication\\_SignIn.cshtml\" />\n<Content Include=\"Views\\Authentication\\_Register.cshtml\" />\n<Content Include=\"Views\\Users\\_UserPackagesList.cshtml\" />\n+ <Content Include=\"Views\\Users\\_ConfirmationResendForm.cshtml\" />\n</ItemGroup>\n<ItemGroup>\n<CodeAnalysisDictionary Include=\"Properties\\CodeAnalysisDictionary.xml\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/ConfirmationViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/ConfirmationViewModel.cs",
"diff": "@@ -4,10 +4,6 @@ namespace NuGetGallery\n{\npublic class ConfirmationViewModel\n{\n- public string UnconfirmedEmailAddress { get; set; }\n-\n- public bool ConfirmingNewAccount { get; set; }\n-\npublic bool SuccessfulConfirmation { get; set; }\npublic bool SentEmail { get; set; }\n@@ -16,9 +12,20 @@ public class ConfirmationViewModel\npublic bool DuplicateEmailAddress { get; set; }\n- /// <summary>\n- /// Email is already confirmed\n- /// </summary>\n- public bool AlreadyConfirmed { get; set; }\n+ public bool AlreadyConfirmed { get; }\n+\n+ public bool ConfirmingNewAccount { get; }\n+\n+ public string ConfirmedEmailAddress { get; }\n+\n+ public string UnconfirmedEmailAddress { get; }\n+\n+ public ConfirmationViewModel(User user)\n+ {\n+ AlreadyConfirmed = user.UnconfirmedEmailAddress == null;\n+ ConfirmingNewAccount = !user.Confirmed;\n+ ConfirmedEmailAddress = user.EmailAddress;\n+ UnconfirmedEmailAddress = user.UnconfirmedEmailAddress;\n+ }\n}\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
[Redesign] Email Confirmation (#4291)
|
455,743 |
29.06.2017 17:10:33
| 25,200 |
8d42e0bbb5f9a27152584aba6aa335005d8e9200
|
[Redesign] Manage Package Owners
|
[
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -448,6 +448,32 @@ img.package-icon {\nmargin-top: 75px;\nmargin-bottom: 0;\n}\n+.page-manage-owners h2 .ms-Icon {\n+ position: relative;\n+ top: -2px;\n+ font-size: .6em;\n+}\n+.page-manage-owners h2 a {\n+ color: #333;\n+ text-decoration: none;\n+}\n+.page-manage-owners h2 a:hover {\n+ text-decoration: none;\n+}\n+.page-manage-owners .current-owner {\n+ margin-bottom: 10px;\n+}\n+.page-manage-owners .current-owner .remove-owner a {\n+ color: #df001e;\n+}\n+.page-manage-owners .current-owner .remove-owner a .ms-Icon {\n+ position: relative;\n+ top: 3px;\n+}\n+.page-manage-owners .current-owner .remove-owner a:hover,\n+.page-manage-owners .current-owner .remove-owner a:active {\n+ color: #ac0017;\n+}\n.page-profile .profile-title {\nmargin-top: 50px;\nmargin-bottom: 20px;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/all.less",
"new_path": "src/Bootstrap/less/theme/all.less",
"diff": "@import \"page-forgot-password.less\";\n@import \"page-home.less\";\n@import \"page-list-packages.less\";\n+@import \"page-manage-owners.less\";\n@import \"page-profile.less\";\n@import \"page-report-abuse.less\";\n@import \"page-sign-in.less\";\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/Bootstrap/less/theme/page-manage-owners.less",
"diff": "+.page-manage-owners {\n+ h2 {\n+ .ms-Icon {\n+ font-size: 0.6em;\n+ position: relative;\n+ top: -2px;\n+ }\n+\n+ a {\n+ color: @text-color;\n+ text-decoration: none;\n+ }\n+\n+ a:hover {\n+ text-decoration: none;\n+ }\n+ }\n+\n+ .current-owner {\n+ margin-bottom: @padding-large-vertical;\n+\n+ .remove-owner a {\n+ color: @brand-danger;\n+\n+ .ms-Icon {\n+ position: relative;\n+ top: 3px;\n+ }\n+ }\n+\n+ .remove-owner a:hover, .remove-owner a:active {\n+ color: darken(@brand-danger, 10%);\n+ }\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Code/ViewHelpers.cshtml",
"new_path": "src/NuGetGallery/App_Code/ViewHelpers.cshtml",
"diff": "@helper GravatarImage(string email, string username, int size)\n{\n- var gravatarHtml = Gravatar.GetHtml(email, size, \"retro\", GravatarRating.G, attributes: new { width = size, height = size, title = username, @class = \"owner-image\" });\n- if (gravatarHtml != null && Request.IsSecureConnection)\n- {\n- gravatarHtml = new HtmlString(gravatarHtml.ToHtmlString().Replace(\"http://www.gravatar.com/\", \"https://secure.gravatar.com/\"));\n- }\n- @gravatarHtml\n+ @GravatarHelper.Image(email, size, attributes: new { width = size, height = size, title = username, @class = \"owner-image\" });\n}\n@helper WriteMeta(string name, string val) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Start/AppActivator.cs",
"new_path": "src/NuGetGallery/App_Start/AppActivator.cs",
"diff": "@@ -212,6 +212,10 @@ private static void BundlingPostStart()\n.Include(\"~/Scripts/gallery/page-manage-packages.js\");\nBundleTable.Bundles.Add(managePackagesScriptBundle);\n+ var manageOwnersScriptBundle = new ScriptBundle(\"~/Scripts/gallery/page-manage-owners.min.js\")\n+ .Include(\"~/Scripts/gallery/page-manage-owners.js\");\n+ BundleTable.Bundles.Add(manageOwnersScriptBundle);\n+\nvar aboutScriptBundle = new ScriptBundle(\"~/Scripts/gallery/page-about.min.js\")\n.Include(\"~/Scripts/gallery/page-about.js\");\nBundleTable.Bundles.Add(aboutScriptBundle);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Content/gallery/css/bootstrap-theme.css",
"new_path": "src/NuGetGallery/Content/gallery/css/bootstrap-theme.css",
"diff": "@@ -448,6 +448,32 @@ img.package-icon {\nmargin-top: 75px;\nmargin-bottom: 0;\n}\n+.page-manage-owners h2 .ms-Icon {\n+ position: relative;\n+ top: -2px;\n+ font-size: .6em;\n+}\n+.page-manage-owners h2 a {\n+ color: #333;\n+ text-decoration: none;\n+}\n+.page-manage-owners h2 a:hover {\n+ text-decoration: none;\n+}\n+.page-manage-owners .current-owner {\n+ margin-bottom: 10px;\n+}\n+.page-manage-owners .current-owner .remove-owner a {\n+ color: #df001e;\n+}\n+.page-manage-owners .current-owner .remove-owner a .ms-Icon {\n+ position: relative;\n+ top: 3px;\n+}\n+.page-manage-owners .current-owner .remove-owner a:hover,\n+.page-manage-owners .current-owner .remove-owner a:active {\n+ color: #ac0017;\n+}\n.page-profile .profile-title {\nmargin-top: 50px;\nmargin-bottom: 20px;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/JsonApiController.cs",
"new_path": "src/NuGetGallery/Controllers/JsonApiController.cs",
"diff": "using System.Web;\nusing System.Web.Mvc;\nusing NuGetGallery.Configuration;\n+using NuGetGallery.Helpers;\nusing NuGetGallery.Security;\nnamespace NuGetGallery\n@@ -55,18 +56,34 @@ public virtual ActionResult GetPackageOwners(string id, string version)\n}\nvar owners = from u in package.PackageRegistration.Owners\n- select new OwnerModel\n+ select new\n{\n- name = u.Username,\n- current = u.Username == HttpContext.User.Identity.Name,\n- pending = false\n+ Name = u.Username,\n+ EmailAddress = u.EmailAddress,\n+ Current = u.Username == HttpContext.User.Identity.Name,\n+ Pending = false\n};\nvar pending = from u in _packageOwnerRequestRepository.GetAll()\nwhere u.PackageRegistrationKey == package.PackageRegistration.Key\n- select new OwnerModel { name = u.NewOwner.Username, current = false, pending = true };\n+ select new\n+ {\n+ Name = u.NewOwner.Username,\n+ EmailAddress = u.NewOwner.EmailAddress,\n+ Current = false,\n+ Pending = true\n+ };\n- return Json(owners.Union(pending), JsonRequestBehavior.AllowGet);\n+ var result = owners.Union(pending).Select(o => new\n+ {\n+ name = o.Name,\n+ profileUrl = Url.User(o.Name),\n+ imageUrl = GravatarHelper.Url(o.EmailAddress, size: 32),\n+ current = o.Current,\n+ pending = o.Pending,\n+ });\n+\n+ return Json(result, JsonRequestBehavior.AllowGet);\n}\n[HttpGet]\n@@ -109,7 +126,14 @@ public async Task<JsonResult> AddPackageOwner(string id, string username, string\n_messageService.SendPackageOwnerRequest(model.CurrentUser, model.User, model.Package, packageUrl,\nconfirmationUrl, encodedMessage, policyMessage);\n- return Json(new { success = true, name = model.User.Username, pending = true });\n+ return Json(new\n+ {\n+ success = true,\n+ name = model.User.Username,\n+ profileUrl = Url.User(model.User.Username),\n+ imageUrl = GravatarHelper.Url(model.User.EmailAddress, size: 32),\n+ pending = true\n+ });\n}\nelse\n{\n@@ -274,13 +298,6 @@ private bool TryGetManagePackageOwnerModel(string id, string username, out Manag\nreturn true;\n}\n- public class OwnerModel\n- {\n- public string name { get; set; }\n- public bool current { get; set; }\n- public bool pending { get; set; }\n- }\n-\nprivate class ManagePackageOwnerModel\n{\npublic ManagePackageOwnerModel(string error)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<Compile Include=\"Controllers\\PagesController.cs\" />\n<Compile Include=\"Filters\\ApiScopeRequiredAttribute.cs\" />\n<Compile Include=\"GlobalSuppressions.cs\" />\n+ <Compile Include=\"Helpers\\GravatarHelper.cs\" />\n<Compile Include=\"Migrations\\201704191802404_AddIndexPackageRegistrationKeySemVer.cs\" />\n<Compile Include=\"Migrations\\201704191802404_AddIndexPackageRegistrationKeySemVer.Designer.cs\">\n<DependentUpon>201704191802404_AddIndexPackageRegistrationKeySemVer.cs</DependentUpon>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/UrlExtensions.cs",
"new_path": "src/NuGetGallery/UrlExtensions.cs",
"diff": "using System.Web;\nusing System.Web.Mvc;\nusing System.Web.Routing;\n+using Microsoft.Web.Helpers;\nnamespace NuGetGallery\n{\n@@ -214,34 +215,28 @@ public static string UploadPackage(this UrlHelper url)\npublic static string User(this UrlHelper url, User user, int page = 1, string scheme = null)\n{\n- string result;\nif (page == 1)\n{\n- result = url.Action(actionName: \"Profiles\",\n+ return url.Action(actionName: \"Profiles\",\ncontrollerName: \"Users\",\nrouteValues: new { username = user.Username.TrimEnd() },\nprotocol: scheme);\n}\nelse\n{\n- result = url.Action(actionName: \"Profiles\",\n+ return url.Action(actionName: \"Profiles\",\ncontrollerName: \"Users\",\nrouteValues: new { username = user.Username.TrimEnd(), page = page },\nprotocol: scheme);\n}\n-\n-\n- return result;\n}\n- public static string UserShowAllPackages(this UrlHelper url, string username, string scheme = null)\n+ public static string User(this UrlHelper url, string username, string scheme = null)\n{\n- string result;\n- result = url.Action(actionName: \"Profiles\",\n+ return url.Action(actionName: \"Profiles\",\ncontrollerName: \"Users\",\n- routeValues: new { username = username, showAllPackages = true },\n+ routeValues: new { username = username },\nprotocol: scheme);\n- return result;\n}\npublic static string EditPackage(this UrlHelper url, string id, string version)\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
[Redesign] Manage Package Owners (#4261)
|
455,743 |
29.06.2017 17:57:54
| 25,200 |
6a1b98bf982eaa508fbbaf918c0e0a9663e8ae12
|
[Redesign] Contact Owners Page
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -801,17 +801,18 @@ public virtual async Task<ActionResult> ReportMyPackage(string id, string versio\n[RequiresAccountConfirmation(\"contact package owners\")]\npublic virtual ActionResult ContactOwners(string id)\n{\n- var package = _packageService.FindPackageRegistrationById(id);\n+ var package = _packageService.FindPackageByIdAndVersion(id, version: null);\n- if (package == null)\n+ if (package == null || package.PackageRegistration == null)\n{\nreturn HttpNotFound();\n}\nvar model = new ContactOwnersViewModel\n{\n- PackageId = package.Id,\n- Owners = package.Owners.Where(u => u.EmailAllowed),\n+ PackageId = package.PackageRegistration.Id,\n+ ProjectUrl = package.ProjectUrl,\n+ Owners = package.PackageRegistration.Owners.Where(u => u.EmailAllowed),\nCopySender = true,\n};\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/ContactOwnersViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/ContactOwnersViewModel.cs",
"diff": "@@ -11,6 +11,8 @@ public class ContactOwnersViewModel\n{\npublic string PackageId { get; set; }\n+ public string ProjectUrl { get; set; }\n+\npublic IEnumerable<User> Owners { get; set; }\n[Display(Name = \"Send me a copy\")]\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
[Redesign] Contact Owners Page (#4241)
|
455,737 |
30.06.2017 15:29:30
| 25,200 |
55345c3000e8d406914d7c309871313b915037b0
|
[Redesign]Fix accessibility on Stats Page
Fix accessibilty of filter checkboxes on stats page. Fix an issue with empty table cells.
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/stats-dimensions.js",
"new_path": "src/NuGetGallery/Scripts/gallery/stats-dimensions.js",
"diff": "@@ -127,9 +127,9 @@ var setupHiddenRows = function (data) {\ncontent.text(item.Data);\ntempTd.append(content);\n- }\ntdArr.push(tempTd);\n}\n+ }\ntempTr.append(tdArr);\ntrArr.push(tempTr);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Statistics/_PivotTable.cshtml",
"new_path": "src/NuGetGallery/Views/Statistics/_PivotTable.cshtml",
"diff": "<div data-bind=\"attr: { id: Id }\" class=\"statistics-pivot\">\n<div class=\"statistics-sidebar col-sm-2\">\n<form id=\"dimension-form\">\n- <table class=\"table borderless stats-table-control\">\n- <tbody data-bind=\"foreach: Dimensions\">\n- <tr>\n- <td class=\"text-right\">\n- <input data-bind=\"attr: { id: 'checkbox-' + Value, value: Value, checked: IsChecked, 'aria-labelledby': DisplayName }\" class=\"dimension-checkbox\" name=\"groupby\" type=\"checkbox\">\n- </td>\n- <td class=\"text-left\">\n- <label data-bind=\"attr: { for: 'checkbox-' + Value }, text: DisplayName\" />\n- </td>\n- </tr>\n- </tbody>\n- </table>\n+ <div class=\"table borderless stats-table-control\">\n+ <div data-bind=\"foreach: Dimensions\">\n+ <div class=\"checkbox\">\n+ <label>\n+ <input data-bind=\"attr: { id: 'checkbox-' + Value, value: Value, checked: IsChecked, 'aria-labelledby': Value + '-label' }\" class=\"dimension-checkbox\" name=\"groupby\" type=\"checkbox\">\n+ <span data-bind=\"attr: { id: Value + '-label', for: 'checkbox-' + Value, 'aria-label': 'Filter By ' + DisplayName }, text: DisplayName\"></span>\n+ </label>\n+ </div>\n+ </div>\n+ </div>\n</form>\n</div>\n<div class=\"col-sm-10 text-center\" id=\"loading-placeholder\">\n<tbody data-bind=\"foreach: ShownRows\">\n<tr data-bind=\"template: { name: 'rows-template', foreach: $data}\"></tr>\n</tbody>\n- <tbody data-bind=\"foreach: HiddenRows\" class=\"collapse\" id=\"hidden-rows\">\n- </tbody>\n+ <tbody data-bind=\"foreach: HiddenRows\" class=\"collapse\" id=\"hidden-rows\"></tbody>\n</table>\n<button data-bind=\"if: $data.reportSize > 6, click: $data.SetupHiddenRows\" type=\"button\" data-toggle=\"collapse\" class=\"btn btn-link btn-expander\" data-target=\"#hidden-rows\"\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
[Redesign]Fix accessibility on Stats Page
Fix accessibilty of filter checkboxes on stats page. Fix an issue with empty table cells. (#4304)
|
455,743 |
30.06.2017 17:12:03
| 25,200 |
f9b547ee563c033ff79dd44a5b7ab60725d734b5
|
[Redesign] Reset password
|
[
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -538,6 +538,9 @@ img.package-icon {\nfont-weight: 600;\ncolor: #000;\n}\n+.page-reset-password .reset-form {\n+ margin-top: 80px;\n+}\n.page-sign-in .provider-button {\nline-height: 2em;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/all.less",
"new_path": "src/Bootstrap/less/theme/all.less",
"diff": "@import \"page-manage-owners.less\";\n@import \"page-profile.less\";\n@import \"page-report-abuse.less\";\n+@import \"page-reset-password.less\";\n@import \"page-sign-in.less\";\n@import \"page-statistics-most-downloaded.less\";\n@import \"page-errors.less\";\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/Bootstrap/less/theme/page-reset-password.less",
"diff": "+.page-reset-password {\n+ .reset-form {\n+ margin-top: 80px;\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Content/gallery/css/bootstrap-theme.css",
"new_path": "src/NuGetGallery/Content/gallery/css/bootstrap-theme.css",
"diff": "@@ -538,6 +538,9 @@ img.package-icon {\nfont-weight: 600;\ncolor: #000;\n}\n+.page-reset-password .reset-form {\n+ margin-top: 80px;\n+}\n.page-sign-in .provider-button {\nline-height: 2em;\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
[Redesign] Reset password (#4298)
|
455,743 |
30.06.2017 17:35:30
| 25,200 |
626241c4a95821907e9e90b20d8177e7bb597e4a
|
[Redesign] Updated Forgot Password Pages' Column Layouts
|
[
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -387,7 +387,7 @@ img.package-icon {\nmargin-top: 20px;\n}\n.page-forgot-password .forgot-form {\n- margin-top: 80px;\n+ margin-top: 20px;\n}\n.page-home .jumbotron h1 {\nmargin: 32px;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/page-forgot-password.less",
"new_path": "src/Bootstrap/less/theme/page-forgot-password.less",
"diff": ".page-forgot-password {\n.forgot-form {\n- margin-top: 80px;\n+ margin-top: (@padding-large-vertical * 2);\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Content/gallery/css/bootstrap-theme.css",
"new_path": "src/NuGetGallery/Content/gallery/css/bootstrap-theme.css",
"diff": "@@ -387,7 +387,7 @@ img.package-icon {\nmargin-top: 20px;\n}\n.page-forgot-password .forgot-form {\n- margin-top: 80px;\n+ margin-top: 20px;\n}\n.page-home .jumbotron h1 {\nmargin: 32px;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/ForgotPassword.cshtml",
"new_path": "src/NuGetGallery/Views/Users/ForgotPassword.cshtml",
"diff": "}\n<section role=\"main\" class=\"container main-container page-forgot-password\">\n+ <div class=\"col-sm-4 col-sm-offset-4 text-center\">\n<h1>Forgot Password</h1>\n<p>We are sorry to hear you forgot your NuGet.org account password. Enter your email below and we will send instructions to reset your password.</p>\n- <div class=\"row forgot-form\">\n- <div class=\"col-sm-offset-3 col-sm-6\">\n+ <div class=\"row forgot-form text-left\">\n+\n@using (Html.BeginForm())\n{\n@Html.AntiForgeryToken()\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/PasswordSent.cshtml",
"new_path": "src/NuGetGallery/Views/Users/PasswordSent.cshtml",
"diff": "}\n<section role=\"main\" class=\"container main-container\">\n+ <div class=\"col-sm-4 col-sm-offset-4 text-center\">\n<h1>Password Reset Sent</h1>\n<p>\nPlease check your spam folder if you don't receive the email within a\nfew minutes.\n</p>\n+ </div>\n</section>\n\\ No newline at end of file\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
[Redesign] Updated Forgot Password Pages' Column Layouts (#4253)
|
455,743 |
03.07.2017 12:16:26
| 25,200 |
8deaf7f28ef384b2a411e9b60f6d3746f5140bee
|
[Redesign] Fixed link color on package search and profile page
|
[
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -164,8 +164,8 @@ img.package-icon {\nfont-size: 15px;\nborder-bottom: 1px solid #dbdbdb;\n}\n-.list-packages .package .package-header h2 {\n- display: inline;\n+.list-packages .package .package-header .package-title {\n+ font-size: 34px;\nfont-weight: 300;\n}\n.list-packages .package .package-header .package-by {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/common-list-packages.less",
"new_path": "src/Bootstrap/less/theme/common-list-packages.less",
"diff": "font-size: 15px;\n.package-header {\n- h2 {\n- display: inline;\n+ .package-title {\n+ font-size: @font-size-h2;\nfont-weight: 300;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Content/gallery/css/bootstrap-theme.css",
"new_path": "src/NuGetGallery/Content/gallery/css/bootstrap-theme.css",
"diff": "@@ -164,8 +164,8 @@ img.package-icon {\nfont-size: 15px;\nborder-bottom: 1px solid #dbdbdb;\n}\n-.list-packages .package .package-header h2 {\n- display: inline;\n+.list-packages .package .package-header .package-title {\n+ font-size: 34px;\nfont-weight: 300;\n}\n.list-packages .package .package-header .package-by {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Shared/_ListPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Shared/_ListPackage.cshtml",
"diff": "</div>\n<div class=\"col-sm-11\">\n<div class=\"package-header\">\n- <h2><a href=\"@Url.Package(Model.Id, Model.UseVersion ? Model.Version : null)\">@Model.Title.Abbreviate(60)</a></h2>\n+ <a class=\"package-title\" href=\"@Url.Package(Model.Id, Model.UseVersion ? Model.Version : null)\">@Model.Title.Abbreviate(60)</a>\n<span class=\"package-by\">\nby:\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
[Redesign] Fixed link color on package search and profile page (#4309)
|
455,743 |
03.07.2017 12:35:24
| 25,200 |
257c61df1d6aff8b312af55cd7dfb891668dce88
|
[Redesign] Unlist/Delete Package Page
|
[
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -491,6 +491,12 @@ img.package-icon {\n.page-manage-owners .current-owner .remove-owner a:active {\ncolor: #ac0017;\n}\n+.page-delete-package h1 {\n+ margin-bottom: 0;\n+}\n+.page-delete-package #show-delete-package {\n+ color: #df001e;\n+}\n.page-profile .profile-title {\nmargin-top: 50px;\nmargin-bottom: 20px;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/all.less",
"new_path": "src/Bootstrap/less/theme/all.less",
"diff": "@import \"page-home.less\";\n@import \"page-list-packages.less\";\n@import \"page-manage-owners.less\";\n+@import \"page-delete-package.less\";\n@import \"page-profile.less\";\n@import \"page-report-abuse.less\";\n@import \"page-reset-password.less\";\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/Bootstrap/less/theme/page-delete-package.less",
"diff": "+.page-delete-package {\n+ h1 {\n+ margin-bottom: 0;\n+ }\n+\n+ #show-delete-package {\n+ color: @brand-danger;\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Content/gallery/css/bootstrap-theme.css",
"new_path": "src/NuGetGallery/Content/gallery/css/bootstrap-theme.css",
"diff": "@@ -491,6 +491,12 @@ img.package-icon {\n.page-manage-owners .current-owner .remove-owner a:active {\ncolor: #ac0017;\n}\n+.page-delete-package h1 {\n+ margin-bottom: 0;\n+}\n+.page-delete-package #show-delete-package {\n+ color: #df001e;\n+}\n.page-profile .profile-title {\nmargin-top: 50px;\nmargin-bottom: 20px;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ExtensionMethods.cs",
"new_path": "src/NuGetGallery/ExtensionMethods.cs",
"diff": "@@ -290,11 +290,16 @@ public static MailAddress ToMailAddress(this User user)\n}\npublic static HtmlString ShowLabelFor<TModel, TProperty>(this HtmlHelper<TModel> html, Expression<Func<TModel, TProperty>> expression)\n+ {\n+ return ShowLabelFor(html, expression, labelText: null);\n+ }\n+\n+ public static HtmlString ShowLabelFor<TModel, TProperty>(this HtmlHelper<TModel> html, Expression<Func<TModel, TProperty>> expression, string labelText)\n{\nvar metadata = ModelMetadata.FromLambdaExpression(expression, html.ViewData);\nvar propertyName = metadata.PropertyName.ToLower();\n- return html.LabelFor(expression, new\n+ return html.LabelFor(expression, labelText, new\n{\nid = $\"{propertyName}-label\"\n});\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/RequestModels/DeletePackagesRequest.cs",
"new_path": "src/NuGetGallery/RequestModels/DeletePackagesRequest.cs",
"diff": "@@ -27,8 +27,10 @@ public DeletePackagesRequest()\n[Display(Name = \"Signature\")]\npublic string Signature { get; set; }\n+ [Display(Name = \"Keep the package ID and version reserved\")]\npublic bool SoftDelete { get; set; }\n+ [Display(Name = \"Remove the package registration when all packages are deleted\")]\npublic bool DeleteEmptyPackageRegistration { get; set; }\npublic IEnumerable<ReportPackageReason> ReasonChoices { get; set; }\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ViewModels/PackageViewModel.cs",
"new_path": "src/NuGetGallery/ViewModels/PackageViewModel.cs",
"diff": "using System;\nusing System.Linq;\nusing System.Collections.Generic;\n-using NuGet.Versioning;\nnamespace NuGetGallery\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/Delete.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/Delete.cshtml",
"diff": "@{\nViewBag.Title = \"Delete Package\";\nViewBag.Tab = \"Packages\";\n+ Layout = \"~/Views/Shared/Gallery/Layout.cshtml\";\n}\n-<h1 class=\"page-heading\"><em>@Model.Title.Abbreviate(40) @Model.Version</em> Listing</h1>\n-@if (!User.IsAdministrator())\n-{\n- <p class=\"message\">\n- Permanently deleting packages is not supported, but you can control how they are listed.\n- </p>\n-}\n-else\n-{\n- <h2>Manage package listing</h2>\n-}\n-<p>\n- Unlisting a package hides the package from search results and all NuGet commands, but packages\n- are still available for download. For example, they can still be downloaded as dependencies to\n- other packages.\n-</p>\n+<section class=\"container main-container page-delete-package\">\n+ <div class=\"row\">\n+ <div class=\"col-md-10 col-md-offset-1\">\n+ <h1 class=\"text-center\">Manage Package Listing</h1>\n+ <div class=\"text-center ms-font-xxl\">\n+ <a href=\"@Url.Package(Model.Id, Model.Version)\">@Model.Title.Abbreviate(40)</a>\n+ </div>\n+\n+ <h2>\n+ <a href=\"#\" role=\"button\" data-toggle=\"collapse\" data-target=\"#select-version\" aria-expanded=\"true\" aria-controls=\"select-version\" id=\"show-select-version\">\n+ <i class=\"ms-Icon ms-Icon--ChevronDown\" aria-hidden=\"true\"></i>\n+ <span>Select Version</span>\n+ </a>\n+ </h2>\n-@using (Html.BeginForm(\"UpdateListed\", \"Packages\", FormMethod.Post))\n+ <div class=\"panel-collapse collapse in\" aria-expanded=\"true\" id=\"select-version\">\n+ <div class=\"form-group\">\n+ <label for=\"input-select-version\" id=\"package-version-label\">Select Package Version</label>\n+\n+ @Html.DropDownList(\"version-selection\",\n+ new SelectList(\n+ Model.PackageVersions\n+ .Where(p => p.Deleted == false)\n+ .Select(p => new\n{\n- <fieldset id=\"unlist-form\" class=\"form\">\n- <legend>Edit @Model.Title Package</legend>\n- @Html.AntiForgeryToken()\n- <div class=\"form-field\">\n- @Html.EditorFor(package => package.Listed)\n- <label for=\"Listed\" class=\"checkbox\">\n- List @Model.Title @Model.Version in search results.\n- </label>\n+ text = p.Version + (p.LatestVersionSemVer2 ? \" (latest)\" : string.Empty),\n+ url = Url.DeletePackage(p)\n+ }), \"url\", \"text\", Url.DeletePackage(Model)),\n+ new\n+ {\n+ @class = \"form-control\",\n+ title = \"Selection A Version...\",\n+ id = \"input-select-version\"\n+ })\n+ </div>\n</div>\n- <p>\n- Unchecking this box means your package cannot be installed directly and it will\n- not show up in search results.\n- </p>\n+ <h2>\n+ <a href=\"#\" role=\"button\" data-toggle=\"collapse\" data-target=\"#list-package\" aria-expanded=\"true\" aria-controls=\"list-package\" id=\"show-list-package\">\n+ <i class=\"ms-Icon ms-Icon--ChevronDown\" aria-hidden=\"true\"></i>\n+ <span>Package Version Listing</span>\n+ </a>\n+ </h2>\n- <input type=\"submit\" value=\"Save\" title=\"Save Changes\" />\n- <a class=\"cancel\" href=\"@Url.Action(\"DisplayPackage\")\" title=\"Cancel Changes and go back to package page.\">Cancel</a>\n- </fieldset>\n-}\n+ <div class=\"panel-collapse collapse in\" aria-expanded=\"true\" id=\"list-package\">\n@if (!User.IsAdministrator())\n{\n- <h2>Why can’t I delete my package?</h2>\n+ @ViewHelpers.AlertInfo(\n+ @<text>\n+ Note - Permanently deleting packages is not supported, but you can control how they are listed.\n+ </text>\n+ )\n+ <h3>Why can't I delete my package?</h3>\n<p>\n- Our policy is to only permanently delete NuGet packages that really need it, such as\n- packages that contain passwords, malicious/harmful code, etc. This policy is very similar\n- to the policies employed by other package managers such as\n- <a href=\"http://help.rubygems.org/kb/gemcutter/removing-a-published-rubygem\">Ruby Gems</a>.\n+ We only permanently delete NuGet packages in exceptional situations, such as\n+ packages that contain passwords, malicious/harmful code, etc. For more information,\n+ please refer to our <a href=\"https://docs.microsoft.com/en-us/nuget/policies/deleting-packages\">documentation</a>.\n</p>\n<p>\n- Unlisting the package will prevent users from finding it by searching the gallery and it will prevent the dependency resolver from discovering the package.\n+ Unlisting the package will prevent users from finding it by searching the gallery and it will prevent the package manager from discovering the package.\nHowever, the package will still be available for download through <a href=\"https://docs.nuget.org/docs/reference/package-restore\">NuGet Package Restore</a> so that existing projects referencing the package don't become broken.\n</p>\n<p>\nIf you need the package permanently removed, click on the <a href=\"@Url.Action(actionName: \"ReportAbuse\", controllerName: \"Packages\", routeValues: new {id = Model.Id, version = Model.Version})\" title=\"Contact Support\">Contact Support</a> link and we'll take care\n- of it for you. PLEASE ONLY DO THIS IF THERE IS AN URGENT PROBLEM WITH THE PACKAGE.\n+ of it for you. <b>PLEASE ONLY DO THIS IF THERE IS AN URGENT PROBLEM WITH THE PACKAGE.</b>\n(Passwords, malicious code, etc). Even if you remove it, it's prudent to immediately\nreset any passwords/sensitive data you accidentally pushed instead of waiting for us to delete\nthe package.\n</p>\n}\n-else\n+\n+ @using (Html.BeginForm(\"UpdateListed\", \"Packages\"))\n{\n- <div class=\"danger-zone\">\n- <h2>Danger zone</h2>\n+ @Html.AntiForgeryToken()\n+ <div class=\"form-group @Html.HasErrorFor(package => package.Listed)\">\n+ @Html.ShowCheckboxFor(package => package.Listed)\n+ @Html.ShowLabelFor(package => package.Listed, \"List \" + Model.Title + \" \" + Model.Version + \" in search results.\")\n+ @Html.ShowValidationMessagesFor(package => package.Listed)\n+\n+ <p>Unlisted packages cannot be installed directly and do not show up in search results.</p>\n+ </div>\n+\n+ <div class=\"form-group\">\n+ <input type=\"submit\" class=\"btn btn-primary form-control\" value=\"Save\" />\n+ </div>\n+ }\n+ </div>\n- <p class=\"message error\">\n+ @if (User.IsAdministrator())\n+ {\n+ <h2>\n+ <a href=\"#\" role=\"button\" data-toggle=\"collapse\" data-target=\"#delete-package\"\n+ aria-expanded=\"false\" aria-controls=\"delete-package\" id=\"show-delete-package\">\n+ <i class=\"ms-Icon ms-Icon--ChevronRight\" aria-hidden=\"true\"></i>\n+ <span>Delete Package Version</span>\n+ </a>\n+ </h2>\n+ <div class=\"list-unstyled panel-collapse collapse\" id=\"delete-package\">\n+ @ViewHelpers.AlertDanger(\n+ @<text>\n<strong>Deleting this package will make it unavailable for download and package restore.</strong><br />\nThis package version has been downloaded @Model.DownloadCount times (@Model.TotalDownloadCount downloads in total).\nDeleting it may break a large number of development teams.\nIf the package should be removed from search results but still be available for restore, consider unlisting the package instead.\n- </p>\n+ </text>\n+ )\n@using (Html.BeginForm(\"Delete\", \"Packages\", FormMethod.Post, new { id = \"delete-form\" }))\n{\n@Html.AntiForgeryToken()\n- foreach (var p in Model.DeletePackagesRequest.Packages)\n- {\n- <input type=\"hidden\" name=\"DeletePackagesRequest.Packages[]\" value=\"@p\" />\n- }\n-\n- <fieldset id=\"unlist-form\" class=\"form\">\n- <legend>Delete @Model.Title Package</legend>\n- <div id=\"form-field-reason\" class=\"form-field\">\n- @Html.LabelFor(m => m.DeletePackagesRequest.Reason)\n- @Html.EnumDropDownListFor(m => m.DeletePackagesRequest.Reason, Model.DeletePackagesRequest.ReasonChoices, \"<Choose a Reason>\")\n- @Html.ValidationMessageFor(m => m.DeletePackagesRequest.Reason, null, new {@class = \"block-validation-error\"})\n+ <div id=\"form-field-reason\" class=\"form-group @Html.HasErrorFor(m => m.DeletePackagesRequest.Reason)\">\n+ @Html.ShowLabelFor(m => m.DeletePackagesRequest.Reason)\n+ @Html.ShowEnumDropDownListFor(m => m.DeletePackagesRequest.Reason, Model.DeletePackagesRequest.ReasonChoices, \"<Choose a Reason>\")\n+ @Html.ShowValidationMessagesFor(m => m.DeletePackagesRequest.Reason)\n</div>\n- <div class=\"form-field\">\n- @Html.LabelFor(m => m.DeletePackagesRequest.Signature)\n- @Html.EditorFor(m => m.DeletePackagesRequest.Signature)\n- @Html.ValidationMessageFor(m => m.DeletePackagesRequest.Signature)\n+ <div class=\"form-group @Html.HasErrorFor(m => m.DeletePackagesRequest.Signature)\">\n+ @Html.ShowLabelFor(m => m.DeletePackagesRequest.Signature)\n+ @Html.ShowTextBoxFor(m => m.DeletePackagesRequest.Signature)\n+ @Html.ShowValidationMessagesFor(m => m.DeletePackagesRequest.Signature)\n</div>\n- <div class=\"form-field\">\n- <br/>\n- @Html.EditorFor(m => m.DeletePackagesRequest.SoftDelete)\n- <label for=\"SoftDelete\" class=\"checkbox\">\n- <strong>Keep the package id and version reserved.</strong> This will prevent new packages with the same id and version from being pushed to the gallery. It also displays \"Package was deleted\" on the package details page, helping existing users of the package to identify it was deleted.\n- </label>\n+ <div class=\"form-group\">\n+ @Html.ShowCheckboxFor(m => m.DeletePackagesRequest.SoftDelete)\n+ @Html.ShowLabelFor(m => m.DeletePackagesRequest.SoftDelete)\n+\n+ <p>\n+ This will prevent new packages with the same id and version from being pushed to the gallery. It also displays \"Package was deleted\" on the package details page, helping existing users of the package to identify it was deleted.\n+ </p>\n</div>\n- @if (User.IsAdministrator())\n- {\n- <div class=\"form-field\" id=\"DeleteEmptyPackageRegistrationContainer\" style=\"display: none;\">\n- <br/>\n- @Html.EditorFor(m => m.DeletePackagesRequest.DeleteEmptyPackageRegistration)\n- <label for=\"DeleteEmptyPackageRegistration\" class=\"checkbox\">\n- <strong>Remove the package registration when all packages are deleted.</strong> This will make the package id available again by removing the package registration. It's advised not to use this and leave the package registration intact, unless explicitly needed.\n- </label>\n+ <div class=\"form-group\" id=\"DeleteEmptyPackageRegistrationContainer\" style=\"display: none;\">\n+ @Html.ShowCheckboxFor(m => m.DeletePackagesRequest.DeleteEmptyPackageRegistration)\n+ @Html.ShowLabelFor(m => m.DeletePackagesRequest.DeleteEmptyPackageRegistration)\n+\n+ <p>\n+ This will make the package id available again by removing the package registration. It's advised not to use this and leave the package registration intact, unless explicitly needed.\n+ </p>\n</div>\n- }\n<hr />\n<p>\n@@ -124,16 +153,35 @@ else\n</p>\n<hr />\n- <input type=\"submit\" value=\"I understand the consequences, delete this package\" title=\"I understand the consequences, delete this package\" />\n- <a class=\"cancel\" href=\"@Url.Action(\"DisplayPackage\")\" title=\"Cancel changes and go back to package page.\">Cancel</a>\n- </fieldset>\n+ <div class=\"form-group\">\n+ <input type=\"submit\" class=\"btn btn-danger form-control\" value=\"I understand the consequences, delete this package\" />\n+ </div>\n}\n</div>\n}\n+ </div>\n+ </div>\n+</section>\n@section BottomScripts {\n- <script>\n+ <script type=\"text/javascript\">\n$(function () {\n+ window.nuget.configureExpanderHeading(\"select-version\");\n+ window.nuget.configureExpanderHeading(\"list-package\");\n+ window.nuget.configureExpanderHeading(\"delete-package\");\n+\n+ if (!!document.referrer) {\n+ var referrer = document.referrer.toLowerCase();\n+\n+ if (referrer.endsWith(\"/delete\") && referrer.indexOf(\"@Model.Id\".toLowerCase()) != -1) {\n+ $(\"#input-select-version\").focus();\n+ }\n+ }\n+\n+ $('#input-select-version').change(function () {\n+ window.location.href = this.value;\n+ });\n+\n$('#DeletePackagesRequest_SoftDelete').change(function(e) {\nif (!this.checked) {\n$('#DeleteEmptyPackageRegistrationContainer').show();\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
[Redesign] Unlist/Delete Package Page (#4297)
|
455,794 |
03.07.2017 13:21:07
| 25,200 |
192adc1bc4916e52da6de3e9b8bc34800e6e3fad
|
Update reflow to update IsLatest state
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/PackageDeleteService.cs",
"new_path": "src/NuGetGallery/Services/PackageDeleteService.cs",
"diff": "@@ -172,7 +172,7 @@ private async Task UpdateIsLatestAsync(IEnumerable<PackageRegistration> packageR\n// Update latest versions\nforeach (var packageRegistration in packageRegistrations)\n{\n- await _packageService.UpdateIsLatestAsync(packageRegistration, false);\n+ await _packageService.UpdateIsLatestAsync(packageRegistration, commitChanges: false);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/PackageService.cs",
"new_path": "src/NuGetGallery/Services/PackageService.cs",
"diff": "@@ -136,7 +136,7 @@ public async Task<Package> CreatePackageAsync(PackageArchiveReader nugetPackage,\nvar package = CreatePackageFromNuGetPackage(packageRegistration, nugetPackage, packageMetadata, packageStreamMetadata, user);\npackageRegistration.Packages.Add(package);\n- await UpdateIsLatestAsync(packageRegistration, false);\n+ await UpdateIsLatestAsync(packageRegistration, commitChanges: false);\nif (commitChanges)\n{\n@@ -412,7 +412,7 @@ public async Task PublishPackageAsync(Package package, bool commitChanges = true\npackage.Published = DateTime.UtcNow;\npackage.Listed = true;\n- await UpdateIsLatestAsync(package.PackageRegistration, false);\n+ await UpdateIsLatestAsync(package.PackageRegistration, commitChanges: false);\nif (commitChanges)\n{\n@@ -484,7 +484,7 @@ public async Task MarkPackageListedAsync(Package package, bool commitChanges = t\n// NOTE: LastEdited will be overwritten by a trigger defined in the migration named \"AddTriggerForPackagesLastEdited\".\npackage.LastEdited = DateTime.UtcNow;\n- await UpdateIsLatestAsync(package.PackageRegistration, false);\n+ await UpdateIsLatestAsync(package.PackageRegistration, commitChanges: false);\nawait _auditingService.SaveAuditRecordAsync(new PackageAuditRecord(package, AuditedPackageAction.List));\n@@ -512,7 +512,7 @@ public async Task MarkPackageUnlistedAsync(Package package, bool commitChanges =\nif (package.IsLatest || package.IsLatestStable)\n{\n- await UpdateIsLatestAsync(package.PackageRegistration, false);\n+ await UpdateIsLatestAsync(package.PackageRegistration, commitChanges: false);\n}\nawait _auditingService.SaveAuditRecordAsync(new PackageAuditRecord(package, AuditedPackageAction.Unlist));\n@@ -815,7 +815,7 @@ private void ValidatePackageTitle(PackageMetadata packageMetadata)\n}\n}\n- public async Task UpdateIsLatestAsync(PackageRegistration packageRegistration, bool commitChanges = true)\n+ public virtual async Task UpdateIsLatestAsync(PackageRegistration packageRegistration, bool commitChanges = true)\n{\nif (!packageRegistration.Packages.Any())\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/ReflowPackageService.cs",
"new_path": "src/NuGetGallery/Services/ReflowPackageService.cs",
"diff": "@@ -70,7 +70,10 @@ public async Task<Package> ReflowAsync(string id, string version)\npackage.LastEdited = DateTime.UtcNow;\npackage.Listed = listed;\n- // 5) Save and profit\n+ // 5) Update IsLatest so that reflow can correct concurrent updates (see Gallery #2514)\n+ await _packageService.UpdateIsLatestAsync(package.PackageRegistration, commitChanges: false);\n+\n+ // 6) Save and profit\nawait _entitiesContext.SaveChangesAsync();\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/ReflowPackageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/ReflowPackageServiceFacts.cs",
"diff": "@@ -239,6 +239,28 @@ public async Task DoesNotUpdatePackageListed(bool listed)\n// Assert\nAssert.Equal(listed, result.Listed);\n}\n+\n+ [Fact]\n+ public async Task CallsUpdateIsLatestAsync()\n+ {\n+ // Arrange\n+ var package = CreateTestPackage();\n+\n+ var packageService = SetupPackageService(package);\n+ var entitiesContext = SetupEntitiesContext();\n+ var packageFileService = SetupPackageFileService(package);\n+\n+ var service = CreateService(\n+ packageService: packageService,\n+ entitiesContext: entitiesContext,\n+ packageFileService: packageFileService);\n+\n+ // Act\n+ var result = await service.ReflowAsync(\"test\", \"1.0.0\");\n+\n+ // Assert\n+ packageService.Verify(s => s.UpdateIsLatestAsync(package.PackageRegistration, false), Times.Once);\n+ }\n}\nprivate static Package CreateTestPackage()\n@@ -313,6 +335,13 @@ private static Mock<PackageService> SetupPackageService(Package package)\n.CallBase()\n.Verifiable();\n+ packageService\n+ .Setup(s => s.UpdateIsLatestAsync(\n+ It.IsAny<PackageRegistration>(),\n+ It.IsAny<bool>()))\n+ .Returns(Task.CompletedTask)\n+ .Verifiable();\n+\nreturn packageService;\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Update reflow to update IsLatest state (#4318)
|
455,743 |
05.07.2017 16:16:14
| 25,200 |
e06938ef143feee274be2bf69af7f7eb1707c534
|
[Redesign] Improve Wording on Report Abuse Page
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/ReportAbuse.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/ReportAbuse.cshtml",
"diff": "@if (!Model.ConfirmedUser)\n{\n<p>\n- Note: if you are the owner of @Model.PackageId, please\n- <a href=\"@Url.LogOn(returnUrl)\">sign in now before you complete this form.</a>\n+ Note: If this is your package and you would like to contact support, please\n+ <a href=\"@Url.LogOn(returnUrl)\">sign in.</a>\n</p>\n}\n@using (Html.BeginForm())\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
[Redesign] Improve Wording on Report Abuse Page (#4331)
|
455,772 |
06.07.2017 14:30:31
| 25,200 |
046f6e97a012d5bcb5f8340c580c605706e46db5
|
Fix: Choosing package list view trash icon leads to failure path
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/Delete.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/Delete.cshtml",
"diff": "@@ -26,6 +26,7 @@ else\n<fieldset id=\"unlist-form\" class=\"form\">\n<legend>Edit @Model.Title Package</legend>\n@Html.AntiForgeryToken()\n+ @Html.Hidden(\"version\", @Model.Version)\n<div class=\"form-field\">\n@Html.EditorFor(package => package.Listed)\n<label for=\"Listed\" class=\"checkbox\">\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Fix: Choosing package list view trash icon leads to failure path (#4341)
|
455,743 |
06.07.2017 15:45:51
| 25,200 |
9067a317f896bf82fce851abc0e9b7baff1f03cd
|
Ensure package version is provided in form
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/Delete.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/Delete.cshtml",
"diff": "@using (Html.BeginForm(\"UpdateListed\", \"Packages\"))\n{\n@Html.AntiForgeryToken()\n+ @Html.Hidden(\"version\", @Model.Version)\n<div class=\"form-group @Html.HasErrorFor(package => package.Listed)\">\n@Html.ShowCheckboxFor(package => package.Listed)\n@Html.ShowLabelFor(package => package.Listed, \"List \" + Model.Title + \" \" + Model.Version + \" in search results.\")\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Ensure package version is provided in form (#4342)
|
455,743 |
06.07.2017 15:52:01
| 25,200 |
bad74bbc96c33f1682c6ee585b4f6fb8a0e3daf3
|
[Redesign] Add Dropdown Menu
|
[
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -64,6 +64,21 @@ body h3 {\n.navbar-seperated .seperator > span::after {\ncontent: \" | \";\n}\n+.dropdown-menu {\n+ padding-top: 20px;\n+ padding-bottom: 20px;\n+}\n+@media (max-width: 767px) {\n+ .dropdown-menu .dropdown-profile {\n+ padding-top: 5px;\n+ }\n+}\n+.dropdown-menu .dropdown-profile .dropdown-username {\n+ font-size: 20px;\n+}\n+.dropdown-menu .dropdown-profile .dropdown-email {\n+ font-size: 14px;\n+}\n.btn-search {\nheight: 36px;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap.css",
"new_path": "src/Bootstrap/dist/css/bootstrap.css",
"diff": "@@ -2708,9 +2708,6 @@ tbody.collapse.in {\n.dropdown {\nposition: relative;\n}\n-.dropdown-toggle:focus {\n- outline: 0;\n-}\n.dropdown-menu {\nposition: absolute;\ntop: 100%;\n@@ -2718,7 +2715,7 @@ tbody.collapse.in {\nz-index: 1000;\ndisplay: none;\nfloat: left;\n- min-width: 160px;\n+ min-width: 275px;\npadding: 5px 0;\nmargin: 2px 0 0;\nfont-size: 16px;\n@@ -2764,7 +2761,6 @@ tbody.collapse.in {\ncolor: #fff;\ntext-decoration: none;\nbackground-color: #337ab7;\n- outline: 0;\n}\n.dropdown-menu > .disabled > a,\n.dropdown-menu > .disabled > a:hover,\n@@ -2782,9 +2778,6 @@ tbody.collapse.in {\n.open > .dropdown-menu {\ndisplay: block;\n}\n-.open > a {\n- outline: 0;\n-}\n.dropdown-menu-right {\nright: 0;\nleft: auto;\n@@ -2798,7 +2791,7 @@ tbody.collapse.in {\npadding: 3px 20px;\nfont-size: 14px;\nline-height: 1.42857143;\n- color: #666;\n+ color: #333;\nwhite-space: nowrap;\n}\n.dropdown-backdrop {\n@@ -3841,7 +3834,11 @@ fieldset[disabled] .navbar-default .btn-link:focus {\nbackground-color: #002b4d;\n}\n@media (max-width: 767px) {\n+ .navbar-inverse .navbar-nav .open .dropdown-menu .row {\n+ margin-right: 0;\n+ }\n.navbar-inverse .navbar-nav .open .dropdown-menu > .dropdown-header {\n+ color: #e3ebf1;\nborder-color: #002b4d;\n}\n.navbar-inverse .navbar-nav .open .dropdown-menu .divider {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/dropdowns.less",
"new_path": "src/Bootstrap/less/dropdowns.less",
"diff": "position: relative;\n}\n-// Prevent the focus on the dropdown toggle when closing dropdowns\n-.dropdown-toggle:focus {\n- outline: 0;\n-}\n-\n// The dropdown menu (ul)\n.dropdown-menu {\nposition: absolute;\nz-index: @zindex-dropdown;\ndisplay: none; // none by default, but block on \"open\" of the menu\nfloat: left;\n- min-width: 160px;\n+ min-width: 275px;\npadding: 5px 0;\nmargin: 2px 0 0; // override default ul\nlist-style: none;\n&:focus {\ncolor: @dropdown-link-active-color;\ntext-decoration: none;\n- outline: 0;\nbackground-color: @dropdown-link-active-bg;\n}\n}\n> .dropdown-menu {\ndisplay: block;\n}\n-\n- // Remove the outline when :focus is triggered\n- > a {\n- outline: 0;\n- }\n}\n// Menu positioning\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/navbar.less",
"new_path": "src/Bootstrap/less/navbar.less",
"diff": "@media (max-width: @grid-float-breakpoint-max) {\n// Dropdowns get custom display\n.open .dropdown-menu {\n+ .row {\n+ margin-right: 0;\n+ }\n> .dropdown-header {\nborder-color: @navbar-inverse-border;\n+ color: @navbar-inverse-link-color;\n}\n.divider {\nbackground-color: @navbar-inverse-border;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/base.less",
"new_path": "src/Bootstrap/less/theme/base.less",
"diff": "@@ -81,6 +81,25 @@ body {\n}\n}\n+.dropdown-menu {\n+ padding-top: (@padding-large-vertical * 2);\n+ padding-bottom: (@padding-large-vertical * 2);\n+\n+ .dropdown-profile {\n+ @media (max-width: @grid-float-breakpoint-max) {\n+ padding-top: 5px;\n+ }\n+\n+ .dropdown-username {\n+ font-size: @font-size-large;\n+ }\n+\n+ .dropdown-email {\n+ font-size: @font-size-small;\n+ }\n+ }\n+}\n+\n.btn-search {\nheight: 36px;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/variables.less",
"new_path": "src/Bootstrap/less/variables.less",
"diff": "@dropdown-link-disabled-color: @gray-light;\n//** Text color for headers within dropdown menus.\n-@dropdown-header-color: @gray-light;\n+@dropdown-header-color: @gray-dark;\n//** Deprecated `@dropdown-caret-color` as of v3.1.0\n@dropdown-caret-color: #000;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Content/gallery/css/bootstrap-theme.css",
"new_path": "src/NuGetGallery/Content/gallery/css/bootstrap-theme.css",
"diff": "@@ -64,6 +64,21 @@ body h3 {\n.navbar-seperated .seperator > span::after {\ncontent: \" | \";\n}\n+.dropdown-menu {\n+ padding-top: 20px;\n+ padding-bottom: 20px;\n+}\n+@media (max-width: 767px) {\n+ .dropdown-menu .dropdown-profile {\n+ padding-top: 5px;\n+ }\n+}\n+.dropdown-menu .dropdown-profile .dropdown-username {\n+ font-size: 20px;\n+}\n+.dropdown-menu .dropdown-profile .dropdown-email {\n+ font-size: 14px;\n+}\n.btn-search {\nheight: 36px;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Content/gallery/css/bootstrap.css",
"new_path": "src/NuGetGallery/Content/gallery/css/bootstrap.css",
"diff": "@@ -2708,9 +2708,6 @@ tbody.collapse.in {\n.dropdown {\nposition: relative;\n}\n-.dropdown-toggle:focus {\n- outline: 0;\n-}\n.dropdown-menu {\nposition: absolute;\ntop: 100%;\n@@ -2718,7 +2715,7 @@ tbody.collapse.in {\nz-index: 1000;\ndisplay: none;\nfloat: left;\n- min-width: 160px;\n+ min-width: 275px;\npadding: 5px 0;\nmargin: 2px 0 0;\nfont-size: 16px;\n@@ -2764,7 +2761,6 @@ tbody.collapse.in {\ncolor: #fff;\ntext-decoration: none;\nbackground-color: #337ab7;\n- outline: 0;\n}\n.dropdown-menu > .disabled > a,\n.dropdown-menu > .disabled > a:hover,\n@@ -2782,9 +2778,6 @@ tbody.collapse.in {\n.open > .dropdown-menu {\ndisplay: block;\n}\n-.open > a {\n- outline: 0;\n-}\n.dropdown-menu-right {\nright: 0;\nleft: auto;\n@@ -2798,7 +2791,7 @@ tbody.collapse.in {\npadding: 3px 20px;\nfont-size: 14px;\nline-height: 1.42857143;\n- color: #666;\n+ color: #333;\nwhite-space: nowrap;\n}\n.dropdown-backdrop {\n@@ -3841,7 +3834,11 @@ fieldset[disabled] .navbar-default .btn-link:focus {\nbackground-color: #002b4d;\n}\n@media (max-width: 767px) {\n+ .navbar-inverse .navbar-nav .open .dropdown-menu .row {\n+ margin-right: 0;\n+ }\n.navbar-inverse .navbar-nav .open .dropdown-menu > .dropdown-header {\n+ color: #e3ebf1;\nborder-color: #002b4d;\n}\n.navbar-inverse .navbar-nav .open .dropdown-menu .divider {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/common.js",
"new_path": "src/NuGetGallery/Scripts/gallery/common.js",
"diff": "@@ -264,4 +264,9 @@ $(function () {\n$('.no-clickonce').removeClass('no-clickonce');\n}\n})();\n+\n+ // Don't close the dropdown on click events inside of the dropdown.\n+ $(document).on('click', '.dropdown-menu', function (e) {\n+ e.stopPropagation();\n+ });\n});\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/UrlExtensions.cs",
"new_path": "src/NuGetGallery/UrlExtensions.cs",
"diff": "@@ -278,6 +278,16 @@ public static string AccountSettings(this UrlHelper url)\nreturn url.Action(actionName: \"Account\", controllerName: \"Users\");\n}\n+ public static string ManageMyApiKeys(this UrlHelper url)\n+ {\n+ return url.Action(actionName: \"ApiKeys\", controllerName: \"Users\");\n+ }\n+\n+ public static string ManageMyPackages(this UrlHelper url)\n+ {\n+ return url.Action(actionName: \"Packages\", controllerName: \"Users\");\n+ }\n+\npublic static string ManagePackageOwners(this UrlHelper url, IPackageVersionModel package)\n{\nreturn url.Action(\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Shared/Gallery/Header.cshtml",
"new_path": "src/NuGetGallery/Views/Shared/Gallery/Header.cshtml",
"diff": "}\nelse\n{\n- @DisplayNavigationItem(User.Identity.Name, Url.Action(\"Account\", \"Users\", new { area = string.Empty }), bold: true, title: \"Manage user account\")\n- <li class=\"hidden-xs seperator\" role=\"presentation\"><span></span></li>\n- @DisplayNavigationItem(\"Sign out\", Url.LogOff())\n+ <li class=\"@(ViewBag.Tab == User.Identity.Name ? \"active\" : string.Empty) dropdown\"\n+ aria-selected=\"@(ViewBag.Tab == User.Identity.Name ? \"true\" : \"false\")\" role=\"presentation\">\n+ <a href=\"#\" role=\"menuitem\" id=\"account-dropdown\" class=\"dropdown-toggle\" title=\"Open profile dropdown\" data-toggle=\"dropdown\">\n+ <b><span>@User.Identity.Name</span></b>\n+ <span class=\"caret\"></span>\n+ </a>\n+ <ul class=\"dropdown-menu\" role=\"menu\" aria-labelledby=\"account-dropdown\">\n+ <li class=\"dropdown-header row\">\n+ <div class=\"col-sm-3\">\n+ @ViewHelpers.GravatarImage(CurrentUser.EmailAddress ?? CurrentUser.UnconfirmedEmailAddress, CurrentUser.Username, 50)\n+ </div>\n+ <div class=\"col-sm-9 dropdown-profile\">\n+ <span class=\"dropdown-username\">@User.Identity.Name.Abbreviate(20)</span>\n+ <br />\n+ <span class=\"dropdown-email\">@CurrentUser.EmailAddress.Abbreviate(35)</span>\n+ </div>\n+ </li>\n+ <li class=\"divider\"></li>\n+ <li role=\"presentation\"><a href=\"@Url.User(CurrentUser.Username)\" role=\"menuitem\">View Profile</a></li>\n+ <li role=\"presentation\"><a href=\"@Url.AccountSettings()\" role=\"menuitem\">Account Settings</a></li>\n+ <li role=\"presentation\"><a href=\"@Url.ManageMyApiKeys()\" role=\"menuitem\">API Keys</a></li>\n+ <li role=\"presentation\"><a href=\"@Url.ManageMyPackages()\" role=\"menuitem\">Manage Packages</a></li>\n+ <li role=\"presentation\"><a href=\"@Url.UploadPackage()\" role=\"menuitem\">Upload Package</a></li>\n+ <li class=\"divider\"></li>\n+ <li role=\"presentation\"><a href=\"@Url.LogOff()\" role=\"menuitem\">Sign Out</a></li>\n+ </ul>\n+ </li>\n}\n</ul>\n</div>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/Profiles.cshtml",
"new_path": "src/NuGetGallery/Views/Users/Profiles.cshtml",
"diff": "<div class=\"container main-container page-profile\">\n<section role=\"main\" class=\"row\">\n<aside class=\"col-md-4 col-md-push-8 profile-details\">\n- @ViewHelpers.GravatarImage(Model.EmailAddress, Model.Username, 332)\n+ @ViewHelpers.GravatarImage(Model.EmailAddress ?? Model.UnconfirmedEmailAddress, Model.Username, 332)\n<div class=\"statistics\">\n<div class=\"statistic\">\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
[Redesign] Add Dropdown Menu (#4328)
|
455,743 |
07.07.2017 13:28:06
| 25,200 |
c5b61fc4272be0da01aef78dcc7b06653e3f9236
|
Made authentication pages' layout consistent
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/ForgotPassword.cshtml",
"new_path": "src/NuGetGallery/Views/Users/ForgotPassword.cshtml",
"diff": "}\n<section role=\"main\" class=\"container main-container page-forgot-password\">\n- <div class=\"col-sm-4 col-sm-offset-4 text-center\">\n+ <div class=\"col-sm-offset-3 col-sm-6 col-md-offset-4 col-md-4 text-center\">\n<h1>Forgot Password</h1>\n<p>We are sorry to hear you forgot your NuGet.org account password. Enter your email below and we will send instructions to reset your password.</p>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/PasswordSent.cshtml",
"new_path": "src/NuGetGallery/Views/Users/PasswordSent.cshtml",
"diff": "}\n<section role=\"main\" class=\"container main-container\">\n- <div class=\"col-sm-4 col-sm-offset-4 text-center\">\n+ <div class=\"col-sm-offset-3 col-sm-6 col-md-offset-4 col-md-4 text-center\">\n<h1>Password Reset Sent</h1>\n<p>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/ResetPassword.cshtml",
"new_path": "src/NuGetGallery/Views/Users/ResetPassword.cshtml",
"diff": "</div>\n<div class=\"row\">\n- <div class=\"col-sm-offset-4 col-sm-4\">\n+ <div class=\"col-sm-offset-3 col-sm-6 col-md-offset-4 col-md-4\">\n@if (ViewData.ModelState[\"\"] != null && ViewData.ModelState[\"\"].Errors.Count > 0)\n{\n@ViewHelpers.AlertDanger(\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Made authentication pages' layout consistent (#4343)
|
455,743 |
07.07.2017 13:34:19
| 25,200 |
667fa9773db6059d2e45c8a7041b5f2b275926f1
|
[Redesign] Improve Report Abuse form
Hide Report Abuse form (instead of disabling) upon selecting "Bug" as the reason for reporting.
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/ReportAbuse.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/ReportAbuse.cshtml",
"diff": "@Html.AntiForgeryToken()\n@Html.SpamPreventionFields()\n- <div class=\"form-group @Html.HasErrorFor(m => m.Email)\">\n- @Html.ShowLabelFor(m => m.Email)\n- @Html.ShowTextBoxFor(m => m.Email)\n- @Html.ShowValidationMessagesFor(m => m.Email)\n- </div>\n<div id=\"form-field-reason\" class=\"form-group @Html.HasErrorFor(m => m.Reason)\">\n@Html.ShowLabelFor(m => m.Reason)\n<p>Please select the reason for contacting support about this package.</p>\n@Html.ShowEnumDropDownListFor(m => m.Reason, Model.ReasonChoices, \"<Choose a Reason>\")\n@Html.ShowValidationMessagesFor(m => m.Reason)\n</div>\n+\n+ <div id=\"report-abuse-form\">\n+ <div class=\"form-group @Html.HasErrorFor(m => m.Email)\">\n+ @Html.ShowLabelFor(m => m.Email)\n+ @Html.ShowTextBoxFor(m => m.Email)\n+ @Html.ShowValidationMessagesFor(m => m.Email)\n+ </div>\n<div class=\"form-group @Html.HasErrorFor(m => m.AlreadyContactedOwner)\">\n@Html.ShowSliderFor(m => m.AlreadyContactedOwner)\n@Html.ShowValidationMessagesFor(m => m.AlreadyContactedOwner)\n<div class=\"form-group\">\n<input type=\"submit\" class=\"btn btn-primary form-control\" value=\"Report\" />\n</div>\n+ </div>\n}\n</div>\n</div>\n}\nif (val === 'HasABugOrFailedToInstall') {\n- $form.find(\"input, textarea, select\").not('#form-field-reason *').attr('disabled', 'disabled');\n+ $('#report-abuse-form').hide();\n} else {\n- $form.find(\"input, textarea, select\").not('#form-field-reason').removeAttr('disabled');\n+ $('#report-abuse-form').show();\n}\nif (val == 'ViolatesALicenseIOwn') {\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
[Redesign] Improve Report Abuse form (#4334)
Hide Report Abuse form (instead of disabling) upon selecting "Bug" as the reason for reporting.
|
455,743 |
10.07.2017 13:42:23
| 25,200 |
0bd826522ad75a15721bf415a65696e89dc3bbcc
|
Add Admin link to dropdown
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Shared/Gallery/Header.cshtml",
"new_path": "src/NuGetGallery/Views/Shared/Gallery/Header.cshtml",
"diff": "<span class=\"dropdown-email\">@CurrentUser.EmailAddress.Abbreviate(35)</span>\n</div>\n</li>\n+ @if (Request.IsAuthenticated && User.IsInRole(Constants.AdminRoleName))\n+ {\n+ <li class=\"divider\"></li>\n+ <li role=\"presentation\"><a href=\"@Url.Action(\"Index\", \"Home\", new { area = \"Admin\" })\" role=\"menuitem\">Admin</a></li>\n+ }\n<li class=\"divider\"></li>\n<li role=\"presentation\"><a href=\"@Url.User(CurrentUser.Username)\" role=\"menuitem\">View Profile</a></li>\n<li role=\"presentation\"><a href=\"@Url.AccountSettings()\" role=\"menuitem\">Account Settings</a></li>\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Add Admin link to dropdown (#4350)
|
455,776 |
10.07.2017 16:18:58
| 25,200 |
9ca2d45cfb4359ca67ebc6983bfec6e947e3b4ba
|
[Redesign] Gallery changes for Status page redesign
|
[
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -884,4 +884,92 @@ img.package-icon {\n.page-stats-per-package #stats-graph-svg .bartext {\nfont-size: 1em;\n}\n+.page-status .status-general {\n+ padding: 13px;\n+ margin-bottom: 24px;\n+}\n+.page-status .status-general p {\n+ margin: 0;\n+}\n+.page-status .status-general i {\n+ vertical-align: middle;\n+}\n+.page-status .status-general .text-span {\n+ font-size: 1.5em;\n+ vertical-align: middle;\n+}\n+.page-status .status-general .last-checked {\n+ margin-left: 10px;\n+}\n+.page-status .status-up {\n+ background-color: #d1f0d5;\n+}\n+.page-status .status-down {\n+ background-color: #fde7e9;\n+}\n+.page-status .status-down .ms-Icon {\n+ color: red;\n+}\n+.page-status .status-degraded {\n+ background-color: #fff4ce;\n+}\n+.page-status .status-degraded .ms-Icon {\n+ color: orange;\n+}\n+.page-status .latest-updates + p {\n+ margin-top: 24px;\n+}\n+.page-status .ms-Icon {\n+ margin-right: 10px;\n+ font-size: 1.25em;\n+}\n+.page-status .ms-Icon--CheckMark {\n+ color: green;\n+}\n+.page-status .ms-Icon--Warning {\n+ color: yellow;\n+}\n+.page-status .ms-Icon--Cancel {\n+ color: red;\n+}\n+.page-status .table thead th:nth-child(1) {\n+ width: 50%;\n+}\n+.page-status .table thead th:nth-child(2) {\n+ width: 30%;\n+}\n+.page-status .table thead th:nth-child(3) {\n+ width: 20%;\n+}\n+.page-status .table tbody {\n+ border: none;\n+}\n+.page-status .table tbody tr td {\n+ vertical-align: middle;\n+}\n+.page-status .table tbody tr td .nonaggregate {\n+ margin-left: 20px;\n+}\n+.page-status .table tbody tr td i {\n+ vertical-align: middle;\n+}\n+.page-status .table tbody tr td span {\n+ vertical-align: middle;\n+}\n+.page-status .table tbody.aggregate tr td:first-child {\n+ font-size: 1.5em;\n+}\n+.page-status .table tbody.aggregate tr td:first-child a,\n+.page-status .table tbody.aggregate tr td:first-child a:hover,\n+.page-status .table tbody.aggregate tr td:first-child a:focus,\n+.page-status .table tbody.aggregate tr td:first-child a:active {\n+ color: #000;\n+ text-decoration: none;\n+}\n+.page-status .table tbody.aggregate tr td:first-child .ms-Icon {\n+ font-size: .75em;\n+}\n+.page-status .table tbody + tbody {\n+ border: none;\n+}\n/*# sourceMappingURL=bootstrap-theme.css.map */\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/all.less",
"new_path": "src/Bootstrap/less/theme/all.less",
"diff": "@import \"page-statistics-most-downloaded.less\";\n@import \"page-statistics-overview.less\";\n@import \"page-statistics-per-package.less\";\n+@import \"page-status.less\";\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/Bootstrap/less/theme/page-status.less",
"diff": "+.page-status {\n+ @status-general-margin-bottom: 24px;\n+\n+ .status-general {\n+ padding: 13px;\n+ margin-bottom: @status-general-margin-bottom;\n+\n+ p {\n+ margin: 0;\n+ }\n+\n+ i {\n+ vertical-align: middle;\n+ }\n+\n+ .text-span {\n+ font-size: 1.5em;\n+ vertical-align: middle;\n+ }\n+\n+ .last-checked {\n+ margin-left: 10px;\n+ }\n+ }\n+\n+ .status-up {\n+ background-color: #D1F0D5;\n+ }\n+\n+ .status-down {\n+ background-color: #FDE7E9;\n+\n+ .ms-Icon {\n+ color: red;\n+ }\n+ }\n+\n+ .status-degraded {\n+ background-color: #FFF4CE;\n+\n+ .ms-Icon {\n+ color: orange;\n+ }\n+ }\n+\n+ .latest-updates + p {\n+ margin-top: @status-general-margin-bottom;\n+ }\n+\n+ .ms-Icon {\n+ margin-right: 10px;\n+ font-size: 1.25em;\n+ }\n+\n+ .ms-Icon--CheckMark {\n+ color: green;\n+ }\n+\n+ .ms-Icon--Warning {\n+ color: yellow;\n+ }\n+\n+ .ms-Icon--Cancel {\n+ color: red;\n+ }\n+\n+ .table {\n+ thead {\n+ th:nth-child(1) {\n+ width: 50%;\n+ }\n+\n+ th:nth-child(2) {\n+ width: 30%;\n+ }\n+\n+ th:nth-child(3) {\n+ width: 20%;\n+ }\n+ }\n+\n+ tbody {\n+ border: none;\n+\n+ tr td {\n+ vertical-align: middle;\n+\n+ .nonaggregate {\n+ margin-left: 20px;\n+ }\n+\n+ i {\n+ vertical-align: middle;\n+ }\n+\n+ span {\n+ vertical-align: middle;\n+ }\n+ }\n+ }\n+\n+ tbody.aggregate tr td:first-child {\n+ font-size: 1.5em;\n+\n+ a, a:hover, a:focus, a:active {\n+ color: @text-color;\n+ text-decoration: none;\n+ }\n+\n+ .ms-Icon {\n+ font-size: .75em;\n+ }\n+ }\n+\n+ tbody + tbody {\n+ border: none;\n+ }\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Content/gallery/css/bootstrap-theme.css",
"new_path": "src/NuGetGallery/Content/gallery/css/bootstrap-theme.css",
"diff": "@@ -884,4 +884,92 @@ img.package-icon {\n.page-stats-per-package #stats-graph-svg .bartext {\nfont-size: 1em;\n}\n+.page-status .status-general {\n+ padding: 13px;\n+ margin-bottom: 24px;\n+}\n+.page-status .status-general p {\n+ margin: 0;\n+}\n+.page-status .status-general i {\n+ vertical-align: middle;\n+}\n+.page-status .status-general .text-span {\n+ font-size: 1.5em;\n+ vertical-align: middle;\n+}\n+.page-status .status-general .last-checked {\n+ margin-left: 10px;\n+}\n+.page-status .status-up {\n+ background-color: #d1f0d5;\n+}\n+.page-status .status-down {\n+ background-color: #fde7e9;\n+}\n+.page-status .status-down .ms-Icon {\n+ color: red;\n+}\n+.page-status .status-degraded {\n+ background-color: #fff4ce;\n+}\n+.page-status .status-degraded .ms-Icon {\n+ color: orange;\n+}\n+.page-status .latest-updates + p {\n+ margin-top: 24px;\n+}\n+.page-status .ms-Icon {\n+ margin-right: 10px;\n+ font-size: 1.25em;\n+}\n+.page-status .ms-Icon--CheckMark {\n+ color: green;\n+}\n+.page-status .ms-Icon--Warning {\n+ color: yellow;\n+}\n+.page-status .ms-Icon--Cancel {\n+ color: red;\n+}\n+.page-status .table thead th:nth-child(1) {\n+ width: 50%;\n+}\n+.page-status .table thead th:nth-child(2) {\n+ width: 30%;\n+}\n+.page-status .table thead th:nth-child(3) {\n+ width: 20%;\n+}\n+.page-status .table tbody {\n+ border: none;\n+}\n+.page-status .table tbody tr td {\n+ vertical-align: middle;\n+}\n+.page-status .table tbody tr td .nonaggregate {\n+ margin-left: 20px;\n+}\n+.page-status .table tbody tr td i {\n+ vertical-align: middle;\n+}\n+.page-status .table tbody tr td span {\n+ vertical-align: middle;\n+}\n+.page-status .table tbody.aggregate tr td:first-child {\n+ font-size: 1.5em;\n+}\n+.page-status .table tbody.aggregate tr td:first-child a,\n+.page-status .table tbody.aggregate tr td:first-child a:hover,\n+.page-status .table tbody.aggregate tr td:first-child a:focus,\n+.page-status .table tbody.aggregate tr td:first-child a:active {\n+ color: #000;\n+ text-decoration: none;\n+}\n+.page-status .table tbody.aggregate tr td:first-child .ms-Icon {\n+ font-size: .75em;\n+}\n+.page-status .table tbody + tbody {\n+ border: none;\n+}\n/*# sourceMappingURL=bootstrap-theme.css.map */\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/UrlExtensions.cs",
"new_path": "src/NuGetGallery/UrlExtensions.cs",
"diff": "@@ -327,6 +327,31 @@ public static string CancelUpload(this UrlHelper url)\nreturn url.Action(actionName: \"CancelUpload\", controllerName: \"Packages\");\n}\n+ public static string Downloads(this UrlHelper url)\n+ {\n+ return url.RouteUrl(RouteName.Downloads);\n+ }\n+\n+ public static string Contact(this UrlHelper url)\n+ {\n+ return url.Action(actionName: \"Contact\", controllerName: \"Pages\");\n+ }\n+\n+ public static string Terms(this UrlHelper url)\n+ {\n+ return url.Action(actionName: \"Terms\", controllerName: \"Pages\");\n+ }\n+\n+ public static string Privacy(this UrlHelper url)\n+ {\n+ return url.Action(actionName: \"Privacy\", controllerName: \"Pages\");\n+ }\n+\n+ public static string About(this UrlHelper url)\n+ {\n+ return url.Action(actionName: \"About\", controllerName: \"Pages\");\n+ }\n+\nprivate static UriBuilder GetCanonicalUrl(UrlHelper url)\n{\nUriBuilder builder = new UriBuilder(url.RequestContext.HttpContext.Request.Url);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Shared/Gallery/Footer.cshtml",
"new_path": "src/NuGetGallery/Views/Shared/Gallery/Footer.cshtml",
"diff": "<div class=\"container\">\n<div class=\"row\">\n<div class=\"col-sm-4\">\n- <h4><a href=\"@Href(\"~/policies/Contact\")\">Contact</a></h4>\n+ <h4><a href=\"@Url.Contact()\">Contact</a></h4>\n<p>\nGot questions about NuGet or the NuGet Gallery?\n</p>\n<div class=\"col-md-11 footer-release-info\">\n<p>\n© @DateTime.UtcNow.Year .NET Foundation -\n- <a href=\"@Url.Action(\"About\", \"Pages\")\">About</a> -\n- <a href=\"@Url.Action(\"Terms\", \"Pages\")\">Terms of Use</a> -\n- <a href=\"@Url.Action(\"Privacy\", \"Pages\")\">Privacy Policy</a>\n+ <a href=\"@Url.About()\">About</a> -\n+ <a href=\"@Url.Terms()\">Terms of Use</a> -\n+ <a href=\"@Url.Privacy()\">Privacy Policy</a>\n<br />\nDeployed using <a href=\"https://octopus.com/\" target=\"referral\">Octopus Deploy</a>\n</p>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Shared/Gallery/Header.cshtml",
"new_path": "src/NuGetGallery/Views/Shared/Gallery/Header.cshtml",
"diff": "@DisplayNavigationItem(\"Admin\", Url.Action(\"Index\", \"Home\", new { area = \"Admin\" }))\n}\n@DisplayNavigationItem(\"Documentation\", \"https://docs.microsoft.com/en-us/nuget/\")\n- @DisplayNavigationItem(\"Downloads\", Url.RouteUrl(RouteName.Downloads))\n+ @DisplayNavigationItem(\"Downloads\", Url.Downloads())\n@DisplayNavigationItem(\"Blog\", \"http://blog.nuget.org/\")\n</ul>\n+ @if (ViewBag.ShowUserInNavBar != false)\n+ {\n<ul class=\"nav navbar-nav navbar-right navbar-seperated\" role=\"menu\">\n@if (!User.Identity.IsAuthenticated)\n{\n</li>\n}\n</ul>\n+ }\n</div>\n</div>\n</div>\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
[Redesign] Gallery changes for Status page redesign (#4351)
|
455,737 |
11.07.2017 13:33:40
| 25,200 |
57b09128292c3317677716b14df2af4739a13546
|
Enable drag and drop file upload.
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Scripts/gallery/async-file-upload.js",
"new_path": "src/NuGetGallery/Scripts/gallery/async-file-upload.js",
"diff": "@@ -6,7 +6,8 @@ var AsyncFileUploadManager = new function () {\nvar _submitVerifyUrl;\nvar _isWebkitBrowser = false; // $.browser.webkit is not longer supported on jQuery\nvar _iframeId = '__fileUploadFrame';\n- var _formId;\n+ var _uploadFormId;\n+ var _uploadFormData;\nvar _pollingInterval = 250; // in ms\nvar _pingUrl;\nvar _failureCount;\n@@ -14,11 +15,46 @@ var AsyncFileUploadManager = new function () {\nthis.init = function (pingUrl, formId, jQueryUrl, actionUrl, cancelUrl, submitVerifyUrl) {\n_pingUrl = pingUrl;\n- _formId = formId;\n+ _uploadFormId = formId;\n_actionUrl = actionUrl;\n_cancelUrl = cancelUrl;\n_submitVerifyUrl = submitVerifyUrl;\n+ $('#file-select-feedback').on('dragenter', function (e) {\n+ e.preventDefault();\n+ e.stopPropagation();\n+\n+ $(this).removeAttr('readonly');\n+ });\n+\n+ $('#file-select-feedback').on('dragleave', function (e) {\n+ e.preventDefault();\n+ e.stopPropagation();\n+\n+ $(this).attr('readonly', 'readonly');\n+ });\n+\n+\n+ $('#file-select-feedback').on('dragover', function (e) {\n+ e.preventDefault();\n+ e.stopPropagation();\n+ });\n+\n+\n+ $('#file-select-feedback').on('drop', function (e) {\n+ e.preventDefault();\n+ e.stopPropagation();\n+ $(this).attr('readonly', 'readonly');\n+\n+ clearErrors();\n+ var droppedFile = e.originalEvent.dataTransfer.files[0];\n+ $('#file-select-feedback').attr('value', droppedFile.name);\n+\n+ prepareUploadFormData();\n+ _uploadFormData.set(\"UploadFile\", droppedFile);\n+ cancelUploadAsync(startUploadAsync, startUploadAsync);\n+ });\n+\n$('#file-select-feedback').on('click', function () {\n$('#input-select-file').click();\n})\n@@ -29,11 +65,12 @@ var AsyncFileUploadManager = new function () {\nif (fileName.length > 0) {\n$('#file-select-feedback').attr('value', fileName);\n+ prepareUploadFormData();\n// Cancel any ongoing upload, and then start the new upload.\n// If the cancel fails, still try to upload the new one.\ncancelUploadAsync(startUploadAsync, startUploadAsync);\n} else {\n- $('#file-select-feedback').attr('value', 'Browse to select a package file...');\n+ resetFileSelectFeedback();\n}\n})\n@@ -42,6 +79,15 @@ var AsyncFileUploadManager = new function () {\n}\n}\n+ function resetFileSelectFeedback() {\n+ $('#file-select-feedback').attr('value', 'Browse or Drop files to select a package...');\n+ }\n+\n+ function prepareUploadFormData() {\n+ var formData = new FormData($('#' + _uploadFormId)[0]);\n+ _uploadFormData = formData;\n+ }\n+\nfunction startUploadAsync(callback, error) {\n// Shortcut the upload if the nupkg input doesn't have a value\nif ($('#input-select-file').val() == null) {\n@@ -54,7 +100,7 @@ var AsyncFileUploadManager = new function () {\nurl: _actionUrl,\ntype: 'POST',\n- data: new FormData($('#' + _formId)[0]),\n+ data: _uploadFormData,\ncache: false,\ncontentType: false,\n@@ -182,7 +228,7 @@ var AsyncFileUploadManager = new function () {\n$('#verify-cancel-button').addClass('.loading');\n$('#verify-submit-button').attr('disabled', 'disabled');\n$('#input-select-file').val(\"\");\n- $('#file-select-feedback').attr('value', 'Browse to select a package file...');\n+ resetFileSelectFeedback();\ncancelUploadAsync();\n});\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Enable drag and drop file upload. (#4366)
|
455,743 |
11.07.2017 15:32:23
| 25,200 |
85018f9deb7873515bbd2b782bcd8e575bb5155a
|
Fixed issues found in PM pass
|
[
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -295,6 +295,9 @@ img.package-icon {\nmargin-left: 0;\n}\n}\n+.list-packages .package .manage-package {\n+ margin-bottom: 0;\n+}\n.list-packages .package .package-details {\nmargin-top: 10px;\nline-height: 20px;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap.css",
"new_path": "src/Bootstrap/dist/css/bootstrap.css",
"diff": "@@ -2742,7 +2742,7 @@ tbody.collapse.in {\n}\n.dropdown-menu > li > a {\ndisplay: block;\n- padding: 3px 20px;\n+ padding: 5px 20px;\nclear: both;\nfont-weight: normal;\nline-height: 1.42857143;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/dropdowns.less",
"new_path": "src/Bootstrap/less/dropdowns.less",
"diff": "// Links within the dropdown menu\n> li > a {\ndisplay: block;\n- padding: 3px 20px;\n+ padding: 5px 20px;\nclear: both;\nfont-weight: normal;\nline-height: @line-height-base;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/common-list-packages.less",
"new_path": "src/Bootstrap/less/theme/common-list-packages.less",
"diff": "}\n}\n+ .manage-package {\n+ margin-bottom: 0px;\n+ }\n+\n.package-details {\nmargin-top: @padding-large-vertical;\ncolor: @text-color;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/App_Code/ViewHelpers.cshtml",
"new_path": "src/NuGetGallery/App_Code/ViewHelpers.cshtml",
"diff": "@helper GravatarImage(string email, string username, int size)\n{\n- @GravatarHelper.Image(email, size, attributes: new { width = size, height = size, title = username, @class = \"owner-image\" });\n+ @GravatarImage(email, username, size, responsive: false);\n+}\n+\n+@helper GravatarImage(string email, string username, int size, bool responsive)\n+{\n+ var classAttribute = responsive ? \"owner-image img-responsive\" : \"owner-image\";\n+\n+ @GravatarHelper.Image(email, size, attributes: new { width = size, height = size, title = username, @class = classAttribute });\n}\n@helper WriteMeta(string name, string val) {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Content/gallery/css/bootstrap-theme.css",
"new_path": "src/NuGetGallery/Content/gallery/css/bootstrap-theme.css",
"diff": "@@ -295,6 +295,9 @@ img.package-icon {\nmargin-left: 0;\n}\n}\n+.list-packages .package .manage-package {\n+ margin-bottom: 0;\n+}\n.list-packages .package .package-details {\nmargin-top: 10px;\nline-height: 20px;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Content/gallery/css/bootstrap.css",
"new_path": "src/NuGetGallery/Content/gallery/css/bootstrap.css",
"diff": "@@ -2742,7 +2742,7 @@ tbody.collapse.in {\n}\n.dropdown-menu > li > a {\ndisplay: block;\n- padding: 3px 20px;\n+ padding: 5px 20px;\nclear: both;\nfont-weight: normal;\nline-height: 1.42857143;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Packages/ReportAbuse.cshtml",
"new_path": "src/NuGetGallery/Views/Packages/ReportAbuse.cshtml",
"diff": "@Html.ShowValidationMessagesFor(m => m.Email)\n</div>\n<div class=\"form-group @Html.HasErrorFor(m => m.AlreadyContactedOwner)\">\n- @Html.ShowSliderFor(m => m.AlreadyContactedOwner)\n+ @Html.ShowCheckboxFor(m => m.AlreadyContactedOwner)\n+ @Html.ShowLabelFor(m => m.AlreadyContactedOwner)\n@Html.ShowValidationMessagesFor(m => m.AlreadyContactedOwner)\n</div>\n<div class=\"form-group @Html.HasErrorFor(m => m.Message)\">\n@Html.ShowValidationMessagesFor(m => m.Message)\n</div>\n<div class=\"form-group @Html.HasErrorFor(m => m.CopySender)\">\n- @Html.ShowSliderFor(m => m.CopySender)\n+ @Html.ShowCheckboxFor(m => m.CopySender)\n+ @Html.ShowLabelFor(m => m.CopySender)\n@Html.ShowValidationMessagesFor(m => m.CopySender)\n</div>\n<div class=\"form-group infringement-claim-requirements @Html.HasErrorFor(m => m.Signature)\">\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Shared/Gallery/Header.cshtml",
"new_path": "src/NuGetGallery/Views/Shared/Gallery/Header.cshtml",
"diff": "@DisplayNavigationItem(\"Admin\", Url.Action(\"Index\", \"Home\", new { area = \"Admin\" }))\n}\n@DisplayNavigationItem(\"Documentation\", \"https://docs.microsoft.com/en-us/nuget/\")\n- @DisplayNavigationItem(\"Downloads\", Url.Downloads())\n+ @DisplayNavigationItem(\"Downloads\", Url.RouteUrl(RouteName.Downloads))\n@DisplayNavigationItem(\"Blog\", \"http://blog.nuget.org/\")\n</ul>\n- @if (ViewBag.ShowUserInNavBar != false)\n- {\n<ul class=\"nav navbar-nav navbar-right navbar-seperated\" role=\"menu\">\n@if (!User.Identity.IsAuthenticated)\n{\n<li role=\"presentation\"><a href=\"@Url.User(CurrentUser.Username)\" role=\"menuitem\">View Profile</a></li>\n<li role=\"presentation\"><a href=\"@Url.AccountSettings()\" role=\"menuitem\">Account Settings</a></li>\n<li role=\"presentation\"><a href=\"@Url.ManageMyApiKeys()\" role=\"menuitem\">API Keys</a></li>\n+ <li class=\"divider\"></li>\n<li role=\"presentation\"><a href=\"@Url.ManageMyPackages()\" role=\"menuitem\">Manage Packages</a></li>\n<li role=\"presentation\"><a href=\"@Url.UploadPackage()\" role=\"menuitem\">Upload Package</a></li>\n<li class=\"divider\"></li>\n</li>\n}\n</ul>\n- }\n</div>\n</div>\n</div>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Shared/_ListPackage.cshtml",
"new_path": "src/NuGetGallery/Views/Shared/_ListPackage.cshtml",
"diff": "@if (Model.IsOwner(User))\n{\n- <ul class=\"package-list\">\n+ <ul class=\"package-list manage-package\">\n<li>\n<a href=\"@Url.EditPackage(Model.Id, Model.Version)\" class=\"icon-link\">\n<i class=\"ms-Icon ms-Icon--Edit\" aria-hidden=\"true\"></i>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/Profiles.cshtml",
"new_path": "src/NuGetGallery/Views/Users/Profiles.cshtml",
"diff": "<div class=\"container main-container page-profile\">\n<section role=\"main\" class=\"row\">\n- <aside class=\"col-md-4 col-md-push-8 profile-details\">\n- @ViewHelpers.GravatarImage(Model.EmailAddress ?? Model.UnconfirmedEmailAddress, Model.Username, 332)\n+ <aside class=\"col-md-3 col-md-push-9 profile-details\">\n+ @ViewHelpers.GravatarImage(Model.EmailAddress ?? Model.UnconfirmedEmailAddress, Model.Username, 332, responsive: true)\n<div class=\"statistics\">\n<div class=\"statistic\">\n</div>\n</div>\n</aside>\n- <article class=\"col-md-8 col-md-pull-4\">\n+ <article class=\"col-md-9 col-md-pull-3\">\n<div class=\"profile-title\">\n<h1>@Model.Username</h1>\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Fixed issues found in PM pass (#4367)
|
455,743 |
12.07.2017 08:39:53
| 25,200 |
517c34484914af7be3bf6a4f4bd5771f417269c4
|
[Redeisgn] Fixed display issues caused by long emails
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Constants.cs",
"new_path": "src/NuGetGallery/Constants.cs",
"diff": "@@ -15,6 +15,8 @@ public static class Constants\npublic const int ColumnsAuthenticationSm = 6;\npublic const int ColumnsAuthenticationMd = 4;\n+ public const int ColumnsWideAuthenticationSm = 8;\n+ public const int ColumnsWideAuthenticationMd = 6;\npublic const int ColumnsFormMd = 10;\n/// <summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Shared/Gallery/Header.cshtml",
"new_path": "src/NuGetGallery/Views/Shared/Gallery/Header.cshtml",
"diff": "<div class=\"col-sm-9 dropdown-profile\">\n<span class=\"dropdown-username\">@User.Identity.Name.Abbreviate(20)</span>\n<br />\n- <span class=\"dropdown-email\">@CurrentUser.EmailAddress.Abbreviate(35)</span>\n+ <span class=\"dropdown-email\">@CurrentUser.EmailAddress.Abbreviate(25)</span>\n</div>\n</li>\n@if (Request.IsAuthenticated && User.IsInRole(Constants.AdminRoleName))\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/Confirm.cshtml",
"new_path": "src/NuGetGallery/Views/Users/Confirm.cshtml",
"diff": "@{\nvar titleString = Model.ConfirmingNewAccount ? \"Account\" : \"Email\";\nViewBag.Title = \"Confirm Your \" + titleString;\n- ViewBag.SmPageColumns = Constants.ColumnsAuthenticationSm;\n- ViewBag.MdPageColumns = Constants.ColumnsAuthenticationMd;\n+ ViewBag.SmPageColumns = Constants.ColumnsWideAuthenticationSm;\n+ ViewBag.MdPageColumns = Constants.ColumnsWideAuthenticationMd;\nLayout = \"~/Views/Shared/Gallery/Layout.cshtml\";\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
[Redeisgn] Fixed display issues caused by long emails (#4372)
|
455,737 |
14.07.2017 14:47:48
| 25,200 |
1b5b8f2d506eedb31b8f19b332c7f9edc26437af
|
Switch loading spinner. svg -> div with border.
|
[
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"new_path": "src/Bootstrap/dist/css/bootstrap-theme.css",
"diff": "@@ -888,6 +888,51 @@ img.package-icon {\n.page-stats-per-package #hidden-rows {\nborder-top: none;\n}\n+.page-stats-per-package .loader {\n+ width: 120px;\n+ height: 120px;\n+ margin: 0 auto;\n+ border: 16px solid #f3f3f3;\n+ /* Light grey */\n+ border-top: 16px solid #3498db;\n+ /* Blue */\n+ border-radius: 50%;\n+ -webkit-animation: spin 2s linear infinite;\n+ -o-animation: spin 2s linear infinite;\n+ animation: spin 2s linear infinite;\n+}\n+@-webkit-keyframes spin {\n+ 0% {\n+ -webkit-transform: rotate(0deg);\n+ transform: rotate(0deg);\n+ }\n+ 100% {\n+ -webkit-transform: rotate(360deg);\n+ transform: rotate(360deg);\n+ }\n+}\n+@-o-keyframes spin {\n+ 0% {\n+ -o-transform: rotate(0deg);\n+ transform: rotate(0deg);\n+ }\n+ 100% {\n+ -o-transform: rotate(360deg);\n+ transform: rotate(360deg);\n+ }\n+}\n+@keyframes spin {\n+ 0% {\n+ -webkit-transform: rotate(0deg);\n+ -o-transform: rotate(0deg);\n+ transform: rotate(0deg);\n+ }\n+ 100% {\n+ -webkit-transform: rotate(360deg);\n+ -o-transform: rotate(360deg);\n+ transform: rotate(360deg);\n+ }\n+}\n.page-stats-per-package #loading-placeholder {\ndisplay: none;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Bootstrap/less/theme/page-statistics-per-package.less",
"new_path": "src/Bootstrap/less/theme/page-statistics-per-package.less",
"diff": "border-top: none;\n}\n+ .loader {\n+ margin: 0 auto;\n+ border: 16px solid #f3f3f3; /* Light grey */\n+ border-top: 16px solid #3498db; /* Blue */\n+ border-radius: 50%;\n+ width: 120px;\n+ height: 120px;\n+ animation: spin 2s linear infinite;\n+ }\n+\n+ @keyframes spin {\n+ 0% { transform: rotate(0deg); }\n+ 100% { transform: rotate(360deg); }\n+ }\n+\n#loading-placeholder {\ndisplay: none;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Content/gallery/css/bootstrap-theme.css",
"new_path": "src/NuGetGallery/Content/gallery/css/bootstrap-theme.css",
"diff": "@@ -888,6 +888,51 @@ img.package-icon {\n.page-stats-per-package #hidden-rows {\nborder-top: none;\n}\n+.page-stats-per-package .loader {\n+ width: 120px;\n+ height: 120px;\n+ margin: 0 auto;\n+ border: 16px solid #f3f3f3;\n+ /* Light grey */\n+ border-top: 16px solid #3498db;\n+ /* Blue */\n+ border-radius: 50%;\n+ -webkit-animation: spin 2s linear infinite;\n+ -o-animation: spin 2s linear infinite;\n+ animation: spin 2s linear infinite;\n+}\n+@-webkit-keyframes spin {\n+ 0% {\n+ -webkit-transform: rotate(0deg);\n+ transform: rotate(0deg);\n+ }\n+ 100% {\n+ -webkit-transform: rotate(360deg);\n+ transform: rotate(360deg);\n+ }\n+}\n+@-o-keyframes spin {\n+ 0% {\n+ -o-transform: rotate(0deg);\n+ transform: rotate(0deg);\n+ }\n+ 100% {\n+ -o-transform: rotate(360deg);\n+ transform: rotate(360deg);\n+ }\n+}\n+@keyframes spin {\n+ 0% {\n+ -webkit-transform: rotate(0deg);\n+ -o-transform: rotate(0deg);\n+ transform: rotate(0deg);\n+ }\n+ 100% {\n+ -webkit-transform: rotate(360deg);\n+ -o-transform: rotate(360deg);\n+ transform: rotate(360deg);\n+ }\n+}\n.page-stats-per-package #loading-placeholder {\ndisplay: none;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Statistics/_PivotTable.cshtml",
"new_path": "src/NuGetGallery/Views/Statistics/_PivotTable.cshtml",
"diff": "</form>\n</div>\n<div class=\"col-sm-10 text-center\" id=\"loading-placeholder\">\n- <svg width='200px' height='200px' xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 100 100\" preserveAspectRatio=\"xMidYMid\" class=\"uil-default\">\n- <rect x=\"0\" y=\"0\" width=\"100\" height=\"100\" fill=\"none\" class=\"bk\">\n- </rect>\n- <rect x='45' y='45' width='10' height='10' rx='10' ry='10' fill='#004880' transform='rotate(0 50 50) translate(0 -30)'>\n- <animate attributeName='opacity' from='1' to='0' dur='1s' begin='-1s' repeatCount='indefinite' />\n- </rect>\n- <rect x='45' y='45' width='10' height='10' rx='10' ry='10' fill='#004880' transform='rotate(30 50 50) translate(0 -30)'>\n- <animate attributeName='opacity' from='1' to='0' dur='1s' begin='-0.9166666666666666s' repeatCount='indefinite' />\n- </rect>\n- <rect x='45' y='45' width='10' height='10' rx='10' ry='10' fill='#004880' transform='rotate(60 50 50) translate(0 -30)'>\n- <animate attributeName='opacity' from='1' to='0' dur='1s' begin='-0.8333333333333334s' repeatCount='indefinite' />\n- </rect>\n- <rect x='45' y='45' width='10' height='10' rx='10' ry='10' fill='#004880' transform='rotate(90 50 50) translate(0 -30)'>\n- <animate attributeName='opacity' from='1' to='0' dur='1s' begin='-0.75s' repeatCount='indefinite' />\n- </rect>\n- <rect x='45' y='45' width='10' height='10' rx='10' ry='10' fill='#004880' transform='rotate(120 50 50) translate(0 -30)'>\n- <animate attributeName='opacity' from='1' to='0' dur='1s' begin='-0.6666666666666666s' repeatCount='indefinite' />\n- </rect>\n- <rect x='45' y='45' width='10' height='10' rx='10' ry='10' fill='#004880' transform='rotate(150 50 50) translate(0 -30)'>\n- <animate attributeName='opacity' from='1' to='0' dur='1s' begin='-0.5833333333333334s' repeatCount='indefinite' />\n- </rect>\n- <rect x='45' y='45' width='10' height='10' rx='10' ry='10' fill='#004880' transform='rotate(180 50 50) translate(0 -30)'>\n- <animate attributeName='opacity' from='1' to='0' dur='1s' begin='-0.5s' repeatCount='indefinite' />\n- </rect>\n- <rect x='45' y='45' width='10' height='10' rx='10' ry='10' fill='#004880' transform='rotate(210 50 50) translate(0 -30)'>\n- <animate attributeName='opacity' from='1' to='0' dur='1s' begin='-0.4166666666666667s' repeatCount='indefinite' />\n- </rect>\n- <rect x='45' y='45' width='10' height='10' rx='10' ry='10' fill='#004880' transform='rotate(240 50 50) translate(0 -30)'>\n- <animate attributeName='opacity' from='1' to='0' dur='1s' begin='-0.3333333333333333s' repeatCount='indefinite' />\n- </rect>\n- <rect x='45' y='45' width='10' height='10' rx='10' ry='10' fill='#004880' transform='rotate(270 50 50) translate(0 -30)'>\n- <animate attributeName='opacity' from='1' to='0' dur='1s' begin='-0.25s' repeatCount='indefinite' />\n- </rect>\n- <rect x='45' y='45' width='10' height='10' rx='10' ry='10' fill='#004880' transform='rotate(300 50 50) translate(0 -30)'>\n- <animate attributeName='opacity' from='1' to='0' dur='1s' begin='-0.16666666666666666s' repeatCount='indefinite' />\n- </rect>\n- <rect x='45' y='45' width='10' height='10' rx='10' ry='10' fill='#004880' transform='rotate(330 50 50) translate(0 -30)'>\n- <animate attributeName='opacity' from='1' to='0' dur='1s' begin='-0.08333333333333333s' repeatCount='indefinite' />\n- </rect>\n- </svg>\n+ <div class=\"loader\"></div>\n</div>\n<div class=\"col-sm-10\" id=\"stats-data-display\">\n<div class=\"stats-graph col-xs-12 hidden-tiny\" id=\"statistics-graph-id\"></div>\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Switch loading spinner. svg -> div with border. (#4398)
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.