Skip to content

Commit 5aaf9c2

Browse files
gfraiteurgfraiteur
committed
Fixed the previous merge.
1 parent fbeacfe commit 5aaf9c2

File tree

20 files changed

+95
-139
lines changed

20 files changed

+95
-139
lines changed

‎Diagnostics/PostSharp.Samples.Frigate.Generator/PostSharp.Samples.Frigate.Generator.csproj‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,6 @@
7979
<PropertyGroup>
8080
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
8181
</PropertyGroup>
82-
<Error Condition="!Exists('..\..\packages\PostSharp.5.0.28\build\PostSharp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.5.0.28\build\PostSharp.props'))" />
83-
<Error Condition="!Exists('..\..\packages\PostSharp.5.0.28\build\PostSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.5.0.28\build\PostSharp.targets'))" />
8482
<Error Condition="!Exists('..\..\packages\PostSharp.5.0.35\build\PostSharp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.5.0.35\build\PostSharp.props'))" />
8583
<Error Condition="!Exists('..\..\packages\PostSharp.5.0.35\build\PostSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.5.0.35\build\PostSharp.targets'))" />
8684
</Target>

‎Diagnostics/PostSharp.Samples.Logging.Customization/PostSharp.Samples.Logging.Customization.csproj‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,6 @@
7676
<PropertyGroup>
7777
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
7878
</PropertyGroup>
79-
<Error Condition="!Exists('..\..\packages\PostSharp.5.0.28\build\PostSharp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.5.0.28\build\PostSharp.props'))" />
80-
<Error Condition="!Exists('..\..\packages\PostSharp.5.0.28\build\PostSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.5.0.28\build\PostSharp.targets'))" />
8179
<Error Condition="!Exists('..\..\packages\PostSharp.5.0.35\build\PostSharp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.5.0.35\build\PostSharp.props'))" />
8280
<Error Condition="!Exists('..\..\packages\PostSharp.5.0.35\build\PostSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.5.0.35\build\PostSharp.targets'))" />
8381
</Target>

‎Framework/PostSharp.Samples.AutoDataContract/PostSharp.Samples.AutoDataContract.csproj‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -69,17 +69,15 @@
6969
<PropertyGroup>
7070
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
7171
</PropertyGroup>
72-
<Error Condition="!Exists('..\..\packages\PostSharp.5.0.28\build\PostSharp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.5.0.28\build\PostSharp.props'))" />
73-
<Error Condition="!Exists('..\..\packages\PostSharp.5.0.28\build\PostSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.5.0.28\build\PostSharp.targets'))" />
7472
<Error Condition="!Exists('..\..\packages\PostSharp.5.0.35\build\PostSharp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.5.0.35\build\PostSharp.props'))" />
7573
<Error Condition="!Exists('..\..\packages\PostSharp.5.0.35\build\PostSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.5.0.35\build\PostSharp.targets'))" />
7674
</Target>
7775
<Import Project="..\..\packages\PostSharp.5.0.35\build\PostSharp.targets" Condition="Exists('..\..\packages\PostSharp.5.0.35\build\PostSharp.targets')" />
78-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
79-
Other similar extension points exist, see Microsoft.Common.targets.
80-
<Target Name="BeforeBuild">
81-
</Target>
82-
<Target Name="AfterBuild">
83-
</Target>
76+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
77+
Other similar extension points exist, see Microsoft.Common.targets.
78+
<Target Name="BeforeBuild">
79+
</Target>
80+
<Target Name="AfterBuild">
81+
</Target>
8482
-->
8583
</Project>

‎Framework/PostSharp.Samples.AutoRetry/PostSharp.Samples.AutoRetry.csproj‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,17 +68,15 @@
6868
<PropertyGroup>
6969
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
7070
</PropertyGroup>
71-
<Error Condition="!Exists('..\..\packages\PostSharp.5.0.28\build\PostSharp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.5.0.28\build\PostSharp.props'))" />
72-
<Error Condition="!Exists('..\..\packages\PostSharp.5.0.28\build\PostSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.5.0.28\build\PostSharp.targets'))" />
7371
<Error Condition="!Exists('..\..\packages\PostSharp.5.0.35\build\PostSharp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.5.0.35\build\PostSharp.props'))" />
7472
<Error Condition="!Exists('..\..\packages\PostSharp.5.0.35\build\PostSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.5.0.35\build\PostSharp.targets'))" />
7573
</Target>
7674
<Import Project="..\..\packages\PostSharp.5.0.35\build\PostSharp.targets" Condition="Exists('..\..\packages\PostSharp.5.0.35\build\PostSharp.targets')" />
77-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
78-
Other similar extension points exist, see Microsoft.Common.targets.
79-
<Target Name="BeforeBuild">
80-
</Target>
81-
<Target Name="AfterBuild">
82-
</Target>
75+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
76+
Other similar extension points exist, see Microsoft.Common.targets.
77+
<Target Name="BeforeBuild">
78+
</Target>
79+
<Target Name="AfterBuild">
80+
</Target>
8381
-->
8482
</Project>

