Skip to content

Commit

Permalink
New binaries
Browse files Browse the repository at this point in the history
  • Loading branch information
serialseb committed May 16, 2012
1 parent ddc20ad commit d75ed3a
Show file tree
Hide file tree
Showing 33 changed files with 171 additions and 82 deletions.
Binary file added wraps/openwrap-2.0.3+26.wrap
Binary file not shown.
Binary file removed wraps/openwrap-2.0.3+5.wrap
Binary file not shown.
Binary file modified wraps/openwrap/bin-net35/OpenRasta.Client.dll
Binary file not shown.
Binary file modified wraps/openwrap/bin-net35/OpenRasta.Client.pdb
Binary file not shown.
Binary file modified wraps/openwrap/bin-net35/OpenWrap.VisualStudio.Shared.dll
Binary file not shown.
Binary file modified wraps/openwrap/bin-net35/OpenWrap.VisualStudio.Shared.pdb
Binary file not shown.
Binary file modified wraps/openwrap/bin-net35/OpenWrap.VisualStudio.SolutionAddIn.dll
Binary file not shown.
Binary file modified wraps/openwrap/bin-net35/OpenWrap.VisualStudio.SolutionAddIn.pdb
Binary file not shown.
Binary file modified wraps/openwrap/bin-net35/OpenWrap.dll
Binary file not shown.
Binary file modified wraps/openwrap/bin-net35/OpenWrap.pdb
Binary file not shown.
Binary file modified wraps/openwrap/build/OpenWrap.Build.Bootstrap.dll
Binary file not shown.
Binary file modified wraps/openwrap/build/OpenWrap.Build.Bootstrap.pdb
Binary file not shown.
Binary file modified wraps/openwrap/build/OpenWrap.Build.Tasks.dll
Binary file not shown.
Binary file modified wraps/openwrap/build/OpenWrap.Build.Tasks.pdb
Binary file not shown.
243 changes: 168 additions & 75 deletions wraps/openwrap/build/OpenWrap.CSharp.targets
Expand Up @@ -37,7 +37,7 @@
<OpenWrap-IncludeBinFiles Condition="'$(OpenWrap-IncludeBinFiles)' == ''">true</OpenWrap-IncludeBinFiles> <OpenWrap-IncludeBinFiles Condition="'$(OpenWrap-IncludeBinFiles)' == ''">true</OpenWrap-IncludeBinFiles>
<OpenWrap-IncludeSourceFiles Condition="'$(OpenWrap-IncludeSourceFiles)' == ''">false</OpenWrap-IncludeSourceFiles> <OpenWrap-IncludeSourceFiles Condition="'$(OpenWrap-IncludeSourceFiles)' == ''">false</OpenWrap-IncludeSourceFiles>
<OpenWrap-IncludeContentFiles Condition="'$(OpenWrap-IncludeContentFiles)' == ''">false</OpenWrap-IncludeContentFiles> <OpenWrap-IncludeContentFiles Condition="'$(OpenWrap-IncludeContentFiles)' == ''">false</OpenWrap-IncludeContentFiles>

<_OpenWrap-GenerateSharedAssemblyInfo>False</_OpenWrap-GenerateSharedAssemblyInfo> <_OpenWrap-GenerateSharedAssemblyInfo>False</_OpenWrap-GenerateSharedAssemblyInfo>
<_OpenWrap-GenerateSharedAssemblyInfo Condition="Exists('$(OpenWrap-SharedAssemblyInfoFile)')">False</_OpenWrap-GenerateSharedAssemblyInfo> <_OpenWrap-GenerateSharedAssemblyInfo Condition="Exists('$(OpenWrap-SharedAssemblyInfoFile)')">False</_OpenWrap-GenerateSharedAssemblyInfo>
</PropertyGroup> </PropertyGroup>
Expand All @@ -48,9 +48,15 @@
<Output TaskParameter="Scope" PropertyName="_OpenWrap-Scope" Condition="'$(OpenWrap-Scope)' == ''" /> <Output TaskParameter="Scope" PropertyName="_OpenWrap-Scope" Condition="'$(OpenWrap-Scope)' == ''" />
<Output TaskParameter="DescriptorPath" PropertyName="_OpenWrap-DescriptorPath" Condition="'$(OpenWrap-DescriptorPath)' == ''" /> <Output TaskParameter="DescriptorPath" PropertyName="_OpenWrap-DescriptorPath" Condition="'$(OpenWrap-DescriptorPath)' == ''" />
</InitializeOpenWrap> </InitializeOpenWrap>
<PropertyGroup>
<CreateProperty Condition="'$(OpenWrap-DescriptorPath)' != ''" Value="$(OpenWrap-DescriptorPath)">
<Output TaskParameter="Value" PropertyName="_OpenWrap-DescriptorPath" />
</CreateProperty>

<!--<PropertyGroup>
<_OpenWrap-DescriptorPath Condition="'$(OpenWrap-DescriptorPath)' != ''">$(OpenWrap-DescriptorPath)</_OpenWrap-DescriptorPath> <_OpenWrap-DescriptorPath Condition="'$(OpenWrap-DescriptorPath)' != ''">$(OpenWrap-DescriptorPath)</_OpenWrap-DescriptorPath>
</PropertyGroup> </PropertyGroup>-->

<InitializeVisualStudioIntegration <InitializeVisualStudioIntegration
EnableVisualStudioIntegration="$(OpenWrap-EnableVisualStudioIntegration)" EnableVisualStudioIntegration="$(OpenWrap-EnableVisualStudioIntegration)"
/> />
Expand All @@ -69,10 +75,13 @@
</PropertyGroup> </PropertyGroup>


<Target Name="OpenWrap-ResolveReferences" DependsOnTargets="OpenWrap-Initialize"> <Target Name="OpenWrap-ResolveReferences" DependsOnTargets="OpenWrap-Initialize">

<CreateItem Condition="Exists('$(OpenWrap-SharedAssemblyInfoFile)')" Include="$(OpenWrap-SharedAssemblyInfoFile)">
<ItemGroup Condition="Exists('$(OpenWrap-SharedAssemblyInfoFile)')"> <Output TaskParameter="Include" ItemName="Compile"/>
</CreateItem>

<!--<ItemGroup Condition="Exists('$(OpenWrap-SharedAssemblyInfoFile)')">
<Compile Include="$(OpenWrap-SharedAssemblyInfoFile)" /> <Compile Include="$(OpenWrap-SharedAssemblyInfoFile)" />
</ItemGroup> </ItemGroup>-->
<ResolveWrapReferences <ResolveWrapReferences
WrapDescriptor="$(_OpenWrap-DescriptorPath)" WrapDescriptor="$(_OpenWrap-DescriptorPath)"
WrapsDirectory="$(OpenWrap-ProjectRepositoryPath)" WrapsDirectory="$(OpenWrap-ProjectRepositoryPath)"
Expand All @@ -87,101 +96,185 @@
<Output TaskParameter="OutputReferences" ItemName="Reference" /> <Output TaskParameter="OutputReferences" ItemName="Reference" />


</ResolveWrapReferences> </ResolveWrapReferences>
<ItemGroup> <CreateItem Include="@(_OpenWrap-GeneratedSharedAssemblyInfo)">
<Output TaskParameter="Include" ItemName="Compile" />
</CreateItem>
<!--<ItemGroup>
<Compile Include="@(_OpenWrap-GeneratedSharedAssemblyInfo)" /> <Compile Include="@(_OpenWrap-GeneratedSharedAssemblyInfo)" />
</ItemGroup> </ItemGroup>-->
</Target> </Target>


<Target Name="OpenWrap-BeforeBuild" DependsOnTargets="OpenWrap-Initialize"> <Target Name="OpenWrap-BeforeBuild" DependsOnTargets="OpenWrap-Initialize">


</Target> </Target>




<ItemDefinitionGroup> <Target Name="OpenWrap-AfterBuild"
<_OpenWrap-CurrentBuildOutput> Condition="'$(OpenWrap-EmitOutputInstructions)' != 'false'">

<!-- Build results for the current project and associated project references-->


<!-- Binary result (.exe or .dll) -->
<CreateItem Include="@(IntermediateAssembly)" AdditionalMetadata="TargetPath=.">
<Output TaskParameter="Include" ItemName="_OpenWrap-CurrentBuildOutput"/>
</CreateItem>

<!-- Additional .netmodule files (?) -->
<CreateItem Include="@(AddModule)" AdditionalMetadata="TargetPath=.">
<Output TaskParameter="Include" ItemName="_OpenWrap-CurrentBuildOutput"/>
</CreateItem>

<!-- Serialization assemblies -->
<CreateItem Include="$(IntermediateOutputPath)$(_SGenDllName)" Condition="'$(_SGenDllCreated)' == 'true'" AdditionalMetadata="TargetPath=.">
<Output TaskParameter="Include" ItemName="_OpenWrap-CurrentBuildOutput"/>
</CreateItem>

<!-- PDB files-->
<CreateItem Include="@(_DebugSymbolsIntermediatePath)" AdditionalMetadata="TargetPath=.">
<Output TaskParameter="Include" ItemName="_OpenWrap-CurrentBuildOutput"/>
</CreateItem>

<!-- XML doc file -->
<CreateItem Include="@(FinalDocFile)" AdditionalMetadata="TargetPath=.">
<Output TaskParameter="Include" ItemName="_OpenWrap-CurrentBuildOutput"/>
</CreateItem>

<!-- Satellite assemblies -->
<CreateItem Include="@(IntermediateSatelliteAssembliesWithTargetPath)" AdditionalMetadata="TargetPath=%(IntermediateSatelliteAssembliesWithTargetPath.TargetPath)">
<Output TaskParameter="Include" ItemName="_OpenWrap-CurrentBuildOutput"/>
</CreateItem>

<!-- COM References -->
<CreateItem Include="@(ReferenceComWrappersToCopyLocal); @(ResolvedIsolatedComModules); @(_DeploymentLooseManifestFile); @(NativeReferenceFile)"
AdditionalMetadata="TargetPath=.">
<Output TaskParameter="Include" ItemName="_OpenWrap-CurrentBuildOutput"/>
</CreateItem>

<!-- All project references and associated files (contracts, symbols, xml, etc) -->
<CreateItem Include="@(ReferenceCopyLocalPaths)"
AdditionalMetadata="TargetPath=%(ReferenceCopyLocalPaths.DestinationSubDirectory)">
<Output TaskParameter="Include" ItemName="_OpenWrap-CurrentBuildOutput"/>
</CreateItem>

<!-- All things with CopyToOutputDirectory in project -->
<CreateItem Include="@(AllItemsFullPathWithTargetPath)"
AdditionalMetadata="TargetPath=%(AllItemsFullPathWithTargetPath.TargetPath)">
<Output TaskParameter="Include" ItemName="_OpenWrap-CurrentBuildOutput"/>
</CreateItem>

<!-- Application config files -->
<CreateItem Include="@(AppConfigWithTargetPath)"
AdditionalMetadata="TargetPath=%(AppConfigWithTargetPath.TargetPath)">
<Output TaskParameter="Include" ItemName="_OpenWrap-CurrentBuildOutput"/>
</CreateItem>

<!-- All of those files that were not included by OpenWrap itself -->
<CreateItem Include="@(_OpenWrap-CurrentBuildOutput)"
Condition="'%(_OpenWrap-CurrentBuildOutput.FromOpenWrap)' != 'True'"
AdditionalMetadata="TargetPath=.">
<Output TaskParameter="Include" ItemName="_OpenWrap-FilteredBuildOutput"/>
</CreateItem>

<!-- Source files -->
<CreateItem Include="@(Compile)">
<Output TaskParameter="Include" ItemName="_OpenWrap-SourceOutput"/>
</CreateItem>

<CreateItem Include="@(Content)" Condition="'%(Content.FromOpenWrap)' != 'True'"
AdditionalMetadata="TargetPath=%(Content.Link)">
<Output TaskParameter="Include" ItemName="_OpenWrap-FilteredContent"/>
</CreateItem>

<!--<ItemGroup>
--><!-- Binary result (.exe or .dll) --><!--
--><!--<_OpenWrap-CurrentBuildOutput Include="@(IntermediateAssembly)">
<TargetPath>.</TargetPath> <TargetPath>.</TargetPath>
</_OpenWrap-CurrentBuildOutput> </_OpenWrap-CurrentBuildOutput>--><!--
</ItemDefinitionGroup>
<Target Name="OpenWrap-AfterBuild" --><!-- Additional .netmodule files (?) --><!--
Condition="'$(OpenWrap-EmitOutputInstructions)' != 'false'"> --><!--<_OpenWrap-CurrentBuildOutput Include="@(AddModule)">
<TargetPath>.</TargetPath>
</_OpenWrap-CurrentBuildOutput>--><!--
<!-- Build results for the current project and associated project references--> --><!-- Serialization assemblies --><!--
<ItemGroup> --><!--<_OpenWrap-CurrentBuildOutput Include="$(IntermediateOutputPath)$(_SGenDllName)" Condition="'$(_SGenDllCreated)' == 'true'">
<!-- Binary result (.exe or .dll) --> <TargetPath>.</TargetPath>
<_OpenWrap-CurrentBuildOutput Include="@(IntermediateAssembly)" /> </_OpenWrap-CurrentBuildOutput>--><!--
--><!-- PDB files--><!--
--><!--<_OpenWrap-CurrentBuildOutput Include="@(_DebugSymbolsIntermediatePath)">
<TargetPath>.</TargetPath>
</_OpenWrap-CurrentBuildOutput>--><!--
<!-- Additional .netmodule files (?) --> --><!-- XML doc file --><!--
<_OpenWrap-CurrentBuildOutput Include="@(AddModule)" /> --><!--<_OpenWrap-CurrentBuildOutput Include="@(FinalDocFile)">
<TargetPath>.</TargetPath>
</_OpenWrap-CurrentBuildOutput>--><!--
<!-- Serialization assemblies --> --><!-- Satellite assemblies --><!--
<_OpenWrap-CurrentBuildOutput Include="$(IntermediateOutputPath)$(_SGenDllName)" Condition="'$(_SGenDllCreated)' == 'true'" /> --><!--<_OpenWrap-CurrentBuildOutput Include="@(IntermediateSatelliteAssembliesWithTargetPath)">
<TargetPath>%(IntermediateSatelliteAssembliesWithTargetPath.TargetPath)</TargetPath>
</_OpenWrap-CurrentBuildOutput>--><!--
<!-- PDB files--> --><!-- COM References --><!--
<_OpenWrap-CurrentBuildOutput Include="@(_DebugSymbolsIntermediatePath)" /> --><!--<_OpenWrap-CurrentBuildOutput Include="@(ReferenceComWrappersToCopyLocal); @(ResolvedIsolatedComModules); @(_DeploymentLooseManifestFile); @(NativeReferenceFile)">
<TargetPath>.</TargetPath>
</_OpenWrap-CurrentBuildOutput>--><!--
--><!-- All project references and associated files (contracts, symbols, xml, etc) --><!--
--><!--<_OpenWrap-CurrentBuildOutput Include="@(ReferenceCopyLocalPaths)">
<TargetPath>%(ReferenceCopyLocalPaths.DestinationSubDirectory)</TargetPath>
</_OpenWrap-CurrentBuildOutput>--><!--
<!-- XML doc file --> --><!-- All things with CopyToOutputDirectory in project --><!--
<_OpenWrap-CurrentBuildOutput Include="@(FinalDocFile)" /> --><!--<_OpenWrap-CurrentBuildOutput Include="@(AllItemsFullPathWithTargetPath)">
<TargetPath>%(AllItemsFullPathWithTargetPath.TargetPath)</TargetPath>
</_OpenWrap-CurrentBuildOutput>--><!--
<!-- Satellite assemblies --> --><!-- Application config files --><!--
<_OpenWrap-CurrentBuildOutput Include="@(IntermediateSatelliteAssembliesWithTargetPath)"> --><!--<_OpenWrap-CurrentBuildOutput Include="@(AppConfigWithTargetPath)">
<TargetPath>%(IntermediateSatelliteAssembliesWithTargetPath.TargetPath)</TargetPath> <TargetPath>%(AppConfigWithTargetPath.TargetPath)</TargetPath>
</_OpenWrap-CurrentBuildOutput> </_OpenWrap-CurrentBuildOutput>--><!--
<!-- COM References --> --><!-- All of those files that were not included by OpenWrap itself --><!--
<_OpenWrap-CurrentBuildOutput Include="@(ReferenceComWrappersToCopyLocal); @(ResolvedIsolatedComModules); @(_DeploymentLooseManifestFile); @(NativeReferenceFile)" /> --><!--<_OpenWrap-FilteredBuildOutput Include="@(_OpenWrap-CurrentBuildOutput)" Condition="'%(_OpenWrap-CurrentBuildOutput.FromOpenWrap)' != 'True'" />--><!--
<!-- All project references and associated files (contracts, symbols, xml, etc) -->
<_OpenWrap-CurrentBuildOutput Include="@(ReferenceCopyLocalPaths)">
<TargetPath>%(ReferenceCopyLocalPaths.DestinationSubDirectory)</TargetPath>
</_OpenWrap-CurrentBuildOutput>
<!-- All things with CopyToOutputDirectory in project --> --><!--<_OpenWrap-SourceOutput Include="@(Compile)" />--><!--
<_OpenWrap-CurrentBuildOutput Include="@(AllItemsFullPathWithTargetPath)">
<TargetPath>%(AllItemsFullPathWithTargetPath.TargetPath)</TargetPath>
</_OpenWrap-CurrentBuildOutput>
<!-- Application config files --> --><!--<_OpenWrap-FilteredContent Include="@(Content)" Condition="'%(Content.FromOpenWrap)' != 'True'">
<_OpenWrap-CurrentBuildOutput Include="@(AppConfigWithTargetPath)"> <TargetPath>%(Content.Link)</TargetPath>
<TargetPath>%(AppConfigWithTargetPath.TargetPath)</TargetPath> </_OpenWrap-FilteredContent>--><!--
</_OpenWrap-CurrentBuildOutput> </ItemGroup>-->


<!-- All of those files that were not included by OpenWrap itself -->
<_OpenWrap-FilteredBuildOutput Include="@(_OpenWrap-CurrentBuildOutput)" Condition="'%(_OpenWrap-CurrentBuildOutput.FromOpenWrap)' != 'True'" />



<Message Text="@(Content->'%(Link) -> %(FullPath)')" Importance="high" />
<_OpenWrap-SourceOutput Include="@(Compile)" />


<_OpenWrap-FilteredContent Include="@(Content)" Condition="'%(Content.FromOpenWrap)' != 'True'"> <CreateProperty Condition="'$(OpenWrap-CurrentProjectFile)' == '' or '$(OpenWrap-CurrentProjectFile)' == '$(MSBuildProjectDirectory)\$(MSBuildProjectFile)'"
<TargetPath>%(Content.Link)</TargetPath> Value="true">
</_OpenWrap-FilteredContent> <Output TaskParameter="Value" PropertyName="_OpenWrap-IsEntryPointProject" />
</ItemGroup> </CreateProperty>

<!--<PropertyGroup>

<_OpenWrap-IsEntryPointProject Condition="'$(OpenWrap-CurrentProjectFile)' == '' or '$(OpenWrap-CurrentProjectFile)' == '$(MSBuildProjectDirectory)\$(MSBuildProjectFile)'">true</_OpenWrap-IsEntryPointProject>

</PropertyGroup>-->

<Message Text="%(_OpenWrap-AllAssemblyReferenceFiles.RelativeDir)" Importance="high" />
<!--<Message Text="Build result: @(_OpenWrap-CurrentBuildOutput->'%(FullPath) in %(TargetPath)') " Importance="high" Condition="'%(_OpenWrap-CurrentBuildOutput.FromOpenWrap)' != 'True'"/>--> <PublishPackageContent
<Message Text="@(Content->'%(Link) -> %(FullPath)')" Importance="high" /> Condition="'$(_OpenWrap-IsEntryPointProject)' == 'true'"
<PropertyGroup>
<_OpenWrap-IsEntryPointProject Condition="'$(OpenWrap-CurrentProjectFile)' == '' or '$(OpenWrap-CurrentProjectFile)' == '$(MSBuildProjectDirectory)\$(MSBuildProjectFile)'">true</_OpenWrap-IsEntryPointProject>
</PropertyGroup>
<Message Text="%(_OpenWrap-AllAssemblyReferenceFiles.RelativeDir)" Importance="high" />
<PublishPackageContent
Condition="'$(_OpenWrap-IsEntryPointProject)' == 'true'"


