Permalink
Browse files

Upgrade from net451 to net452 because net451 is not supported any more (

  • Loading branch information...
bergmeister authored and alerickson committed Dec 24, 2018
1 parent 9559476 commit 90808d75dc6b7e45620a59055ce29999b74fdc27
@@ -1,6 +1,6 @@
[submodule "src/Microsoft.PackageManagement.NuGetProvider"]
path = src/Microsoft.PackageManagement.NuGetProvider
url = https://github.com/oneget/NuGetProvider.git
url = https://github.com/OneGet/NuGetProvider.git

[submodule "src/Modules/PowerShellGet"]

@@ -19,14 +19,7 @@ build_script:
- git submodule update --init
- ps: nuget locals all -clear
- ps: import-module c:\projects\oneget\test\TestUtility.psm1 -force
- ps: cd .\src; .\bootstrap.ps1; .\build.ps1 -framework "net451" Release -EmbedProviderManifest; .\build.ps1 -framework "netcoreapp2.0" Release -EmbedProviderManifest; .\build.ps1 -framework "netstandard1.6" Release -EmbedProviderManifest

# branches to build
branches:
# whitelist
only:
- master
- WIP
- ps: cd .\src; .\bootstrap.ps1; .\build.ps1 -framework "net452" Release -EmbedProviderManifest; .\build.ps1 -framework "netcoreapp2.0" Release -EmbedProviderManifest; .\build.ps1 -framework "netstandard1.6" Release -EmbedProviderManifest

deploy_script:
- ps: |
@@ -200,7 +200,7 @@ git submodule update --init
> .\bootstrap.ps1
# building OneGet for fullclr
> .\build.ps1 net451
> .\build.ps1 net452
#building OneGet for coreclr
> .\build.ps1 netstandard1.6
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net451;netcoreapp2.0;netstandard1.6</TargetFrameworks>
<TargetFrameworks>net452;netcoreapp2.0;netstandard1.6</TargetFrameworks>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<DelaySign>true</DelaySign>
<AssemblyName>Microsoft.PackageManagement.ArchiverProviders</AssemblyName>
@@ -26,7 +26,7 @@
</ItemGroup>


<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
<Reference Include="System.Runtime" />
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" />
@@ -47,7 +47,7 @@
<Reference Include="Microsoft.CSharp" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
<Compile Remove="Resources\Messages.resx" />
</ItemGroup>

@@ -22,7 +22,7 @@
},