‎Framework/PostSharp.Samples.CustomCaching/PostSharp.Samples.CustomCaching.csproj‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,17 +68,15 @@
6868
<PropertyGroup>
6969
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
7070
</PropertyGroup>
71-
<Error Condition="!Exists('..\..\packages\PostSharp.5.0.28\build\PostSharp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.5.0.28\build\PostSharp.props'))" />
72-
<Error Condition="!Exists('..\..\packages\PostSharp.5.0.28\build\PostSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.5.0.28\build\PostSharp.targets'))" />
7371
<Error Condition="!Exists('..\..\packages\PostSharp.5.0.35\build\PostSharp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.5.0.35\build\PostSharp.props'))" />
7472
<Error Condition="!Exists('..\..\packages\PostSharp.5.0.35\build\PostSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.5.0.35\build\PostSharp.targets'))" />
7573
</Target>
7674
<Import Project="..\..\packages\PostSharp.5.0.35\build\PostSharp.targets" Condition="Exists('..\..\packages\PostSharp.5.0.35\build\PostSharp.targets')" />
77-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
78-
Other similar extension points exist, see Microsoft.Common.targets.
79-
<Target Name="BeforeBuild">
80-
</Target>
81-
<Target Name="AfterBuild">
82-
</Target>
75+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
76+
Other similar extension points exist, see Microsoft.Common.targets.
77+
<Target Name="BeforeBuild">
78+
</Target>
79+
<Target Name="AfterBuild">
80+
</Target>
8381
-->
8482
</Project>

‎Framework/PostSharp.Samples.CustomLogging/PostSharp.Samples.CustomLogging.csproj‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,17 +68,15 @@
6868
<PropertyGroup>
6969
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
7070
</PropertyGroup>
71-
<Error Condition="!Exists('..\..\packages\PostSharp.5.0.28\build\PostSharp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.5.0.28\build\PostSharp.props'))" />
72-
<Error Condition="!Exists('..\..\packages\PostSharp.5.0.28\build\PostSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.5.0.28\build\PostSharp.targets'))" />
7371
<Error Condition="!Exists('..\..\packages\PostSharp.5.0.35\build\PostSharp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.5.0.35\build\PostSharp.props'))" />
7472
<Error Condition="!Exists('..\..\packages\PostSharp.5.0.35\build\PostSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.5.0.35\build\PostSharp.targets'))" />
7573
</Target>
7674
<Import Project="..\..\packages\PostSharp.5.0.35\build\PostSharp.targets" Condition="Exists('..\..\packages\PostSharp.5.0.35\build\PostSharp.targets')" />
77-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
78-
Other similar extension points exist, see Microsoft.Common.targets.
79-
<Target Name="BeforeBuild">
80-
</Target>
81-
<Target Name="AfterBuild">
82-
</Target>
75+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
76+
Other similar extension points exist, see Microsoft.Common.targets.
77+
<Target Name="BeforeBuild">
78+
</Target>
79+
<Target Name="AfterBuild">
80+
</Target>
8381
-->
8482
</Project>

‎Framework/PostSharp.Samples.Encryption/PostSharp.Samples.Encryption.csproj‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,17 +67,15 @@
6767
<PropertyGroup>
6868
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
6969
</PropertyGroup>
70-
<Error Condition="!Exists('..\..\packages\PostSharp.5.0.28\build\PostSharp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.5.0.28\build\PostSharp.props'))" />
71-
<Error Condition="!Exists('..\..\packages\PostSharp.5.0.28\build\PostSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.5.0.28\build\PostSharp.targets'))" />
7270
<Error Condition="!Exists('..\..\packages\PostSharp.5.0.35\build\PostSharp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.5.0.35\build\PostSharp.props'))" />
7371
<Error Condition="!Exists('..\..\packages\PostSharp.5.0.35\build\PostSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.5.0.35\build\PostSharp.targets'))" />
7472
</Target>
7573
<Import Project="..\..\packages\PostSharp.5.0.35\build\PostSharp.targets" Condition="Exists('..\..\packages\PostSharp.5.0.35\build\PostSharp.targets')" />
76-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
77-
Other similar extension points exist, see Microsoft.Common.targets.
78-
<Target Name="BeforeBuild">
79-
</Target>
80-
<Target Name="AfterBuild">
81-
</Target>
74+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
75+
Other similar extension points exist, see Microsoft.Common.targets.
76+
<Target Name="BeforeBuild">
77+
</Target>
78+
<Target Name="AfterBuild">
79+
</Target>
8280
-->
8381
</Project>

