Skip to content
Browse files

Fixes package source persistence wrongly enabled

  • Loading branch information...
1 parent a34e23b commit 2d974478689c7a8b97fcd858bc2139e112fd1dc4 @serialseb serialseb committed Jan 23, 2012
Showing with 4 additions and 204 deletions.
  1. +0 −102 build/openwrap.proj
  2. +0 −38 build/self-build.test
  3. +0 −48 build/teamcity.proj
  4. +0 −8 build/test.bat
  5. +0 −4 src/OpenWrap.sln
  6. +4 −4 src/OpenWrap/Runtime/CurrentDirectoryEnvironment.cs
View
102 build/openwrap.proj
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="OpenWrap-Package" ToolsVersion="3.5">
- <PropertyGroup>
- <Root>$(MSBuildProjectDirectory)\..</Root>
- <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
- <PackageName Condition="'$(PackageName)' == ''">OpenWrap</PackageName>
- <OpenWrap-DescriptorPath Condition="'$(OpenWrap-DescriptorPath)' == ''">$(Root)\$(PackageName).wrapdesc</OpenWrap-DescriptorPath>
- <OpenWrap-BuildTasksDirectory Condition="'$(OpenWrap-BuildTasksDirectory)' == ''">$(Root)\wraps\openwrap\build</OpenWrap-BuildTasksDirectory>
- </PropertyGroup>
-
- <ItemGroup>
- <WrapBinary Include="$(Root)\src\**\*.csproj" />
- </ItemGroup>
- <Target Name="Clean">
- <Delete Files="$(Root)\scratch\build\**\*.*" ContinueOnError="true" />
- <Delete Files="$(Root)\scratch\package\**\*.*" ContinueOnError="true" />
- <RemoveDir Directories="$(Root)\scratch\build" ContinueOnError="true" />
- <RemoveDir Directories="$(Root)\scratch\package" ContinueOnError="true" />
- </Target>
- <Target Name="_Initialize">
- <InitializeOpenWrap />
- <ReadLinesFromFile File="$(Root)\version">
- <Output
- TaskParameter="Lines"
- ItemName="_PackageVersionItem"/>
-
- </ReadLinesFromFile>
- <PropertyGroup>
- <PackageVersion Condition="'$(PackageVersion)' == '' and '%(_PackageVersionItem.Identity)' != ''">%(_PackageVersionItem.Identity)</PackageVersion>
- <PackageVersion Condition="'$(PackageVersion)' == ''">0.0.1</PackageVersion>
- <PackageName>OpenWrap</PackageName>
- </PropertyGroup>
- <GenerateRevisionNumber Version="$(PackageVersion)">
- <Output PropertyName="PackageVersion" TaskParameter="OutputVersion" />
- </GenerateRevisionNumber>
- <PropertyGroup>
- <OpenWrap-PackageName Condition="'$(OpenWrap-PackageName)' == ''">openwrap-$(PackageVersion)</OpenWrap-PackageName>
- </PropertyGroup>
- <MakeDir Directories="$(Root)\bin" Condition="!Exists('$(Root)\bin')" />
- </Target>
- <Target Name="OpenWrap-Package" DependsOnTargets="Clean;_Initialize">
- <MSBuild Targets="Build" Projects="@(WrapBinary)" Properties="OutDir=$(Root)\scratch\build\%(Filename)\;Configuration=$(Configuration)" />
- <ItemGroup>
- <_DescriptorSource Include="$(OpenWrap-DescriptorPath)" />
- </ItemGroup>
- <Delete Files="$(Root)\scratch\build\version" Condition="Exists('$(Root)\scratch\build\version')" />
- <WriteLinesToFile File="$(Root)\scratch\build\version" Lines="$(PackageVersion)" />
- <Copy SourceFiles="@(_DescriptorSource)" DestinationFiles="$(Root)\scratch\build\$(PackageName).wrapdesc" />
- <ItemGroup>
- <BinFile Include="$(Root)\scratch\build\OpenWrap\OpenWrap.dll">
- <Export>bin-net35</Export>
- </BinFile>
- <BinFile Include="$(Root)\scratch\build\OpenWrap\OpenWrap.pdb">
- <Export>bin-net35</Export>
- </BinFile>
- <BinFile Include="$(Root)\scratch\build\OpenWrap\OpenFileSystem.dll">
- <Export>bin-net35</Export>
- </BinFile>
- <BinFile Include="$(Root)\scratch\build\OpenRasta.Client\OpenRasta.Client.dll">
- <Export>bin-net35</Export>
- </BinFile>
- <BinFile Include="$(Root)\scratch\build\OpenWrap\ICSharpCode.SharpZipLib.dll">
- <Export>bin-net35</Export>
- </BinFile>
- <BinFile Include="$(Root)\scratch\build\OpenWrap.Resharper.v450\OpenWrap.Resharper.450.dll">
- <Export>build</Export>
- </BinFile>
- <BinFile Include="$(Root)\scratch\build\OpenWrap.Resharper.v500\OpenWrap.Resharper.500.dll">
- <Export>build</Export>
- </BinFile>
- <BinFile Include="$(Root)\scratch\build\OpenWrap.Resharper.v510\OpenWrap.Resharper.510.dll">
- <Export>build</Export>
- </BinFile>
- <BinFile Include="$(Root)\scratch\build\OpenWrap.Resharper.v511\OpenWrap.Resharper.511.dll">
- <Export>build</Export>
- </BinFile>
- <BinFile Include="$(Root)\scratch\build\OpenWrap.Build.Tasks\OpenWrap.Build.Tasks.dll">
- <Export>build</Export>
- </BinFile>
- <BinFile Include="$(Root)\scratch\build\OpenWrap.Build.Tasks\OpenWrap.CSharp.targets">
- <Export>build</Export>
- </BinFile>
- <BinFile Include="$(Root)\scratch\build\OpenWrap.Build.Tasks\OpenWrap.tasks">
- <Export>build</Export>
- </BinFile>
- <BinFile Include="$(Root)\scratch\build\OpenWrap.Commands\OpenWrap.Commands.dll">
- <Export>commands</Export>
- </BinFile>
- <BinFile Include="$(Root)\scratch\build\OpenWrap.Commands\OpenWrap.Commands.pdb">
- <Export>commands</Export>
- </BinFile>
- <BinFile Include="$(Root)\scratch\build\$(OpenWrap-PackageName).wrapdesc" />
- <BinFile Include="$(Root)\scratch\build\version" />
- </ItemGroup>
-
- <PackageWrap
- Files="@(BinFile)"
- Destination="$(Root)\bin\$(OpenWrap-PackageName).wrap" />
- </Target>
- <Import Project="$(OpenWrap-BuildTasksDirectory)\OpenWrap.tasks" />
-
-</Project>
View
38 build/self-build.test
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Clean;Build">
- <PropertyGroup>
- <Root>$(MSBuildProjectDirectory)\..</Root>
- <OpenWrap-Debug Condition="'$(OpenWrap-Debug)' == ''">false</OpenWrap-Debug>
- <_DebugCommandLine Condition="$(OpenWrap-Debug)"> -debug</_DebugCommandLine>
- </PropertyGroup>
- <Target Name="Clean">
- <MSBuild Projects="openwrap.proj" Targets="Clean" />
- </Target>
- <Target Name="RemoveTemporaryPackages">
- <Message Importance="high" Text="Cleaning OpenWrap results" />
- <Delete Files="$(Root)\wraps\openwrap-42.0.0.0.wrap;$(Root)\wraps\openwrap-42.0.0.1.wrap;$(Root)\wraps\_cache\openwrap-42.0.0.0\**\*;$(Root)\wraps\_cache\openwrap-42.0.0.1\**\*;$(Root)\bin\openwrap-42.0.0.1.wrap;$(Root)\bin\openwrap-42.0.0.0.wrap" />
- <RemoveDir Directories="$(Root)\wraps\_cache\openwrap-42.0.0.1;$(Root)\wraps\_cache\openwrap-42.0.0.0" />
- </Target>
- <Target Name="OpenWrap-SelfBuild" DependsOnTargets="RemoveTemporaryPackages">
-
- <Message Importance="high" Text="Building OpenWrap from existing dependencies." />
-
- <MSBuild Projects="openwrap.proj" Properties="PackageVersion=42.0.0.0;" />
-
- <!-- Now attempt installing the package to the local repository-->
- <PropertyGroup>
- <OpenWrap-CommandLine>$(Root)\scratch\build\OpenWrap.Console\o.exe</OpenWrap-CommandLine>
- </PropertyGroup>
-
- <Message Importance="high" Text="Installing openwrap to new location, from directory $(Root)\bin\" />
- <Exec Command='"$(OpenWrap-CommandLine)" wrap add openwrap -ProjectOnly -NoDescriptorUpdate$(_DebugCommandLine)' WorkingDirectory="$(Root)\bin\" />
-
- <Message Importance="high" Text="Building OpenWrap from newly built version of OpenWrap" />
-
- <MSBuild Projects="openwrap.proj" Properties="PackageVersion=42.0.0.1;" ContinueOnError="true" />
- </Target>
- <Target Name="Build" DependsOnTargets="RemoveTemporaryPackages; OpenWrap-SelfBuild">
- <Delete Files="$(Root)\wraps\openwrap-42.0.0.0.wrap;$(Root)\wraps\openwrap-42.0.0.1.wrap;$(Root)\wraps\_cache\openwrap-42.0.0.0\**\*;$(Root)\wraps\_cache\openwrap-42.0.0.1\**\*;$(Root)\bin\openwrap-42.0.0.1.wrap;$(Root)\bin\openwrap-42.0.0.0.wrap" />
- <RemoveDir Directories="$(Root)\wraps\_cache\openwrap-42.0.0.1;$(Root)\wraps\_cache\openwrap-42.0.0.0" />
- </Target>
-</Project>
View
48 build/teamcity.proj
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" ToolsVersion="3.5" InitialTargets="_Initialize">
- <PropertyGroup>
- <OpenWrap-BuildTasksDirectory>$(MSBuildProjectDirectory)\..\wraps\openwrap\build</OpenWrap-BuildTasksDirectory>
- </PropertyGroup>
-
- <Target Name="_Initialize">
-
- <!-- Initializes the environment and remote repositories -->
-
- <InitializeOpenWrap CurrentDirectory="$(MSBuildProjectDirectory)\..">
- <Output TaskParameter="Name" PropertyName="OpenWrap-PackageName" />
- </InitializeOpenWrap>
-
-
- </Target>
- <Target Name="Build" DependsOnTargets="_Initialize">
-
-
- <!-- Builds the package -->
-
- <RunCommand
- Verb="build"
- Noun="wrap" />
-
-
- </Target>
-
- <Target Name="Publish" DependsOnTargets="Build">
-
- <!-- Deploys the package -->
-
-
- <PropertyGroup>
- <PublishArguments>
- <Name>$(OpenWrap-PackageName)</Name>
- <Remote>file://galaxy.caffeine-it.net/packages</Remote>
- </PublishArguments>
- </PropertyGroup>
-
-
- <RunCommand
- Verb="publish"
- Noun="wrap"
- Args="$(PublishArguments)" />
- </Target>
- <Import Project="..\wraps\openwrap\build\OpenWrap.tasks"/>
-</Project>
View
8 build/test.bat
@@ -1,8 +0,0 @@
-rd ..\wraps\cache\OpenWrap-1.0.42 /S /Q
-del ..\wraps\OpenWrap-1.0.42.wrap /F /Q
-
-copy /Y ..\scratch\bin\OpenWrap-Debug-AnyCPU\*.* ..\wraps\openwrap\bin-net35
-copy /Y ..\scratch\bin\OpenWrap.Build.Tasks-Debug-AnyCPU\*.* ..\wraps\openwrap\build
-copy /Y ..\scratch\bin\OpenWrap.Commands-Debug-AnyCPU\*.* ..\wraps\openwrap\commands
-pause
-msbuild self-build.test
View
4 src/OpenWrap.sln
@@ -2,10 +2,6 @@
Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{20503E9F-CA3D-496B-8842-B1FE7D39B1E7}"
- ProjectSection(SolutionItems) = preProject
- ..\build\openwrap.proj = ..\build\openwrap.proj
- ..\build\self-build.test = ..\build\self-build.test
- EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{FF7BA218-B2A1-462A-8F51-153337027853}"
ProjectSection(SolutionItems) = preProject
View
8 src/OpenWrap/Runtime/CurrentDirectoryEnvironment.cs
@@ -106,12 +106,12 @@ void TryInitializeProjectRepository()
var repositoryOptions = FolderRepositoryOptions.AnchoringEnabled |
- FolderRepositoryOptions.SupportLocks |
- FolderRepositoryOptions.PersistPackageSources;
+ FolderRepositoryOptions.SupportLocks;
+ //| FolderRepositoryOptions.PersistPackageSources;
if (Descriptor.UseSymLinks)
repositoryOptions |= FolderRepositoryOptions.UseSymLinks;
- if (Descriptor.StorePackages)
- repositoryOptions |= FolderRepositoryOptions.PersistPackages;
+ //if (Descriptor.StorePackages)
+ // repositoryOptions |= FolderRepositoryOptions.PersistPackages;
BeforeProjectRepositoryInitialized(projectRepositoryDirectory, repositoryOptions);
_projectRepository = new FolderRepository(projectRepositoryDirectory, repositoryOptions)
{

0 comments on commit 2d97447

Please sign in to comment.
Something went wrong with that request. Please try again.