"frameworks": {
"net451": {
"net452": {
"frameworkAssemblies": {
"System.Runtime": "",
"System.Xml": "",
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net451;netcoreapp2.0;netstandard1.6</TargetFrameworks>
<TargetFrameworks>net452;netcoreapp2.0;netstandard1.6</TargetFrameworks>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<DelaySign>true</DelaySign>
<AssemblyName>Microsoft.PackageManagement.CoreProviders</AssemblyName>
@@ -28,11 +28,11 @@
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
<PackageReference Include="System.Management.Automation" Version="6.0.0" />
</ItemGroup>
<ItemGroup Condition=" ('$(TargetFramework)' == 'net451') Or ('$(TargetFramework)' == 'netstandard1.6') ">
<ItemGroup Condition=" ('$(TargetFramework)' == 'net452') Or ('$(TargetFramework)' == 'netstandard1.6') ">
<PackageReference Include="System.Management.Automation" Version="1.0.0-alpha9" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
<Reference Include="System.Runtime" />
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" />
@@ -53,7 +53,7 @@
<Reference Include="Microsoft.CSharp" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
<Compile Remove="Resources\Messages.Designer.cs" />
<EmbeddedResource Remove="Resources\Messages.resx" />
</ItemGroup>
@@ -23,7 +23,7 @@
},

"frameworks": {
"net451": {
"net452": {
"frameworkAssemblies": {
"System.Runtime": "",
"System.Xml": "",
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net451;netcoreapp2.0;netstandard1.6</TargetFrameworks>
<TargetFrameworks>net452;netcoreapp2.0;netstandard1.6</TargetFrameworks>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<DelaySign>true</DelaySign>
<AssemblyName>Microsoft.PackageManagement.MetaProvider.PowerShell</AssemblyName>
@@ -25,11 +25,11 @@
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
<PackageReference Include="System.Management.Automation" Version="6.0.0" />
</ItemGroup>
<ItemGroup Condition=" ('$(TargetFramework)' == 'net451') Or ('$(TargetFramework)' == 'netstandard1.6') ">
<ItemGroup Condition=" ('$(TargetFramework)' == 'net452') Or ('$(TargetFramework)' == 'netstandard1.6') ">
<PackageReference Include="System.Management.Automation" Version="1.0.0-alpha9" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
<Reference Include="System.Runtime" />
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" />
@@ -50,7 +50,7 @@
<Reference Include="Microsoft.CSharp" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
<Compile Remove="Resources\Messages.Designer.cs" />
<EmbeddedResource Remove="Resources\Messages.resx" />
</ItemGroup>
@@ -179,7 +179,7 @@ public class PowerShellMetaProvider : IDisposable {

if (!File.Exists(_powershellProviderFunctionsPath))
{
// For now just try another level - sometimes this is the framework directory (e.g. net451)
// For now just try another level - sometimes this is the framework directory (e.g. net452)
// Need to fix the BaseFolder calculation
try
{
@@ -17,7 +17,7 @@
},

"frameworks": {
"net451": {
"net452": {
"frameworkAssemblies": {
"System.Runtime": "",
"System.Xml": "",
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net451</TargetFramework>
<TargetFramework>net452</TargetFramework>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<DelaySign>true</DelaySign>
<AssemblyName>Microsoft.PackageManagement.MsiProvider</AssemblyName>
@@ -27,12 +27,12 @@
<PackageReference Include="System.Management.Automation" Version="1.0.0-alpha9" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
<Compile Remove="Resources\Messages.Designer.cs" />
<EmbeddedResource Remove="Resources\Messages.resx" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
<Reference Include="System.Runtime" />
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" />
@@ -17,7 +17,7 @@
},

"frameworks": {
"net451": {
"net452": {
"frameworkAssemblies": {
"System.Runtime": "",
"System.Xml": "",
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net451</TargetFramework>
<TargetFramework>net452</TargetFramework>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<DelaySign>true</DelaySign>
<AssemblyName>Microsoft.PackageManagement.MsuProvider</AssemblyName>
@@ -27,12 +27,12 @@
<PackageReference Include="System.Management.Automation" Version="1.0.0-alpha9" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
<Compile Remove="Resources\Messages.Designer.cs" />
<EmbeddedResource Remove="Resources\Messages.resx" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
<Reference Include="System.Runtime" />
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" />
@@ -17,7 +17,7 @@
},

"frameworks": {
"net451": {
"net452": {
"frameworkAssemblies": {
"System.Runtime": "",
"System.Xml": "",
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net451;netcoreapp2.0;netstandard1.6</TargetFrameworks>
<TargetFrameworks>net452;netcoreapp2.0;netstandard1.6</TargetFrameworks>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<DelaySign>true</DelaySign>
<AssemblyName>Microsoft.PackageManagement</AssemblyName>
@@ -24,11 +24,11 @@
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
<PackageReference Include="System.Management.Automation" Version="6.0.0" />
</ItemGroup>
<ItemGroup Condition=" ('$(TargetFramework)' == 'net451') Or ('$(TargetFramework)' == 'netstandard1.6') ">
<ItemGroup Condition=" ('$(TargetFramework)' == 'net452') Or ('$(TargetFramework)' == 'netstandard1.6') ">
<PackageReference Include="System.Management.Automation" Version="1.0.0-alpha9" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
<Reference Include="System.Runtime" />
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" />
@@ -49,7 +49,7 @@
<Reference Include="Microsoft.CSharp" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
<Compile Remove="Resources\Messages.Designer.cs" />
<EmbeddedResource Remove="Resources\Messages.resx" />
</ItemGroup>
@@ -69,7 +69,7 @@
<EmbeddedResource Remove="Resources\Messages.resx" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
<Compile Remove="Resources\Messages.Designer.cs" />
<EmbeddedResource Remove="Resources\Messages.resx" />
</ItemGroup>
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net451;netcoreapp2.0;netstandard1.6</TargetFrameworks>
<TargetFrameworks>net452;netcoreapp2.0;netstandard1.6</TargetFrameworks>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<DelaySign>true</DelaySign>
<AssemblyName>Microsoft.PowerShell.PackageManagement</AssemblyName>
@@ -25,11 +25,11 @@
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
<PackageReference Include="System.Management.Automation" Version="6.0.0" />
</ItemGroup>
<ItemGroup Condition=" ('$(TargetFramework)' == 'net451') Or ('$(TargetFramework)' == 'netstandard1.6') ">
<ItemGroup Condition=" ('$(TargetFramework)' == 'net452') Or ('$(TargetFramework)' == 'netstandard1.6') ">
<PackageReference Include="System.Management.Automation" Version="1.0.0-alpha9" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
<Reference Include="System.Runtime" />
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" />
@@ -50,7 +50,7 @@
<Reference Include="Microsoft.CSharp" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
<Compile Remove="Resources\Messages.Designer.cs" />
<EmbeddedResource Remove="Resources\Messages.resx" />
</ItemGroup>
@@ -17,7 +17,7 @@
},

"frameworks": {
"net451": {
"net452": {
"frameworkAssemblies": {
"System.Runtime": "",
"System.Xml": "",
@@ -1,5 +1,5 @@
param(
[ValidateSet("net451", "netcoreapp2.0", "netstandard1.6", "all")]
[ValidateSet("net452", "netcoreapp2.0", "netstandard1.6", "all")]
[string]$Framework = "netcoreapp2.0",

[ValidateSet("Debug", "Release")]
@@ -62,7 +62,7 @@ Function CopyBinariesToDestinationDir($itemsToCopy, $destination, $framework, $c

if ($Framework -eq "all")
{
$frameworks = @('net451','netcoreapp2.0','netstandard1.6')
$frameworks = @('net452','netcoreapp2.0','netstandard1.6')
} else {
$frameworks = @($Framework)
}

0 comments on commit 90808d7

Please sign in to comment.