Permalink
Browse files

New binaries

  • Loading branch information...
1 parent ddc20ad commit d75ed3a596fff9ca28368e7bce6a6f0e85526409 @serialseb serialseb committed May 16, 2012
Showing with 171 additions and 82 deletions.
  1. BIN wraps/openwrap-2.0.3+26.wrap
  2. BIN wraps/openwrap-2.0.3+5.wrap
  3. BIN wraps/openwrap/bin-net35/OpenRasta.Client.dll
  4. BIN wraps/openwrap/bin-net35/OpenRasta.Client.pdb
  5. BIN wraps/openwrap/bin-net35/OpenWrap.VisualStudio.Shared.dll
  6. BIN wraps/openwrap/bin-net35/OpenWrap.VisualStudio.Shared.pdb
  7. BIN wraps/openwrap/bin-net35/OpenWrap.VisualStudio.SolutionAddIn.dll
  8. BIN wraps/openwrap/bin-net35/OpenWrap.VisualStudio.SolutionAddIn.pdb
  9. BIN wraps/openwrap/bin-net35/OpenWrap.dll
  10. BIN wraps/openwrap/bin-net35/OpenWrap.pdb
  11. BIN wraps/openwrap/build/OpenWrap.Build.Bootstrap.dll
  12. BIN wraps/openwrap/build/OpenWrap.Build.Bootstrap.pdb
  13. BIN wraps/openwrap/build/OpenWrap.Build.Tasks.dll
  14. BIN wraps/openwrap/build/OpenWrap.Build.Tasks.pdb
  15. +168 −75 wraps/openwrap/build/OpenWrap.CSharp.targets
  16. BIN wraps/openwrap/commands-net35/OpenWrap.Commands.dll
  17. BIN wraps/openwrap/commands-net35/OpenWrap.Commands.pdb
  18. BIN wraps/openwrap/commands-net35/OpenWrap.Testing.dll
  19. BIN wraps/openwrap/commands-net35/OpenWrap.Testing.pdb
  20. +2 −6 wraps/openwrap/openwrap.wrapdesc
  21. BIN wraps/openwrap/solution/OpenWrap.Resharper.450.dll
  22. BIN wraps/openwrap/solution/OpenWrap.Resharper.450.pdb
  23. BIN wraps/openwrap/solution/OpenWrap.Resharper.500.dll
  24. BIN wraps/openwrap/solution/OpenWrap.Resharper.500.pdb
  25. BIN wraps/openwrap/solution/OpenWrap.Resharper.510.dll
  26. BIN wraps/openwrap/solution/OpenWrap.Resharper.510.pdb
  27. BIN wraps/openwrap/solution/OpenWrap.Resharper.600.dll
  28. BIN wraps/openwrap/solution/OpenWrap.Resharper.600.pdb
  29. BIN wraps/openwrap/solution/OpenWrap.Resharper.610.dll
  30. BIN wraps/openwrap/solution/OpenWrap.Resharper.610.pdb
  31. BIN wraps/openwrap/solution/OpenWrap.SolutionPlugins.VisualStudio.dll
  32. BIN wraps/openwrap/solution/OpenWrap.SolutionPlugins.VisualStudio.pdb
  33. +1 −1 wraps/openwrap/version
Binary file not shown.
View
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -37,7 +37,7 @@
<OpenWrap-IncludeBinFiles Condition="'$(OpenWrap-IncludeBinFiles)' == ''">true</OpenWrap-IncludeBinFiles>
<OpenWrap-IncludeSourceFiles Condition="'$(OpenWrap-IncludeSourceFiles)' == ''">false</OpenWrap-IncludeSourceFiles>
<OpenWrap-IncludeContentFiles Condition="'$(OpenWrap-IncludeContentFiles)' == ''">false</OpenWrap-IncludeContentFiles>
-
+
<_OpenWrap-GenerateSharedAssemblyInfo>False</_OpenWrap-GenerateSharedAssemblyInfo>
<_OpenWrap-GenerateSharedAssemblyInfo Condition="Exists('$(OpenWrap-SharedAssemblyInfoFile)')">False</_OpenWrap-GenerateSharedAssemblyInfo>
</PropertyGroup>
@@ -48,9 +48,15 @@
<Output TaskParameter="Scope" PropertyName="_OpenWrap-Scope" Condition="'$(OpenWrap-Scope)' == ''" />
<Output TaskParameter="DescriptorPath" PropertyName="_OpenWrap-DescriptorPath" Condition="'$(OpenWrap-DescriptorPath)' == ''" />
</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>
- </PropertyGroup>
+ </PropertyGroup>-->
+
<InitializeVisualStudioIntegration
EnableVisualStudioIntegration="$(OpenWrap-EnableVisualStudioIntegration)"
/>
@@ -69,10 +75,13 @@
</PropertyGroup>
<Target Name="OpenWrap-ResolveReferences" DependsOnTargets="OpenWrap-Initialize">
-
- <ItemGroup Condition="Exists('$(OpenWrap-SharedAssemblyInfoFile)')">
+ <CreateItem Condition="Exists('$(OpenWrap-SharedAssemblyInfoFile)')" Include="$(OpenWrap-SharedAssemblyInfoFile)">
+ <Output TaskParameter="Include" ItemName="Compile"/>
+ </CreateItem>
+
+ <!--<ItemGroup Condition="Exists('$(OpenWrap-SharedAssemblyInfoFile)')">
<Compile Include="$(OpenWrap-SharedAssemblyInfoFile)" />
- </ItemGroup>
+ </ItemGroup>-->
<ResolveWrapReferences
WrapDescriptor="$(_OpenWrap-DescriptorPath)"
WrapsDirectory="$(OpenWrap-ProjectRepositoryPath)"
@@ -87,101 +96,185 @@
<Output TaskParameter="OutputReferences" ItemName="Reference" />
</ResolveWrapReferences>
- <ItemGroup>
+ <CreateItem Include="@(_OpenWrap-GeneratedSharedAssemblyInfo)">
+ <Output TaskParameter="Include" ItemName="Compile" />
+ </CreateItem>
+ <!--<ItemGroup>
<Compile Include="@(_OpenWrap-GeneratedSharedAssemblyInfo)" />
- </ItemGroup>
+ </ItemGroup>-->
</Target>
<Target Name="OpenWrap-BeforeBuild" DependsOnTargets="OpenWrap-Initialize">
</Target>
- <ItemDefinitionGroup>
- <_OpenWrap-CurrentBuildOutput>
+ <Target Name="OpenWrap-AfterBuild"
+ 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>
- </_OpenWrap-CurrentBuildOutput>
- </ItemDefinitionGroup>
+ </_OpenWrap-CurrentBuildOutput>--><!--
- <Target Name="OpenWrap-AfterBuild"
- Condition="'$(OpenWrap-EmitOutputInstructions)' != 'false'">
+ --><!-- Additional .netmodule files (?) --><!--
+ --><!--<_OpenWrap-CurrentBuildOutput Include="@(AddModule)">
+ <TargetPath>.</TargetPath>
+ </_OpenWrap-CurrentBuildOutput>--><!--
- <!-- Build results for the current project and associated project references-->
- <ItemGroup>
- <!-- Binary result (.exe or .dll) -->
- <_OpenWrap-CurrentBuildOutput Include="@(IntermediateAssembly)" />
+ --><!-- Serialization assemblies --><!--
+ --><!--<_OpenWrap-CurrentBuildOutput Include="$(IntermediateOutputPath)$(_SGenDllName)" Condition="'$(_SGenDllCreated)' == 'true'">
+ <TargetPath>.</TargetPath>
+ </_OpenWrap-CurrentBuildOutput>--><!--
+
+ --><!-- PDB files--><!--
+ --><!--<_OpenWrap-CurrentBuildOutput Include="@(_DebugSymbolsIntermediatePath)">
+ <TargetPath>.</TargetPath>
+ </_OpenWrap-CurrentBuildOutput>--><!--
- <!-- Additional .netmodule files (?) -->
- <_OpenWrap-CurrentBuildOutput Include="@(AddModule)" />
+ --><!-- XML doc file --><!--
+ --><!--<_OpenWrap-CurrentBuildOutput Include="@(FinalDocFile)">
+ <TargetPath>.</TargetPath>
+ </_OpenWrap-CurrentBuildOutput>--><!--
- <!-- Serialization assemblies -->
- <_OpenWrap-CurrentBuildOutput Include="$(IntermediateOutputPath)$(_SGenDllName)" Condition="'$(_SGenDllCreated)' == 'true'" />
+ --><!-- Satellite assemblies --><!--
+ --><!--<_OpenWrap-CurrentBuildOutput Include="@(IntermediateSatelliteAssembliesWithTargetPath)">
+ <TargetPath>%(IntermediateSatelliteAssembliesWithTargetPath.TargetPath)</TargetPath>
+ </_OpenWrap-CurrentBuildOutput>--><!--
- <!-- PDB files-->
- <_OpenWrap-CurrentBuildOutput Include="@(_DebugSymbolsIntermediatePath)" />
+ --><!-- COM References --><!--
+ --><!--<_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 -->
- <_OpenWrap-CurrentBuildOutput Include="@(FinalDocFile)" />
+ --><!-- All things with CopyToOutputDirectory in project --><!--
+ --><!--<_OpenWrap-CurrentBuildOutput Include="@(AllItemsFullPathWithTargetPath)">
+ <TargetPath>%(AllItemsFullPathWithTargetPath.TargetPath)</TargetPath>
+ </_OpenWrap-CurrentBuildOutput>--><!--
- <!-- Satellite assemblies -->
- <_OpenWrap-CurrentBuildOutput Include="@(IntermediateSatelliteAssembliesWithTargetPath)">
- <TargetPath>%(IntermediateSatelliteAssembliesWithTargetPath.TargetPath)</TargetPath>
- </_OpenWrap-CurrentBuildOutput>
+ --><!-- Application config files --><!--
+ --><!--<_OpenWrap-CurrentBuildOutput Include="@(AppConfigWithTargetPath)">
+ <TargetPath>%(AppConfigWithTargetPath.TargetPath)</TargetPath>
+ </_OpenWrap-CurrentBuildOutput>--><!--
- <!-- COM References -->
- <_OpenWrap-CurrentBuildOutput Include="@(ReferenceComWrappersToCopyLocal); @(ResolvedIsolatedComModules); @(_DeploymentLooseManifestFile); @(NativeReferenceFile)" />
+ --><!-- All of those files that were not included by OpenWrap itself --><!--
+ --><!--<_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-CurrentBuildOutput Include="@(AllItemsFullPathWithTargetPath)">
- <TargetPath>%(AllItemsFullPathWithTargetPath.TargetPath)</TargetPath>
- </_OpenWrap-CurrentBuildOutput>
+ --><!--<_OpenWrap-SourceOutput Include="@(Compile)" />--><!--
- <!-- Application config files -->
- <_OpenWrap-CurrentBuildOutput Include="@(AppConfigWithTargetPath)">
- <TargetPath>%(AppConfigWithTargetPath.TargetPath)</TargetPath>
- </_OpenWrap-CurrentBuildOutput>
+ --><!--<_OpenWrap-FilteredContent Include="@(Content)" Condition="'%(Content.FromOpenWrap)' != 'True'">
+ <TargetPath>%(Content.Link)</TargetPath>
+ </_OpenWrap-FilteredContent>--><!--
+ </ItemGroup>-->
- <!-- All of those files that were not included by OpenWrap itself -->
- <_OpenWrap-FilteredBuildOutput Include="@(_OpenWrap-CurrentBuildOutput)" Condition="'%(_OpenWrap-CurrentBuildOutput.FromOpenWrap)' != 'True'" />
-
- <_OpenWrap-SourceOutput Include="@(Compile)" />
+ <Message Text="@(Content->'%(Link) -> %(FullPath)')" Importance="high" />
- <_OpenWrap-FilteredContent Include="@(Content)" Condition="'%(Content.FromOpenWrap)' != 'True'">
- <TargetPath>%(Content.Link)</TargetPath>
- </_OpenWrap-FilteredContent>
- </ItemGroup>
-
-
-
-
- <!--<Message Text="Build result: @(_OpenWrap-CurrentBuildOutput->'%(FullPath) in %(TargetPath)') " Importance="high" Condition="'%(_OpenWrap-CurrentBuildOutput.FromOpenWrap)' != 'True'"/>-->
- <Message Text="@(Content->'%(Link) -> %(FullPath)')" Importance="high" />
- <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'"
+ <CreateProperty Condition="'$(OpenWrap-CurrentProjectFile)' == '' or '$(OpenWrap-CurrentProjectFile)' == '$(MSBuildProjectDirectory)\$(MSBuildProjectFile)'"
+ Value="true">
+ <Output TaskParameter="Value" PropertyName="_OpenWrap-IsEntryPointProject" />
+ </CreateProperty>
+ <!--<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)"
- IncludePdbFiles="$(OpenWrap-IncludePdbFiles)"
- IncludeCodeDocFiles="$(OpenWrap-IncludeCodeDocFiles)"
- IncludeSourceFiles="$(OpenWRap-IncludeSourceFiles)"
- IncludeContentFiles="$(OpenWrap-IncludeContentFiles)"
+ IncludeBinFiles="$(OpenWrap-IncludeBinFiles)"
+ IncludePdbFiles="$(OpenWrap-IncludePdbFiles)"
+ IncludeCodeDocFiles="$(OpenWrap-IncludeCodeDocFiles)"
+ IncludeSourceFiles="$(OpenWRap-IncludeSourceFiles)"
+ IncludeContentFiles="$(OpenWrap-IncludeContentFiles)"
- RootPath="$(RootSolutionDirectory)"
- ExportName="$(OpenWrap-ExportName)"
- AllowBinDuplicates="$(OpenWrap-AllowBinDuplicates)"
+ RootPath="$(RootSolutionDirectory)"
+ ExportName="$(OpenWrap-ExportName)"
+ AllowBinDuplicates="$(OpenWrap-AllowBinDuplicates)"
- ContentFiles="@(_OpenWrap-FilteredContent)"
- BuildOutputFiles="@(_OpenWrap-FilteredBuildOutput)"
- SourceFiles="@(_OpenWrap-SourceFiles)"
+ ContentFiles="@(_OpenWrap-FilteredContent)"
+ BuildOutputFiles="@(_OpenWrap-FilteredBuildOutput)"
+ SourceFiles="@(_OpenWrap-SourceFiles)"
/>
<Delete Files="@(_OpenWrap-GeneratedSharedAssembly)" Condition="'$(_OpenWrap-GenerateSharedAssemblyInfo)' == 'True'" TreatErrorsAsWarnings="true" />
</Target>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -23,10 +23,6 @@ assembly-info: assembly-info
assembly-info: build
assembly-info: description
assembly-info: trademark
-<<<<<<< HEAD
-semantic-version: 2.0.3+5
-=======
include-legacy-version: true
-semantic-version: 2.0.3+24
-version: 2.0.3.24
->>>>>>> 2d7fc0c... Adds support for optionally including version header for 1.0 compat
+semantic-version: 2.0.3+26
+version: 2.0.3.26
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
View
@@ -1 +1 @@
-2.0.3+5
+2.0.3+26

0 comments on commit d75ed3a

Please sign in to comment.