Skip to content

Commit e67adc3

Browse files
committed
Merge branch '6.0'
2 parents 0d9a37e + c16744c commit e67adc3

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

MSBuild/DataObjects.Net.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
Inputs="@(IntermediateAssembly -> '%(FullPath)')"
2222
Outputs="@(IntermediateAssembly -> '%(FullPath).weaver-stamp')"
2323
DependsOnTargets="ResolveAssemblyReferences;_CopyFilesMarkedCopyLocal;$(XtensiveOrmBuildDependsOn)"
24-
Condition="'$(XtensiveOrmSkipProcessing)'!='true'">
24+
Condition="'$(XtensiveOrmSkipProcessing)'!='true' AND '$(DesignTimeBuild)' != 'true'">
2525
<Error Condition="!Exists('$(XtensiveOrmWeaver)')"
2626
Text="Weaver is not found at '$(XtensiveOrmWeaver)'" />
2727
<Message Importance="low" Text="Using weaver at '$(XtensiveOrmWeaver)'" />

0 commit comments

Comments
 (0)