Finished renaming from OneGet to 'PackageManagement'. Yawn.

OneGet · Mar 20, 2015 · 88d8325787fa4626867d71915216aa8911c13f33 · Stanzilla · Jul 28, 2015 · Stanzilla
1 parent 84b7ade
commit 88d8325787fa4626867d71915216aa8911c13f33
Unified Split

Showing 387 changed files with 2,770 additions and 3,972 deletions.
diff --git a/.nuget/packages.config b/.nuget/packages.config
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="xunit.runner.console" version="2.0.0" />
  <package id="xunit.runners" version="1.9.2" />
  <package id="xunit.runners" version="2.0.0-beta5-build2785" />
 </packages>
diff --git a/NativeBindings/PackageManagement.cs b/NativeBindings/PackageManagement.cs
@@ -1,25 +1,25 @@
-// 
-//  Copyright (c) Microsoft Corporation. All rights reserved. 
+//
+//  Copyright (c) Microsoft Corporation. All rights reserved.
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
 //  You may obtain a copy of the License at
 //  http://www.apache.org/licenses/LICENSE-2.0
-//  
+//
 //  Unless required by applicable law or agreed to in writing, software
 //  distributed under the License is distributed on an "AS IS" BASIS,
 //  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 //  See the License for the specific language governing permissions and
 //  limitations under the License.
-//  
+//

