diff options
| author | Lluis Sanchez <llsan@microsoft.com> | 2019-04-02 14:47:19 +0300 |
|---|---|---|
| committer | Lluis Sanchez <llsan@microsoft.com> | 2019-04-02 14:47:19 +0300 |
| commit | 034efec5570d1ca12d7314ce2447692e379f446f (patch) | |
| tree | 2ea03cbffcf1167f8b4b931a139729d496f073f6 /main/src/addins/MonoDevelop.Packaging | |
| parent | 8fc7d7e202598c31fdbb54d84e3e1fcd1003eb1c (diff) | |
| parent | 0331b37ed370c639781c87ac969992f362d34eb0 (diff) | |
Merge remote-tracking branch 'xamarin/master-vnext' into new-service-model
Diffstat (limited to 'main/src/addins/MonoDevelop.Packaging')
4 files changed, 7 insertions, 7 deletions
diff --git a/main/src/addins/MonoDevelop.Packaging/MonoDevelop.Packaging.csproj b/main/src/addins/MonoDevelop.Packaging/MonoDevelop.Packaging.csproj index d1da520ca1..bc0bde87a3 100644 --- a/main/src/addins/MonoDevelop.Packaging/MonoDevelop.Packaging.csproj +++ b/main/src/addins/MonoDevelop.Packaging/MonoDevelop.Packaging.csproj @@ -7,7 +7,7 @@ <ProjectGuid>{443311BF-766D-4863-B5A1-AFAA7F41DBDA}</ProjectGuid> <TargetFrameworkVersion>$(MDFrameworkVersion)</TargetFrameworkVersion> <OutputPath>..\..\..\build\AddIns\MonoDevelop.Packaging</OutputPath> - <_BuildPackagingVersion>0.2.0</_BuildPackagingVersion> + <_BuildPackagingVersion>0.2.5-dev.8</_BuildPackagingVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " /> diff --git a/main/src/addins/MonoDevelop.Packaging/MonoDevelop.Packaging/DotNetProjectExtensions.cs b/main/src/addins/MonoDevelop.Packaging/MonoDevelop.Packaging/DotNetProjectExtensions.cs index 8f6eb98264..b973cfecd6 100644 --- a/main/src/addins/MonoDevelop.Packaging/MonoDevelop.Packaging/DotNetProjectExtensions.cs +++ b/main/src/addins/MonoDevelop.Packaging/MonoDevelop.Packaging/DotNetProjectExtensions.cs @@ -70,7 +70,7 @@ namespace MonoDevelop.Packaging public static void InstallBuildPackagingNuGetPackage (IEnumerable<Project> projects) { string packagesFolder = GetPackagesFolder (); - var packageReference = new PackageManagementPackageReference ("NuGet.Build.Packaging", "0.2.0"); + var packageReference = new PackageManagementPackageReference ("NuGet.Build.Packaging", "0.2.5-dev.8"); var packageReferences = new [] { packageReference }; diff --git a/main/src/addins/MonoDevelop.Packaging/Templates/CrossPlatformLibrary.xpt.xml b/main/src/addins/MonoDevelop.Packaging/Templates/CrossPlatformLibrary.xpt.xml index 2bfa014101..bbc1befa97 100644 --- a/main/src/addins/MonoDevelop.Packaging/Templates/CrossPlatformLibrary.xpt.xml +++ b/main/src/addins/MonoDevelop.Packaging/Templates/CrossPlatformLibrary.xpt.xml @@ -29,7 +29,7 @@ DefaultNamespace="${ProjectName}" HideGettingStarted="true" /> <Packages> - <Package ID="NuGet.Build.Packaging" Version="0.2.0" directory="../packages" /> + <Package ID="NuGet.Build.Packaging" Version="0.2.5-dev.8" directory="../packages" /> </Packages> <Files> <FileTemplateReference TemplateID="EmptyClass" name="MyClass.cs" /> @@ -50,7 +50,7 @@ <Reference type="Project" refto="${ProjectName}.Shared" /> </References> <Packages> - <Package ID="NuGet.Build.Packaging" Version="0.2.0" directory="../packages" /> + <Package ID="NuGet.Build.Packaging" Version="0.2.5-dev.8" directory="../packages" /> </Packages> <Files> <FileTemplateReference TemplateID="CSharpAssemblyInfo" name="AssemblyInfo.cs" /> @@ -67,7 +67,7 @@ <Reference type="Project" refto="${ProjectName}.Shared" /> </References> <Packages> - <Package ID="NuGet.Build.Packaging" Version="0.2.0" directory="../packages" /> + <Package ID="NuGet.Build.Packaging" Version="0.2.5-dev.8" directory="../packages" /> </Packages> <Files> <FileTemplateReference TemplateID="CSharpAssemblyInfo" name="AssemblyInfo.cs" /> @@ -77,7 +77,7 @@ <Project name="${ProjectName}.NuGet" directory="${ProjectName}.NuGet" type="NuGetPackaging" if="CreateNuGetProject"> <Options TargetFrameworkVersion="4.5" DefaultNamespace="${ProjectName}" HideGettingStarted="true" /> <Packages> - <Package ID="NuGet.Build.Packaging" Version="0.2.0" directory="../packages" /> + <Package ID="NuGet.Build.Packaging" Version="0.2.5-dev.8" directory="../packages" /> </Packages> <References> <Reference type="Project" refto="${ProjectName}.Android" if="CreateAndroidProject" /> diff --git a/main/src/addins/MonoDevelop.Packaging/Templates/PackagingProject.xpt.xml b/main/src/addins/MonoDevelop.Packaging/Templates/PackagingProject.xpt.xml index e5d699884f..82dbbd1fc5 100644 --- a/main/src/addins/MonoDevelop.Packaging/Templates/PackagingProject.xpt.xml +++ b/main/src/addins/MonoDevelop.Packaging/Templates/PackagingProject.xpt.xml @@ -18,7 +18,7 @@ <Project name="${ProjectName}" directory="." type="NuGetPackaging"> <Options TargetFrameworkVersion="4.5" /> <Packages> - <Package ID="NuGet.Build.Packaging" Version="0.2.0" directory="../packages" /> + <Package ID="NuGet.Build.Packaging" Version="0.2.5-dev.8" directory="../packages" /> </Packages> <Files> <File name="readme.txt"><![CDATA[ |