Permalink
Browse files

Fix csproj. Add scripts to build for .net core (#204)

Fix csproj. Add scripts to build for .net core. Fix test failures. Update appveyor
  • Loading branch information...
Quoc Truong
Quoc Truong committed Aug 29, 2016
1 parent aa365d0 commit a92b0e4ccecb2cffd477ba4a3ace00c4d692121f
Showing 373 changed files with 8,022 additions and 8,398 deletions.
View
@@ -9,6 +9,14 @@
*.msi
*.user
*.sln.docstates
Messages.Designer.cs
src/Microsoft.PackageManagement.CoreProviders/resources/Microsoft.PackageManagement.Providers.Resources.Messages.resx
src/Microsoft.PackageManagement.MetaProvider.PowerShell/resources/Microsoft.PackageManagement.MetaProvider.PowerShell.Internal.Resources.Messages.resx
src/Microsoft.PackageManagement.MsiProvider/resources/Microsoft.PackageManagement.Msi.Internal.Resources.Messages.resx
src/Microsoft.PackageManagement.MsuProvider/resources/Microsoft.PackageManagement.Msu.Internal.Resources.Messages.resx
src/Microsoft.PackageManagement/resources/Microsoft.PackageManagement.Internal.Resources.Messages.resx
src/Microsoft.PowerShell.PackageManagement/resources/Microsoft.PowerShell.PackageManagement.Resources.Messages.resx
# Build results
@@ -18,6 +26,8 @@ x64/
build/
[Bb]in/
[Oo]bj/
[Oo]ut/
[Gg]en/
# MSTest test Results
[Tt]est[Rr]esult*/
@@ -68,6 +78,7 @@ ipch
packages
*.wixobj
*.lock.json
*.suo
*.wixpdb
View
@@ -1,3 +1,6 @@
[submodule "Test/ModuleTests/Pester"]
path = Test/ModuleTests/Pester
url = https://github.com/pester/Pester.git
[submodule "src/Microsoft.PackageManagement.NuGetProvider"]
path = src/Microsoft.PackageManagement.NuGetProvider
url = https://github.com/OneGet/NuGetProvider
@@ -1,26 +0,0 @@
<?xml version="1.0" ?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:bal="http://schemas.microsoft.com/wix/BalExtension"
xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
<Bundle Name="OneGet v!(bind.packageVersion.OneGet.msi)" Manufacturer="OneGet Project"
Version="!(bind.packageVersion.OneGet.msi)" UpgradeCode="0FCE07AA-AC5F-4CB4-AEE5-C2CC74E060AE"
Compressed="yes">
<BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.HyperlinkLicense">
<bal:WixStandardBootstrapperApplication
LicenseUrl="http://j.mp/onegetlicense"
LogoFile="logo.png"
ThemeFile="theme.xml"
LocalizationFile="theme-loc.wxl"
SuppressOptionsUI="yes" />
</BootstrapperApplicationRef>
<util:RegistrySearch Variable="PowerShellVersion" Root="HKLM" Key="SOFTWARE\Microsoft\PowerShell\3\PowerShellEngine"
Value="PowerShellVersion" />
<bal:Condition Message="[WixBundleName] requires PowerShell v3.0 or newer. To install a newer version of PowerShell see: http://j.mp/psinstall" >PowerShellVersion>=v3.0</bal:Condition>
<Chain>
<MsiPackage SourceFile="OneGet.msi" />
</Chain>
</Bundle>
</Wix>
@@ -1,44 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<DefineSolutionProperties>false</DefineSolutionProperties>
<ProductVersion>3.9</ProductVersion>
<ProjectGuid>0fce07aa-ac5f-4cb4-aee5-c2cc74e060ae</ProjectGuid>
<Name>Installer</Name>
<OutputName>Install-OneGet</OutputName>
<OutputType>Bundle</OutputType>
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
</PropertyGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), solution.props))\solution.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), solution.props))\solution.props')" />
<ItemGroup>
<Compile Include="Bundle.wxs" />
</ItemGroup>
<ItemGroup>
<BindInputPaths Include="$(SolutionRootDir)\signed">
<InProject>false</InProject>
</BindInputPaths>
<BindInputPaths Include="$(OutputPath)">
<InProject>false</InProject>
</BindInputPaths>
</ItemGroup>
<ItemGroup>
<WixExtension Include="WixBalExtension">
<HintPath>$(WixExtDir)\WixBalExtension.dll</HintPath>
<Name>WixBalExtension</Name>
</WixExtension>
<WixExtension Include="WixUtilExtension">
<HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
<Name>WixUtilExtension</Name>
</WixExtension>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="theme-loc.wxl" />
</ItemGroup>
<ItemGroup>
<Content Include="Theme.xml" />
</ItemGroup>
<Import Project="$(WixTargetsPath)" />
</Project>
@@ -1,66 +0,0 @@
<?xml version="1.0" ?>
<Theme xmlns="http://wixtoolset.org/schemas/thmutil/2010">
<Window Width="500" Height="390" HexStyle="100a0000" FontId="0">#(loc.Caption)</Window>
<Font Id="0" Height="-12" Weight="500" Foreground="000000" Background="FFFFFF">Segoe UI</Font>
<Font Id="1" Height="-24" Weight="500" Foreground="000000">Segoe UI</Font>
<Font Id="2" Height="-22" Weight="500" Foreground="666666">Segoe UI</Font>
<Font Id="3" Height="-12" Weight="500" Foreground="000000" Background="FFFFFF">Segoe UI</Font>
<Font Id="4" Height="-12" Weight="500" Foreground="ff0000" Background="FFFFFF" Underline="yes">Segoe UI</Font>
<Font Id="5" Height="-12" Weight="500" Foreground="000000" Background="FFFFFF">Consolas</Font>
<Image X="11" Y="11" Width="64" Height="64" ImageFile="logo.png" Visible="yes"/>
<Text X="80" Y="11" Width="-11" Height="64" FontId="1" Visible="yes">#(loc.Title)</Text>
<Page Name="Install">
<Text X="11" Y="80" Width="-11" Height="30" FontId="2">#(loc.InstallHeader)</Text>
<Text X="11" Y="121" Width="-11" Height="-129" FontId="3">#(loc.InstallMessage)</Text>
<Hypertext Name="EulaHyperlink" X="11" Y="145" Width="-11" Height="17" TabStop="yes" FontId="3" HideWhenDisabled="yes">#(loc.InstallLicenseLinkText)</Hypertext>
<Text Name="notes" X="12" Y="165" Width="-12" Height="-51" TabStop="yes" FontId="5">
To use this experimental build, you must run from PowerShell:
  PS > Set-ExecutionPolicy Unrestricted
