Skip to content

Fix PackageManagement merge #991

Closed
Closed

Description

#962 unfortunately was ported from Source Depot files dated in November, and needs to be updated for the latest files.

/cc Raghu Shantha (@raghushantha)

First I'm updating the mapping.json:

> git diff --name-status master...848374599 -- .\monad\src\oneget\ | Select-String -NotMatch -Pattern "^M"
  • A monad/src/oneget/PowerShell.Module/Utility/WebProxy.cs
  • A monad/src/oneget/providers/inbox/NugetLightProvider/Utility/ProgressTracker.cs

Activity

  1. andyleejordan commented on May 18, 2016

    @andyleejordan
    MemberAuthor

    Raghu Shantha (@raghushantha) This is quite a few missed files, I'm not sure if I'll be able to port them all. I can get them imported correctly, but we might need to re-assign this.

  2. andyleejordan commented on May 18, 2016

    @andyleejordan
    MemberAuthor

    These are the test files, which I don't think we need to do:

    • A monad/src/oneget/Test/Proxy/Console/App.config
    • A monad/src/oneget/Test/Proxy/Console/Atlantis.Console.csproj
    • A monad/src/oneget/Test/Proxy/Console/Atlantis.Console.sln
    • A monad/src/oneget/Test/Proxy/Console/Program.cs
    • A monad/src/oneget/Test/Proxy/Console/allowedlist_clientcert.txt
    • A monad/src/oneget/Test/Proxy/Console/allowedlist_server.txt
    • A monad/src/oneget/Test/Proxy/Console/app.context
    • A monad/src/oneget/Test/Proxy/Console/app.context.encrypted
    • A monad/src/oneget/Test/Proxy/Library/AllowedListManager.cs
    • A monad/src/oneget/Test/Proxy/Library/Atlantis.Library.csproj
    • A monad/src/oneget/Test/Proxy/Library/Atlantis.Library.sln
    • A monad/src/oneget/Test/Proxy/Library/GatewayLogic.cs
    • A monad/src/oneget/Test/Proxy/Library/GatewayServer.cs
    • A monad/src/oneget/Test/Proxy/Library/HealthMonitor.cs
    • A monad/src/oneget/Test/Proxy/Library/HttpRequest.cs
    • A monad/src/oneget/Test/Proxy/Library/HttpRequestParser.cs
    • A monad/src/oneget/Test/Proxy/Library/Logging/EventLogger.cs
    • A monad/src/oneget/Test/Proxy/Library/Logging/ILogger.cs
    • A monad/src/oneget/Test/Proxy/Library/Logging/LogManager.cs
    • A monad/src/oneget/Test/Proxy/Library/Logging/LoggingConstants.cs
    • A monad/src/oneget/Test/Proxy/Library/PerfCounterExtensions.cs
    • A monad/src/oneget/Test/Proxy/Library/PerfCounterManager.cs
    • A monad/src/oneget/Test/Proxy/Library/ProxyAllowedHostsResponse.cs
    • A monad/src/oneget/Test/Proxy/Library/Resources/ContentStrings.Designer.cs
    • A monad/src/oneget/Test/Proxy/Library/Resources/ContentStrings.resx
    • A monad/src/oneget/Test/Proxy/Library/ServerCertificateValidator.cs
    • A monad/src/oneget/Test/Proxy/Library/ServerContext.cs
    • A monad/src/oneget/Test/Proxy/Library/Session.cs
    • A monad/src/oneget/Test/Proxy/Library/Settings.cs
    • A monad/src/oneget/Test/Proxy/Library/SocketAwaitable.cs
    • A monad/src/oneget/Test/Proxy/Library/SocketExtensions.cs
    • A monad/src/oneget/Test/Proxy/Library/TcpConnection.cs
    • A monad/src/oneget/Test/Proxy/Library/Telemetry/Bond/Microsoft.WindowsServer.FeedbackForwarder.bond
    • A monad/src/oneget/Test/Proxy/Library/Telemetry/FeedbackForwarderTelemetryEventSource.cs
    • A monad/src/oneget/Test/Proxy/Library/Telemetry/PartnerTelemetryEventSource.cs
    • A monad/src/oneget/Test/Proxy/Library/Telemetry/TelemetryHelper.cs
    • A monad/src/oneget/Test/Proxy/Library/TlsInspector.cs
    • A monad/src/oneget/Test/Proxy/Library/TlsParser.cs
    • A monad/src/oneget/Test/Proxy/Library/TlsTypes.cs
    • A monad/src/oneget/Test/Proxy/Library/Utils.cs
    • A monad/src/oneget/Test/Proxy/Library/WorkspaceBlockList.cs
  3. andyleejordan commented on May 18, 2016

    @andyleejordan
    MemberAuthor

    The OneGet sources have changed significantly even in the last few weeks:

    A    monad/src/oneget/providers/inbox/Common/Extensions/CollectionExtensions.cs
    A    monad/src/oneget/providers/inbox/Common/Extensions/DependencyVersion.cs
    A    monad/src/oneget/providers/inbox/Common/Extensions/EnumerableExtensions.cs
    A    monad/src/oneget/providers/inbox/Common/Extensions/EqualityComparer.cs
    A    monad/src/oneget/providers/inbox/Common/Extensions/Extensions.cs
    A    monad/src/oneget/providers/inbox/Common/Extensions/FilesystemExtensions.cs
    A    monad/src/oneget/providers/inbox/Common/Extensions/MutableEnumerable.cs
    A    monad/src/oneget/providers/inbox/Common/Extensions/ReEnumerable.cs
    A    monad/src/oneget/providers/inbox/Common/Utility/FileUtility.cs
    A    monad/src/oneget/providers/inbox/Common/Utility/PathUtility.cs
    A    monad/src/oneget/providers/inbox/Common/Utility/XmlUtility.cs
    A    monad/src/oneget/providers/inbox/Common/Version/DependencyVersion.cs
    A    monad/src/oneget/providers/inbox/Common/Version/SemanticVersion.cs
    A    monad/src/oneget/providers/inbox/Common/Version/SemanticVersionTypeConverter.cs
    D    monad/src/oneget/providers/inbox/NugetLightProvider/Extensions.cs
    A    monad/src/oneget/providers/inbox/NugetLightProvider/NuGetExtensions.cs
    D    monad/src/oneget/providers/inbox/NugetLightProvider/Utility/FileUtility.cs
    A    monad/src/oneget/providers/inbox/NugetLightProvider/Utility/NuGetPathUtility.cs
    D    monad/src/oneget/providers/inbox/NugetLightProvider/Utility/PathUtility.cs
    D    monad/src/oneget/providers/inbox/NugetLightProvider/Utility/XmlUtility.cs
    D    monad/src/oneget/providers/inbox/NugetLightProvider/Version/DependencyVersion.cs
    D    monad/src/oneget/providers/inbox/NugetLightProvider/Version/SemanticVersion.cs
    D    monad/src/oneget/providers/inbox/NugetLightProvider/Version/SemanticVersionTypeConverter.cs
    
  4. modified the milestones: , v0.5.0 on May 18, 2016
  5. andyleejordan commented on May 18, 2016

    @andyleejordan
    MemberAuthor

    While I've updated the mapping.json file for Source Depot changeset [SD:700586], the previous comment are the file additions/deletions between that changeset and the current available SD import, [SD:704605].

    This is over twenty files that need to be mapped and ported, which is beyond my scope.

    The andschwa/darek branch has Darek's original changes (which amounts to an import and port to CORECLR of the November sources of OneGet).

    After someone has updated the mapping for the 704605 changes (post #972), I can work with someone to incorporate Darek's work, and move forward to porting the newer version of OneGet.

    But for now, this is blocked.

  6. raghushantha commented on May 27, 2016

    @raghushantha
    Member

    Hi Andy.

    I have updated the mappings and set this PR:
    #1052

    Let me know if we can work on integrating andschwa/darek branch

  7. vors commented on Jun 11, 2016

    @vors
    Collaborator

    Raghu Shantha (@raghushantha) please work with me on it

  8. modified the milestones: v0.6.0, Aug17 on Jun 13, 2016
  9. vors commented on Jun 13, 2016

    @vors
    Collaborator

    Moving it to 0.6.0, because it's needed for one-codebase

  10. vors commented on Jun 20, 2016

    @vors
    Collaborator
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Labels

No labels
No labels

Type

No type

Projects

No projects

    Milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions