diff options
| author | Jason Smith <jason.smith@xamarin.com> | 2016-03-23 14:09:58 -0700 |
|---|---|---|
| committer | Jason Smith <jason.smith@xamarin.com> | 2016-03-23 14:32:58 -0700 |
| commit | 348cb9f5d2d88774a3ce3bbdab19a322f46c1da9 (patch) | |
| tree | db77c245d881d5b9bd6c23201cde6d291ec546ec /.nuspec | |
| parent | 5c63c8c74a330f3351ca3839dbab1646e988fd7d (diff) | |
| download | xamarin-forms-348cb9f5d2d88774a3ce3bbdab19a322f46c1da9.tar.gz xamarin-forms-348cb9f5d2d88774a3ce3bbdab19a322f46c1da9.tar.bz2 xamarin-forms-348cb9f5d2d88774a3ce3bbdab19a322f46c1da9.zip | |
[C]Fix packaging issue where intellisense doesn't work on dev14
Diffstat (limited to '.nuspec')
| -rw-r--r-- | .nuspec/Xamarin.Forms.Debug.targets | 10 | ||||
| -rw-r--r-- | .nuspec/Xamarin.Forms.targets | 28 |
2 files changed, 19 insertions, 19 deletions
diff --git a/.nuspec/Xamarin.Forms.Debug.targets b/.nuspec/Xamarin.Forms.Debug.targets index c3d21c23..68f61bd7 100644 --- a/.nuspec/Xamarin.Forms.Debug.targets +++ b/.nuspec/Xamarin.Forms.Debug.targets @@ -5,10 +5,10 @@ <UsingTask TaskName="Xamarin.Forms.Build.Tasks.FixedCreateCSharpManifestResourceName" AssemblyFile="Xamarin.Forms.Build.Tasks.dll"/> <PropertyGroup> - <PrepareResourcesDependsOn> + <CoreCompileDependsOn> XamlG; - $(PrepareResourcesDependsOn); - </PrepareResourcesDependsOn> + $(CoreCompileDependsOn); + </CoreCompileDependsOn> </PropertyGroup> <PropertyGroup> @@ -19,7 +19,7 @@ </CompileDependsOn> </PropertyGroup> - <Target Name="UpdateDesignTimeXaml" Condition="'$(UseHostCompilerIfAvailable)' == 'true'" DependsOnTargets="PrepareResources; Compile"/> + <Target Name="UpdateDesignTimeXaml" DependsOnTargets="XamlG"/> <Target Name="XamlG" DependsOnTargets="$(XamlGDependsOn)"/> @@ -37,7 +37,7 @@ <Target Name="_CollectXamlFiles"> <ItemGroup> - <_XamlResources Include="@(EmbeddedResource)" Condition="'%(Extension)' == '.xaml'"/> + <_XamlResources Include="@(EmbeddedResource)" Condition="'%(Extension)' == '.xaml' AND '$(DefaultLanguageSourceExtension)' == '.cs'"/> </ItemGroup> <FixedCreateCSharpManifestResourceName ResourceFiles="@(_XamlResources)" RootNamespace="$(RootNamespace)"> <Output TaskParameter="ResourceFilesWithManifestResourceNames" ItemName="XamlFiles" /> diff --git a/.nuspec/Xamarin.Forms.targets b/.nuspec/Xamarin.Forms.targets index 0bb724d3..1282525d 100644 --- a/.nuspec/Xamarin.Forms.targets +++ b/.nuspec/Xamarin.Forms.targets @@ -2,25 +2,25 @@ <UsingTask TaskName="Xamarin.Forms.Build.Tasks.XamlGTask" AssemblyFile="Xamarin.Forms.Build.Tasks.dll"/> <UsingTask TaskName="Xamarin.Forms.Build.Tasks.FixedCreateCSharpManifestResourceName" AssemblyFile="Xamarin.Forms.Build.Tasks.dll"/> <UsingTask TaskName="Xamarin.Forms.Build.Tasks.XamlCTask" AssemblyFile="Xamarin.Forms.Build.Tasks.dll"/> - + <PropertyGroup> - <PrepareResourcesDependsOn> + <CoreCompileDependsOn> XamlG; - $(PrepareResourcesDependsOn); - </PrepareResourcesDependsOn> + $(CoreCompileDependsOn); + </CoreCompileDependsOn> </PropertyGroup> - + <PropertyGroup> <CompileDependsOn> $(CompileDependsOn); XamlC; </CompileDependsOn> </PropertyGroup> - - <Target Name="UpdateDesignTimeXaml" Condition="'$(UseHostCompilerIfAvailable)' == 'true'" DependsOnTargets="PrepareResources; Compile"/> - + + <Target Name="UpdateDesignTimeXaml" DependsOnTargets="XamlG"/> + <Target Name="XamlG" DependsOnTargets="$(XamlGDependsOn)"/> - + <PropertyGroup> <XamlGDependsOn> _PreXamlG; @@ -28,11 +28,11 @@ _CoreXamlG; </XamlGDependsOn> </PropertyGroup> - + <Target Name="_PreXamlG"> <MakeDir Directories="$(IntermediateOutputPath)"/> </Target> - + <Target Name="_CollectXamlFiles"> <ItemGroup> <_XamlResources Include="@(EmbeddedResource)" Condition="'%(Extension)' == '.xaml' AND '$(DefaultLanguageSourceExtension)' == '.cs'"/> @@ -46,7 +46,7 @@ <FileWrites Include="@(XamlGFiles)"/> </ItemGroup> </Target> - + <Target Name="_CoreXamlG" Inputs = "@(XamlFiles)" Outputs = "$(IntermediateOutputPath)%(ManifestResourceName).g$(DefaultLanguageSourceExtension)"> @@ -57,7 +57,7 @@ OutputFile = "$(IntermediateOutputPath)%(ManifestResourceName).g$(DefaultLanguageSourceExtension)"> </XamlGTask> </Target> - + <Target Name="XamlC"> <XamlCTask Assembly = "$(IntermediateOutputPath)$(TargetFileName)" @@ -66,4 +66,4 @@ OptimizeIL = "true" DebugSymbols = "$(DebugSymbols)" /> </Target> -</Project> +</Project>
\ No newline at end of file |