IncludeBinFiles="$(OpenWrap-IncludeBinFiles)" IncludeBinFiles="$(OpenWrap-IncludeBinFiles)"
IncludePdbFiles="$(OpenWrap-IncludePdbFiles)" IncludePdbFiles="$(OpenWrap-IncludePdbFiles)"
IncludeCodeDocFiles="$(OpenWrap-IncludeCodeDocFiles)" IncludeCodeDocFiles="$(OpenWrap-IncludeCodeDocFiles)"
IncludeSourceFiles="$(OpenWRap-IncludeSourceFiles)" IncludeSourceFiles="$(OpenWRap-IncludeSourceFiles)"
IncludeContentFiles="$(OpenWrap-IncludeContentFiles)" IncludeContentFiles="$(OpenWrap-IncludeContentFiles)"


RootPath="$(RootSolutionDirectory)" RootPath="$(RootSolutionDirectory)"
ExportName="$(OpenWrap-ExportName)" ExportName="$(OpenWrap-ExportName)"
AllowBinDuplicates="$(OpenWrap-AllowBinDuplicates)" AllowBinDuplicates="$(OpenWrap-AllowBinDuplicates)"


ContentFiles="@(_OpenWrap-FilteredContent)" ContentFiles="@(_OpenWrap-FilteredContent)"
BuildOutputFiles="@(_OpenWrap-FilteredBuildOutput)" BuildOutputFiles="@(_OpenWrap-FilteredBuildOutput)"
SourceFiles="@(_OpenWrap-SourceFiles)" SourceFiles="@(_OpenWrap-SourceFiles)"
/> />
<Delete Files="@(_OpenWrap-GeneratedSharedAssembly)" Condition="'$(_OpenWrap-GenerateSharedAssemblyInfo)' == 'True'" TreatErrorsAsWarnings="true" /> <Delete Files="@(_OpenWrap-GeneratedSharedAssembly)" Condition="'$(_OpenWrap-GenerateSharedAssemblyInfo)' == 'True'" TreatErrorsAsWarnings="true" />
</Target> </Target>
Expand Down
Binary file modified wraps/openwrap/commands-net35/OpenWrap.Commands.dll
Binary file not shown.
Binary file modified wraps/openwrap/commands-net35/OpenWrap.Commands.pdb
Binary file not shown.
Binary file modified wraps/openwrap/commands-net35/OpenWrap.Testing.dll
Binary file not shown.
Binary file modified wraps/openwrap/commands-net35/OpenWrap.Testing.pdb
Binary file not shown.
8 changes: 2 additions & 6 deletions wraps/openwrap/openwrap.wrapdesc
Expand Up @@ -23,10 +23,6 @@ assembly-info: assembly-info
assembly-info: build assembly-info: build
assembly-info: description assembly-info: description
assembly-info: trademark assembly-info: trademark
<<<<<<< HEAD
semantic-version: 2.0.3+5
=======
include-legacy-version: true include-legacy-version: true
semantic-version: 2.0.3+24 semantic-version: 2.0.3+26
version: 2.0.3.24 version: 2.0.3.26
>>>>>>> 2d7fc0c... Adds support for optionally including version header for 1.0 compat
Binary file modified wraps/openwrap/solution/OpenWrap.Resharper.450.dll
Binary file not shown.
Binary file modified wraps/openwrap/solution/OpenWrap.Resharper.450.pdb
Binary file not shown.
Binary file modified wraps/openwrap/solution/OpenWrap.Resharper.500.dll
Binary file not shown.
Binary file modified wraps/openwrap/solution/OpenWrap.Resharper.500.pdb
Binary file not shown.
Binary file modified wraps/openwrap/solution/OpenWrap.Resharper.510.dll
Binary file not shown.
Binary file modified wraps/openwrap/solution/OpenWrap.Resharper.510.pdb
Binary file not shown.
Binary file modified wraps/openwrap/solution/OpenWrap.Resharper.600.dll
Binary file not shown.
Binary file modified wraps/openwrap/solution/OpenWrap.Resharper.600.pdb
Binary file not shown.
Binary file modified wraps/openwrap/solution/OpenWrap.Resharper.610.dll
Binary file not shown.
Binary file modified wraps/openwrap/solution/OpenWrap.Resharper.610.pdb
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion wraps/openwrap/version
@@ -1 +1 @@
2.0.3+5 2.0.3+26

0 comments on commit d75ed3a

Please sign in to comment.