To load this module:
  PS > ipmo oneget-edge
</Text>
<Button Name="InstallButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">Install</Button>
<Button Name="WelcomeCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">Close</Button>
</Page>
<Page Name="Progress">
<Text X="11" Y="80" Width="-11" Height="30" FontId="2">#(loc.ProgressHeader)</Text>
<Text X="11" Y="121" Width="70" Height="17" FontId="3">#(loc.ProgressLabel)</Text>
<Text Name="OverallProgressPackageText" X="85" Y="121" Width="-11" Height="17" FontId="3">#(loc.OverallProgressPackageText)</Text>
<Progressbar Name="OverallCalculatedProgressbar" X="11" Y="143" Width="-11" Height="15" />
<Button Name="ProgressCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.ProgressCancelButton)</Button>
</Page>
<Page Name="Failure">
<Text X="11" Y="80" Width="-11" Height="30" FontId="2">#(loc.FailureHeader)</Text>
<Hypertext Name="FailureLogFileLink" X="11" Y="121" Width="-11" Height="42" FontId="3" TabStop="yes" HideWhenDisabled="yes">#(loc.FailureHyperlinkLogText)</Hypertext>
<Hypertext Name="FailureMessageText" X="22" Y="163" Width="-11" Height="51" FontId="3" TabStop="yes" HideWhenDisabled="yes" />
<Text Name="FailureRestartText" X="-11" Y="-51" Width="400" Height="34" FontId="3" HideWhenDisabled="yes">#(loc.FailureRestartText)</Text>
<Button Name="FailureRestartButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.FailureRestartButton)</Button>
<Button Name="FailureCloseButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.FailureCloseButton)</Button>
</Page>
<Page Name="Success">
<Text X="11" Y="80" Width="-11" Height="30" FontId="2">#(loc.SuccessHeader)</Text>
<Button Name="LaunchButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessLaunchButton)</Button>
<Text Name="SuccessRestartText" X="-11" Y="-51" Width="400" Height="34" FontId="3" HideWhenDisabled="yes">#(loc.SuccessRestartText)</Text>
<Button Name="SuccessRestartButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessRestartButton)</Button>
<Button Name="SuccessCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.SuccessCloseButton)</Button>
</Page>
<Page Name="Modify">
<Text X="11" Y="80" Width="-11" Height="30" FontId="2">#(loc.ModifyHeader)</Text>
<Button Name="RepairButton" X="-171" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.ModifyRepairButton)</Button>
<Button Name="UninstallButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.ModifyUninstallButton)</Button>
<Button Name="ModifyCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.ModifyCloseButton)</Button>
</Page>
</Theme>
View
Binary file not shown.
@@ -1,28 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<WixLocalization Culture="en-us" xmlns="http://schemas.microsoft.com/wix/2006/localization">
<String Id="Title">OneGet Experimental Build [WixBundleVersion]</String>
<String Id="InstallHeader">Use this experimental build at your own risk.</String>
<String Id="InstallMessage">Setup will install the OneGet Experimental Build [WixBundleVersion] on your computer.</String>
<String Id="InstallVersion">Version [WixBundleVersion]</String>
<String Id="InstallLicenseLinkText"><![CDATA[Read the <a href="http://j.mp/onegetlicense">License Terms</a>]]></String>
<String Id="ConfirmCancelMessage">Cancel Installation?</String>
<String Id="ProgressCancelButton">Cancel</String>
<String Id="FailureCloseButton">Close</String>
<String Id="SuccessCloseButton">Close</String>
<String Id="ModifyCloseButton">Close</String>
<String Id="ModifyUninstallButton">Uninstall</String>
<String Id="ModifyRepairButton">Modify</String>
<String Id="SuccessRestartButton">Restart</String>
<String Id="SuccessRestartText">Restart</String>
<String Id="SuccessLaunchButton">Launch</String>
<String Id="FailureRestartButton">Restart</String>
<String Id="FailureRestartText">Restart</String>
<String Id="ProgressHeader">Working...</String>
<String Id="ProgressLabel"> </String>
<String Id="OverallProgressPackageText">Progress:</String>
<String Id="FailureHeader">Failed to install OneGet Experimental Build.</String>
<String Id="ModifyHeader">Modify Installation</String>
<String Id="SuccessHeader">Success!</String>
</WixLocalization>
View
@@ -1,42 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<DefineSolutionProperties>false</DefineSolutionProperties>
<ProductVersion>3.9</ProductVersion>
<ProjectGuid>0298d025-d727-485a-8691-5eccca27f424</ProjectGuid>
<Name>Msi</Name>
<OutputName>OneGet</OutputName>
<OutputType>Package</OutputType>
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<CompilerAdditionalOptions>
</CompilerAdditionalOptions>
<LinkerAdditionalOptions>-ext WixUtilExtension</LinkerAdditionalOptions>
</PropertyGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), solution.props))\solution.props" Condition="Exists('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), solution.props))\solution.props')" />
<ItemGroup>
<Compile Include="Package.wxs" />
</ItemGroup>
<ItemGroup>
<BindInputPaths Include="$(SolutionRootDir)\signed">
<InProject>false</InProject>
</BindInputPaths>
<BindInputPaths Include="$(OutputPath)">
<InProject>false</InProject>
</BindInputPaths>
<BindInputPaths Include="$(SolutionDir)">
<InProject>false</InProject>
</BindInputPaths>
<BindInputPaths Include="$(MSBuildThisFileDirectory)">
<InProject>false</InProject>
</BindInputPaths>
</ItemGroup>
<ItemGroup>
<Content Include="install-oneget.cmd" />
</ItemGroup>
<Import Project="$(WixTargetsPath)" />
</Project>
View
@@ -1,101 +0,0 @@
<?xml version="1.0" ?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<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="OutercurveFoundationFolder" Name="Outercurve Foundation">
<Directory Id="ProdFolder" Name="OneGet">
<Directory Id="OneGetFolder" Name="!(bind.FileVersion.Microsoft.PackageManagement.dll)">
<Directory Id="PowerShellGetFolder" Name="PowerShellGet">
<Directory Id="PSGetEnUsFolder" Name="en-US" />
</Directory>
</Directory>
</Directory>
</Directory>
</Directory>
</Directory>
<Feature Id="PackageManagementFeature">
<ComponentGroupRef Id="PackageManagementComponents" />
<ComponentGroupRef Id="PSGetComponents" />
<ComponentGroupRef Id="PSGetEnUsComponents" />
</Feature>
<CustomAction Id="RunScript" BinaryKey="WixCA" DllEntry="CAQuietExec64" Execute="deferred" Return="ignore" Impersonate="no" />
<InstallExecuteSequence>
<!--Invoke script -->
<Custom Action="RunScript" After="InstallFiles"><![CDATA[NOT Installed]]></Custom>
</InstallExecuteSequence>
</Product>
<Fragment>
<Property Id="POWERSHELLEXE">
<RegistrySearch Id="POWERSHELLEXE"
Type="raw"
Root="HKLM"
Key="SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell"
Name="Path" />
</Property>
<Condition Message="This application requires Windows PowerShell.">
<![CDATA[Installed OR POWERSHELLEXE]]>
</Condition>
<SetProperty Id="RunScript"
Before="InstallFiles"
Sequence="execute"
Value="&quot;[System64Folder]cmd.exe&quot; /c &quot;[OneGetFolder]\install-oneget.cmd&quot;" />
<ComponentGroup Id="PSGetComponents" Directory="PowerShellGetFolder">
<Component><File Source="Providers\Inbox\PowerShellGet\PowerShellGet.psd1" /></Component>
<Component><File Source="Providers\Inbox\PowerShellGet\PSGet.Format.ps1xml" /></Component>
<Component><File Source="Providers\Inbox\PowerShellGet\PSGet.psm1" /></Component>
<Component><File Source="Providers\Inbox\PowerShellGet\PSGet.Resource.psd1" /></Component>
</ComponentGroup >
<ComponentGroup Id="PSGetEnUsComponents" Directory="PSGetEnUsFolder">
<Component><File Source="Providers\Inbox\PowerShellGet\en-Us\PSGet.Resource.psd1" Id="enuspsgetresourcepsd1" /></Component>
</ComponentGroup >
<ComponentGroup Id="PackageManagementComponents" Directory="OneGetFolder">
<Component><File Source="readme.md" /></Component>
<Component><File Id="Microsoft.PackageManagement.dll" Source="Microsoft.PackageManagement.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.PowerShell.PackageManagement.dll" /></Component>
<Component><File Source="Microsoft.PackageManagement.NuGetProvider.dll" /></Component>
<Component><File Source="nuget.exe" /></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.PowerShell.PackageManagement.pdb" /></Component>
<Component><File Source="PackageManagement.format.ps1xml" /></Component>
<Component><File Source="PackageProviderFunctions.psm1" /></Component>
<Component><File Source="PackageManagement.psd1" /></Component>
<Component><File Source="OneGet-Edge.psd1" /></Component>
<Component><File Source="OneGet.psd1" /></Component>
<Component><File Source="install-oneGet.cmd" /></Component>
</ComponentGroup>
</Fragment>
</Wix>
@@ -1,26 +0,0 @@
@echo off
set TARGET=%~dp0
set MODULEFOLDER=%ProgramFiles%\WindowsPowerShell\Modules
:remove old junctions
rmdir "%MODULEFOLDER%\PackageManagement" > nul
rmdir "%MODULEFOLDER%\OneGet" > nul
rmdir "%MODULEFOLDER%\OneGet-Edge" > nul
rmdir "%MODULEFOLDER%\PowerShellGet" > nul
: create junctions for modules (all point here)
mklink /j "%MODULEFOLDER%\PackageManagement" "%TARGET%"
mklink /j "%MODULEFOLDER%\OneGet" "%TARGET%"
mklink /j "%MODULEFOLDER%\OneGet-Edge" "%TARGET%"
: and do powershellGet too...
mklink /j "%MODULEFOLDER%\PowerShellGet" "%TARGET%\PowerShellGet" > nul
: check if OneGet-Edge is in the psmodulepath
pushd c:\
powershell ipmo oneget-edge -ea silentlycontinue & if errorlevel 1 (
for /F "tokens=* delims=⌂ eol=~" %%f IN ('powershell -noprofile echo $env:psmodulepath') do setx.exe PSMODULEPATH "%%f;%PROGRAMW6432%\WindowsPowerShell\Modules" -m
)
Oops, something went wrong.

0 comments on commit a92b0e4

Please sign in to comment.