-namespace Microsoft.OneGet.Native {
+namespace Microsoft.PackageManagement.Native {
    using System;
    using System.Runtime.InteropServices;
    using System.Text;
    using Api;
    using RGiesecke.DllExport;

-    public class OneGet {
+    public class PackageManagement {


        // [return: MarshalAs(UnmanagedType.LPWStr)]
@@ -51,4 +51,4 @@ public class OneGet {
            return 50;
        }
    }
-}
+}
diff --git a/Package/Msi/Msi.wixproj b/Package/Msi/Msi.wixproj
@@ -32,5 +32,8 @@
      <InProject>false</InProject>
    </BindInputPaths>
  </ItemGroup>
+  <ItemGroup>
+    <Content Include="install-oneget.cmd" />
+  </ItemGroup>
  <Import Project="$(WixTargetsPath)" />
 </Project>
diff --git a/Package/Msi/Package.wxs b/Package/Msi/Package.wxs
@@ -1,52 +1,43 @@
 <?xml version="1.0" ?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <Product Id="*" Name="OneGet" Manufacturer="Microsoft Corporation" Language="1033"
-           Version="!(bind.FileVersion.Microsoft.OneGet.exe)"
+  <Product Id="*" Name="OneGet" Manufacturer="Outercurve Foundation" Language="1033"
+           Version="!(bind.FileVersion.Microsoft.PackageManagement.dll)"
           UpgradeCode="0298D025-D727-485A-8691-5ECCCA27F424">
    <Package InstallScope="perMachine" Compressed="yes" />

    <MediaTemplate CompressionLevel="low" CabinetTemplate="og{0}.cab" />

    <Directory Id="TARGETDIR" Name="SourceDir">
      <Directory Id="ProgramFilesFolder">
-        <Directory Id="WindowsPowerShellFolder" Name="WindowsPowerShell">
-          <Directory Id="ModulesFolder" Name="Modules">
-            <Directory Id="OneGetFolder" Name="OneGet">
-            </Directory>
-            <Directory Id="OneGetEdgeFolder" Name="OneGet-Edge">
-            </Directory>
-            <Directory Id="PowerShellGetFolder" Name="PowerShellGet">
-              <Directory Id="PSGetEnUsFolder" Name="en-US" />
+        <Directory Id="OutercurveFoundationFolder" Name="OutercurveFoundation">
+          <Directory Id="VersionFolder" Name="!(bind.FileVersion.Microsoft.PackageManagement.dll)">
+            <Directory Id="ModulesFolder" Name="Modules">
+              <Directory Id="OneGetFolder" Name="OneGet">
+              </Directory>
+              <Directory Id="PowerShellGetFolder" Name="PowerShellGet">
+                <Directory Id="PSGetEnUsFolder" Name="en-US" />
+              </Directory>
            </Directory>
          </Directory>
        </Directory>
      </Directory>
    </Directory>

-    <Feature Id="OneGetFeature">
+    <Feature Id="PackageManagementFeature">
+      <ComponentGroupRef Id="PackageManagementComponents" />
      <ComponentGroupRef Id="OneGetComponents" />
      <ComponentGroupRef Id="PSGetComponents" />
      <ComponentGroupRef Id="PSGetEnUsComponents" />
-      <ComponentGroupRef Id="OneGetEdgeComponents" />
-      <!--
-      <ComponentGroupRef Id="ProviderComponents" />
-      <ComponentGroupRef Id="PdbComponents" />
-      -->
    </Feature>
  
-    <CustomAction Id="RunPowerShellScript" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no" />
-
+    <CustomAction Id="RunScript" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no" />
  
  <InstallExecuteSequence>

-    <!--Invoke PowerShell script -->
-    <Custom Action="RunPowerShellScript" After="InstallFiles"><![CDATA[NOT Installed]]></Custom>
+    <!--Invoke script -->
+    <Custom Action="RunScript" After="InstallFiles"><![CDATA[NOT Installed]]></Custom>
  </InstallExecuteSequence>
-
-  
  </Product>
-
-
    
  <Fragment>

@@ -61,10 +52,10 @@
      <![CDATA[Installed OR POWERSHELLEXE]]>
    </Condition>

-      <SetProperty Id="RunPowerShellScript"
+      <SetProperty Id="RunScript"
           Before ="InstallFiles"
           Sequence="execute"
-           Value ="&quot;[POWERSHELLEXE]&quot; -NoProfile -NonInteractive &quot;[\[]System.Environment[\]]::SetEnvironmentVariable('PSModulePath',((((($env:PSModulePath).Split(';'))+'[ModulesFolder]').Trim('\')|Where-object{$_.Length -gt 0}|select -uniq) -join ';') ,'Machine')&quot;" />
+           Value ="&quot;[SystemFolder]cmd.exe&quot; &quot;[OneGetFolder]\install-oneget.cmd&quot;" />
      
    <ComponentGroup Id="PSGetComponents" Directory="PowerShellGetFolder">
      <Component><File Source="Providers\Inbox\PowerShellGet\PowerShellGet.psd1" /></Component>
@@ -77,79 +68,46 @@
      <Component><File Source="Providers\Inbox\PowerShellGet\en-Us\PSGet.Resource.psd1" Id="enuspsgetresourcepsd1" /></Component>
    </ComponentGroup >
    
-    <ComponentGroup Id="OneGetComponents" Directory="OneGetFolder">
-      <Component>
-        <File Source="readme.md" />
-      </Component>
-
-      <Component>
-        <File Source="release-notes.md" />
-      </Component>
+    <ComponentGroup Id="PackageManagementComponents" Directory="OneGetFolder">
+      <Component><File Source="readme.md" /></Component>

      <Component>
-        <File Id="Microsoft.OneGet.exe" Source="Microsoft.OneGet.exe" />
+        <File Id="Microsoft.PackageManagement.dll" Source="Microsoft.PackageManagement.dll" />
        <Environment Id="UpdatePsModulePath" Action="set" Name="PSModulePath" Value="[ModulesFolder]" Part="last" System="yes" /> 
      </Component>

-      <Component><File Source="Microsoft.OneGet.MetaProvider.PowerShell.dll" /></Component>
-      <Component><File Source="Microsoft.OneGet.ArchiverProviders.dll" /></Component>
-      <Component><File Source="Microsoft.OneGet.MsiProvider.dll" /></Component>
-      <Component><File Source="Microsoft.OneGet.MsuProvider.dll" /></Component>
-      
-      <Component><File Source="Microsoft.OneGet.NuGetProvider.dll" /></Component> 
-      <Component><File Source="nuget.exe" /></Component> 
-      
-      <!-- <Component><File Source="nuget-anycpu.exe" /></Component>  -->
-      <Component><File Source="Microsoft.OneGet.CoreProviders.dll" /></Component>
+      <Component><File Source="Microsoft.PackageManagement.MetaProvider.PowerShell.dll" /></Component>
+      <Component><File Source="Microsoft.PackageManagement.ArchiverProviders.dll" /></Component>
+      <Component><File Source="Microsoft.PackageManagement.MsiProvider.dll" /></Component>
+      <Component><File Source="Microsoft.PackageManagement.MsuProvider.dll" /></Component>
+      <Component><File Source="Microsoft.PackageManagement.CoreProviders.dll" /></Component>
+      <Component><File Source="Microsoft.PackageManagement.Utility.dll" /></Component>
+      <Component><File Source="Microsoft.PackageManagement.Utility.PowerShell.dll" /></Component>
+      <Component><File Source="Microsoft.PowerShell.PackageManagement.dll" /></Component>

-      <Component><File Source="Microsoft.OneGet.Utility.dll" /></Component>
-      <Component><File Source="Microsoft.OneGet.Utility.PowerShell.dll" /></Component>
-      <Component><File Source="Microsoft.PowerShell.OneGet.dll" /></Component>
-      
-      <Component><File Source="Microsoft.OneGet.pdb" /></Component>
-      <Component><File Source="Microsoft.OneGet.MetaProvider.PowerShell.pdb" /></Component>
-      <Component><File Source="Microsoft.OneGet.ArchiverProviders.pdb" /></Component>
-      <Component><File Source="Microsoft.OneGet.MsiProvider.pdb" /></Component>
-      <Component><File Source="Microsoft.OneGet.MsuProvider.pdb" /></Component>
-      <Component><File Source="Microsoft.OneGet.NuGetProvider.pdb" /></Component>
-      <Component><File Source="Microsoft.OneGet.CoreProviders.pdb" /></Component>
+      <Component><File Source="Microsoft.PackageManagement.NuGetProvider.dll" /></Component> 
+      <Component><File Source="nuget.exe" /></Component> 

-      <Component><File Source="Microsoft.OneGet.Utility.pdb" /></Component>
-      <Component><File Source="Microsoft.OneGet.Utility.PowerShell.pdb" /></Component>
-      <Component><File Source="Microsoft.PowerShell.OneGet.pdb" /></Component>
+      <Component><File Source="Microsoft.PackageManagement.pdb" /></Component>
+      <Component><File Source="Microsoft.PackageManagement.MetaProvider.PowerShell.pdb" /></Component>
+      <Component><File Source="Microsoft.PackageManagement.ArchiverProviders.pdb" /></Component>
+      <Component><File Source="Microsoft.PackageManagement.MsiProvider.pdb" /></Component>
+      <Component><File Source="Microsoft.PackageManagement.MsuProvider.pdb" /></Component>
+      <Component><File Source="Microsoft.PackageManagement.NuGetProvider.pdb" /></Component>
+      <Component><File Source="Microsoft.PackageManagement.CoreProviders.pdb" /></Component>
+      <Component><File Source="Microsoft.PackageManagement.Utility.pdb" /></Component>
+      <Component><File Source="Microsoft.PackageManagement.Utility.PowerShell.pdb" /></Component>
+      <Component><File Source="Microsoft.PowerShell.PackageManagement.pdb" /></Component>
      
-      <Component><File Source="OneGet.format.ps1xml" /></Component>
-      <Component><File Source="OneGet.psd1" /></Component>
+      <Component><File Source="PackageManagement.format.ps1xml" /></Component>
      <Component><File Source="PackageProviderFunctions.psm1" /></Component>
      
-    </ComponentGroup>
-    
-    <ComponentGroup Id="OneGetEdgeComponents" Directory="OneGetEdgeFolder">
+      <Component><File Source="PackageManagement.psd1" /></Component>
      <Component><File Source="OneGet-Edge.psd1" /></Component>
+      <Component><File Source="OneGet.psd1" /></Component>
    </ComponentGroup>
+    
  </Fragment>

-  <Fragment>
-    <ComponentGroup Id="PdbComponents" Directory="OneGetFolder">
-      <Component>
-        <File Source="Microsoft.OneGet.pdb" />
-      </Component>
-
-      <Component>
-        <File Source="Microsoft.OneGet.MetaProvider.PowerShell.pdb" />
-      </Component>
-
-      <Component>
-        <File Source="Microsoft.OneGet.Utility.pdb" />
-      </Component>
-
-      <Component>
-        <File Source="Microsoft.OneGet.Utility.PowerShell.pdb" />
-      </Component>
-
-      <Component>
-        <File Source="Microsoft.PowerShell.OneGet.pdb" />
-      </Component>
-    </ComponentGroup>
-  </Fragment>
+  
 </Wix>
diff --git a/Package/Msi/install-oneget.cmd b/Package/Msi/install-oneget.cmd
@@ -0,0 +1,14 @@
+@echo off
+
+set TARGET=%~dp0
+set MODULEFOLDER=%ProgramFiles%\WindowsPowerShell\Modules
+
+# remove old junctions
+rmdir "%MODULEFOLDER%\PackageManagement"
+rmdir "%MODULEFOLDER%\OneGet"
+rmdir "%MODULEFOLDER%\OneGet-Edge"
+
+# create junctions for modules (all point here)
+mklink /j "%MODULEFOLDER%\PackageManagement" "%TARGET%"
+mklink /j "%MODULEFOLDER%\OneGet" "%TARGET%"
+mklink /j "%MODULEFOLDER%\OneGet-Edge" "%TARGET%"
diff --git a/PackageManagement.sln b/PackageManagement.sln
@@ -72,17 +72,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sdk", "Sdk", "{80518357-8AA
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{C3698B22-D216-4207-8C91-EE8244646E94}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BVT", "BVT", "{89E2457B-D426-4309-A574-7564E45CF8BE}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{F80499C6-AD69-4CA4-944E-250BCAF47990}"
 	ProjectSection(SolutionItems) = preProject
 		.nuget\packages.config = .nuget\packages.config
 	EndProjectSection
 EndProject
-Project("{F5034706-568F-408A-B7B3-4D38C6DB8A32}") = "cmdlet-testsuite", "Test\BVT\cmdlet-testsuite\cmdlet-testsuite.pssproj", "{6CAFC0C6-A428-4D30-A9F9-700E829FEA51}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RITests", "Test\RITests\RITests.csproj", "{879436B2-5911-44E1-A46B-366CC9F34A7F}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -199,18 +193,6 @@ Global
 		{12BC926F-A38B-47DB-A490-21E8686514F6}.Publish|Any CPU.Build.0 = Release|Any CPU
 		{12BC926F-A38B-47DB-A490-21E8686514F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{12BC926F-A38B-47DB-A490-21E8686514F6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6CAFC0C6-A428-4D30-A9F9-700E829FEA51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6CAFC0C6-A428-4D30-A9F9-700E829FEA51}.Debug-Publish|Any CPU.ActiveCfg = Debug|Any CPU
-		{6CAFC0C6-A428-4D30-A9F9-700E829FEA51}.Publish|Any CPU.ActiveCfg = Release|Any CPU
-		{6CAFC0C6-A428-4D30-A9F9-700E829FEA51}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{879436B2-5911-44E1-A46B-366CC9F34A7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{879436B2-5911-44E1-A46B-366CC9F34A7F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{879436B2-5911-44E1-A46B-366CC9F34A7F}.Debug-Publish|Any CPU.ActiveCfg = Debug|Any CPU
-		{879436B2-5911-44E1-A46B-366CC9F34A7F}.Debug-Publish|Any CPU.Build.0 = Debug|Any CPU
-		{879436B2-5911-44E1-A46B-366CC9F34A7F}.Publish|Any CPU.ActiveCfg = Release|Any CPU
-		{879436B2-5911-44E1-A46B-366CC9F34A7F}.Publish|Any CPU.Build.0 = Release|Any CPU
-		{879436B2-5911-44E1-A46B-366CC9F34A7F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{879436B2-5911-44E1-A46B-366CC9F34A7F}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -229,8 +211,5 @@ Global
 		{C06032D8-C31A-492A-86F3-5CC4ED19BD8E} = {06F8B919-B196-4C85-B412-7C094EDC80F7}
 		{12BC926F-A38B-47DB-A490-21E8686514F6} = {80518357-8AA5-4A02-8598-68E6C6C226EE}
 		{80518357-8AA5-4A02-8598-68E6C6C226EE} = {1D6B52CB-403F-4A0C-9F7A-C933EBD613BE}
-		{89E2457B-D426-4309-A574-7564E45CF8BE} = {C3698B22-D216-4207-8C91-EE8244646E94}
-		{6CAFC0C6-A428-4D30-A9F9-700E829FEA51} = {89E2457B-D426-4309-A574-7564E45CF8BE}
-		{879436B2-5911-44E1-A46B-366CC9F34A7F} = {C3698B22-D216-4207-8C91-EE8244646E94}
 	EndGlobalSection
 EndGlobal
diff --git a/PackageManagement/Api/ICoreApi.cs b/PackageManagement/Api/ICoreApi.cs
@@ -1,21 +1,21 @@
-// 
-//  Copyright (c) Microsoft Corporation. All rights reserved. 
+//
+//  Copyright (c) Microsoft Corporation. All rights reserved.
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
 //  You may obtain a copy of the License at
 //  http://www.apache.org/licenses/LICENSE-2.0
-//  
+//
 //  Unless required by applicable law or agreed to in writing, software
 //  distributed under the License is distributed on an "AS IS" BASIS,
 //  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 //  See the License for the specific language governing permissions and
 //  limitations under the License.
-//  
+//

-namespace Microsoft.OneGet.Api {
+namespace Microsoft.PackageManagement.Api {
    public interface ICoreApi {
        IPackageManagementService PackageManagementService { get; }

        IProviderServices ProviderServices { get; }
    }
-}
+}
diff --git a/PackageManagement/Api/IHostAPI.cs b/PackageManagement/Api/IHostAPI.cs
@@ -1,18 +1,18 @@
-// 
-//  Copyright (c) Microsoft Corporation. All rights reserved. 
+//
+//  Copyright (c) Microsoft Corporation. All rights reserved.
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
 //  You may obtain a copy of the License at
 //  http://www.apache.org/licenses/LICENSE-2.0
-//  
+//
 //  Unless required by applicable law or agreed to in writing, software
 //  distributed under the License is distributed on an "AS IS" BASIS,
 //  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 //  See the License for the specific language governing permissions and
 //  limitations under the License.
-//  
+//

-namespace Microsoft.OneGet.Api {
+namespace Microsoft.PackageManagement.Api {
    using System.Collections.Generic;
    using System.Security;

@@ -71,4 +71,4 @@ public interface IHostApi {

        #endregion
    }
-}
+}