‎Framework/PostSharp.Samples.ExceptionHandling/PostSharp.Samples.ExceptionHandling.csproj‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,17 +68,15 @@
6868
<PropertyGroup>
6969
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
7070
</PropertyGroup>
71-
<Error Condition="!Exists('..\..\packages\PostSharp.5.0.28\build\PostSharp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.5.0.28\build\PostSharp.props'))" />
72-
<Error Condition="!Exists('..\..\packages\PostSharp.5.0.28\build\PostSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.5.0.28\build\PostSharp.targets'))" />
7371
<Error Condition="!Exists('..\..\packages\PostSharp.5.0.35\build\PostSharp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.5.0.35\build\PostSharp.props'))" />
7472
<Error Condition="!Exists('..\..\packages\PostSharp.5.0.35\build\PostSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.5.0.35\build\PostSharp.targets'))" />
7573
</Target>
7674
<Import Project="..\..\packages\PostSharp.5.0.35\build\PostSharp.targets" Condition="Exists('..\..\packages\PostSharp.5.0.35\build\PostSharp.targets')" />
77-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
78-
Other similar extension points exist, see Microsoft.Common.targets.
79-
<Target Name="BeforeBuild">
80-
</Target>
81-
<Target Name="AfterBuild">
82-
</Target>
75+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
76+
Other similar extension points exist, see Microsoft.Common.targets.
77+
<Target Name="BeforeBuild">
78+
</Target>
79+
<Target Name="AfterBuild">
80+
</Target>
8381
-->
8482
</Project>

‎Framework/PostSharp.Samples.MiniProfiler/PostSharp.Samples.MiniProfiler.csproj‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -290,20 +290,16 @@
290290
<PropertyGroup>
291291
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
292292
</PropertyGroup>
293-
<Error Condition="!Exists('..\..\packages\Microsoft.Net.Compilers.2.3.0\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Net.Compilers.2.3.0\build\Microsoft.Net.Compilers.props'))" />
294-
<Error Condition="!Exists('..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.5\build\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.5\build\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
295-
<Error Condition="!Exists('..\..\packages\PostSharp.5.0.28\build\PostSharp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.5.0.28\build\PostSharp.props'))" />
296-
<Error Condition="!Exists('..\..\packages\PostSharp.5.0.28\build\PostSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.5.0.28\build\PostSharp.targets'))" />
297293
<Error Condition="!Exists('..\..\packages\Microsoft.Net.Compilers.2.3.2\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Net.Compilers.2.3.2\build\Microsoft.Net.Compilers.props'))" />
298294
<Error Condition="!Exists('..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.7\build\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.7\build\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
299295
<Error Condition="!Exists('..\..\packages\PostSharp.5.0.35\build\PostSharp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.5.0.35\build\PostSharp.props'))" />
300296
<Error Condition="!Exists('..\..\packages\PostSharp.5.0.35\build\PostSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.5.0.35\build\PostSharp.targets'))" />
301297
</Target>
302298
<Import Project="..\..\packages\PostSharp.5.0.35\build\PostSharp.targets" Condition="Exists('..\..\packages\PostSharp.5.0.35\build\PostSharp.targets')" />
303-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
304-
Other similar extension points exist, see Microsoft.Common.targets.
305-
<Target Name="BeforeBuild">
306-
</Target>
307-
<Target Name="AfterBuild">
299+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
300+
Other similar extension points exist, see Microsoft.Common.targets.
301+
<Target Name="BeforeBuild">
302+
</Target>
303+
<Target Name="AfterBuild">
308304
</Target> -->
309305
</Project>

‎Framework/PostSharp.Samples.Persistence/PostSharp.Samples.Persistence.csproj‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -69,17 +69,15 @@
6969
<PropertyGroup>
7070
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
7171
</PropertyGroup>
72-
<Error Condition="!Exists('..\..\packages\PostSharp.5.0.28\build\PostSharp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.5.0.28\build\PostSharp.props'))" />
73-
<Error Condition="!Exists('..\..\packages\PostSharp.5.0.28\build\PostSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.5.0.28\build\PostSharp.targets'))" />
7472
<Error Condition="!Exists('..\..\packages\PostSharp.5.0.35\build\PostSharp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.5.0.35\build\PostSharp.props'))" />
7573
<Error Condition="!Exists('..\..\packages\PostSharp.5.0.35\build\PostSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.5.0.35\build\PostSharp.targets'))" />
7674
</Target>
7775
<Import Project="..\..\packages\PostSharp.5.0.35\build\PostSharp.targets" Condition="Exists('..\..\packages\PostSharp.5.0.35\build\PostSharp.targets')" />
78-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
79-
Other similar extension points exist, see Microsoft.Common.targets.
80-
<Target Name="BeforeBuild">
81-
</Target>
82-
<Target Name="AfterBuild">
83-
</Target>
76+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
77+
Other similar extension points exist, see Microsoft.Common.targets.
78+
<Target Name="BeforeBuild">
79+
</Target>
80+
<Target Name="AfterBuild">
81+
</Target>
8482
-->
8583
</Project>

0 commit comments

Comments
 (0)