Skip to content

Commit 27d0698

Browse files
gfraiteurgfraiteur
committed
Moving files to subfolders. Updating to PostSharp 5.0. Causes bug 14780.
1 parent 0231c7e commit 27d0698

File tree

262 files changed

+5131
-4930
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

262 files changed

+5131
-4930
lines changed

Diff for: ‎PostSharp.Samples.AutoDataContract/App.config renamed to ‎Framework/PostSharp.Samples.AutoDataContract/App.config

File renamed without changes.

Diff for: ‎PostSharp.Samples.AutoDataContract/AutoDataContractAttribute.cs renamed to ‎Framework/PostSharp.Samples.AutoDataContract/AutoDataContractAttribute.cs

File renamed without changes.

Diff for: ‎PostSharp.Samples.AutoDataContract/NotDataMemberAttribute.cs renamed to ‎Framework/PostSharp.Samples.AutoDataContract/NotDataMemberAttribute.cs

File renamed without changes.

Diff for: ‎PostSharp.Samples.AutoDataContract/PostSharp.Samples.AutoDataContract.csproj renamed to ‎Framework/PostSharp.Samples.AutoDataContract/PostSharp.Samples.AutoDataContract.csproj

+12-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\..\packages\PostSharp.5.0.19-preview\build\PostSharp.props" Condition="Exists('..\..\packages\PostSharp.5.0.19-preview\build\PostSharp.props')" />
34
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
45
<PropertyGroup>
56
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -12,7 +13,8 @@
1213
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
1314
<FileAlignment>512</FileAlignment>
1415
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
15-
<DontImportPostSharp>True</DontImportPostSharp>
16+
<NuGetPackageImportStamp>
17+
</NuGetPackageImportStamp>
1618
</PropertyGroup>
1719
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1820
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -34,9 +36,8 @@
3436
<WarningLevel>4</WarningLevel>
3537
</PropertyGroup>
3638
<ItemGroup>
37-
<Reference Include="PostSharp, Version=4.3.20.0, Culture=neutral, PublicKeyToken=b13fd38b8f9c99d7, processorArchitecture=MSIL">
38-
<HintPath>..\packages\PostSharp.4.3.20\lib\net35-client\PostSharp.dll</HintPath>
39-
<Private>True</Private>
39+
<Reference Include="PostSharp, Version=5.0.19.0, Culture=neutral, PublicKeyToken=b13fd38b8f9c99d7, processorArchitecture=MSIL">
40+
<HintPath>..\..\packages\PostSharp.Redist.5.0.19-preview\lib\net45\PostSharp.dll</HintPath>
4041
</Reference>
4142
<Reference Include="System" />
4243
<Reference Include="System.Core" />
@@ -62,11 +63,14 @@
6263
<None Include="README.md" />
6364
</ItemGroup>
6465
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
65-
<Import Project="..\packages\PostSharp.4.3.20\tools\PostSharp.targets" Condition="Exists('..\packages\PostSharp.4.3.20\tools\PostSharp.targets')" />
66-
<Target Name="EnsurePostSharpImported" BeforeTargets="BeforeBuild" Condition="'$(PostSharp30Imported)' == ''">
67-
<Error Condition="!Exists('..\packages\PostSharp.4.3.20\tools\PostSharp.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://www.postsharp.net/links/nuget-restore." />
68-
<Error Condition="Exists('..\packages\PostSharp.4.3.20\tools\PostSharp.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://www.postsharp.net/links/nuget-restore." />
66+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
67+
<PropertyGroup>
68+
<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>
69+
</PropertyGroup>
70+
<Error Condition="!Exists('..\..\packages\PostSharp.5.0.19-preview\build\PostSharp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.5.0.19-preview\build\PostSharp.props'))" />
71+
<Error Condition="!Exists('..\..\packages\PostSharp.5.0.19-preview\build\PostSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.5.0.19-preview\build\PostSharp.targets'))" />
6972
</Target>
73+
<Import Project="..\..\packages\PostSharp.5.0.19-preview\build\PostSharp.targets" Condition="Exists('..\..\packages\PostSharp.5.0.19-preview\build\PostSharp.targets')" />
7074
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
7175
Other similar extension points exist, see Microsoft.Common.targets.
7276
<Target Name="BeforeBuild">

Diff for: ‎PostSharp.Samples.AutoDataContract/Program.cs renamed to ‎Framework/PostSharp.Samples.AutoDataContract/Program.cs

File renamed without changes.

Diff for: ‎PostSharp.Samples.AutoDataContract/Properties/AssemblyInfo.cs renamed to ‎Framework/PostSharp.Samples.AutoDataContract/Properties/AssemblyInfo.cs

File renamed without changes.

Diff for: ‎PostSharp.Samples.AutoDataContract/README.md renamed to ‎Framework/PostSharp.Samples.AutoDataContract/README.md

File renamed without changes.

Diff for: ‎PostSharp.Samples.AutoDataContract/TestBaseClass.cs renamed to ‎Framework/PostSharp.Samples.AutoDataContract/TestBaseClass.cs

File renamed without changes.

Diff for: ‎PostSharp.Samples.AutoDataContract/TestDerivedClass.cs renamed to ‎Framework/PostSharp.Samples.AutoDataContract/TestDerivedClass.cs

File renamed without changes.

Diff for: ‎Framework/PostSharp.Samples.AutoDataContract/packages.config

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="PostSharp" version="5.0.19-preview" targetFramework="net452" />
4+
<package id="PostSharp.Redist" version="5.0.19-preview" targetFramework="net452" />
5+
</packages>

Diff for: ‎PostSharp.Samples.CustomLogging/App.config renamed to ‎Framework/PostSharp.Samples.AutoRetry/App.config

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
3-
<configuration>
4-
<startup>
5-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
6-
</startup>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
3+
<configuration>
4+
<startup>
5+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
6+
</startup>
77
</configuration>

Diff for: ‎PostSharp.Samples.AutoRetry/AutoRetryAttribute.cs renamed to ‎Framework/PostSharp.Samples.AutoRetry/AutoRetryAttribute.cs

File renamed without changes.

Diff for: ‎PostSharp.Samples.AutoRetry/PostSharp.Samples.AutoRetry.csproj renamed to ‎Framework/PostSharp.Samples.AutoRetry/PostSharp.Samples.AutoRetry.csproj

+71-67
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,78 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4-
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{2413A15B-6B4C-48BB-AF5E-3AAF0C1FDE7F}</ProjectGuid>
8-
<OutputType>Exe</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>PostSharp.Samples.AutoRetry</RootNamespace>
11-
<AssemblyName>PostSharp.Samples.AutoRetry</AssemblyName>
12-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
15-
<TargetFrameworkProfile />
16-
<DontImportPostSharp>True</DontImportPostSharp>
17-
</PropertyGroup>
18-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
19-
<PlatformTarget>AnyCPU</PlatformTarget>
20-
<DebugSymbols>true</DebugSymbols>
21-
<DebugType>full</DebugType>
22-
<Optimize>false</Optimize>
23-
<OutputPath>bin\Debug\</OutputPath>
24-
<DefineConstants>DEBUG;TRACE</DefineConstants>
25-
<ErrorReport>prompt</ErrorReport>
26-
<WarningLevel>4</WarningLevel>
27-
</PropertyGroup>
28-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
29-
<PlatformTarget>AnyCPU</PlatformTarget>
30-
<DebugType>pdbonly</DebugType>
31-
<Optimize>true</Optimize>
32-
<OutputPath>bin\Release\</OutputPath>
33-
<DefineConstants>TRACE</DefineConstants>
34-
<ErrorReport>prompt</ErrorReport>
35-
<WarningLevel>4</WarningLevel>
36-
</PropertyGroup>
37-
<ItemGroup>
38-
<Reference Include="PostSharp, Version=4.3.20.0, Culture=neutral, PublicKeyToken=b13fd38b8f9c99d7, processorArchitecture=MSIL">
39-
<HintPath>..\packages\PostSharp.4.3.20\lib\net35-client\PostSharp.dll</HintPath>
40-
<Private>True</Private>
41-
</Reference>
42-
<Reference Include="System" />
43-
<Reference Include="System.Core" />
44-
<Reference Include="System.Xml.Linq" />
45-
<Reference Include="System.Data.DataSetExtensions" />
46-
<Reference Include="Microsoft.CSharp" />
47-
<Reference Include="System.Data" />
48-
<Reference Include="System.Net.Http" />
49-
<Reference Include="System.Xml" />
50-
</ItemGroup>
51-
<ItemGroup>
52-
<Compile Include="AutoRetryAttribute.cs" />
53-
<Compile Include="Program.cs" />
54-
<Compile Include="Properties\AssemblyInfo.cs" />
55-
</ItemGroup>
56-
<ItemGroup>
57-
<None Include="App.config" />
58-
<None Include="packages.config" />
59-
<None Include="README.md" />
60-
</ItemGroup>
61-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
62-
<Import Project="..\packages\PostSharp.4.3.20\tools\PostSharp.targets" Condition="Exists('..\packages\PostSharp.4.3.20\tools\PostSharp.targets')" />
63-
<Target Name="EnsurePostSharpImported" BeforeTargets="BeforeBuild" Condition="'$(PostSharp30Imported)' == ''">
64-
<Error Condition="!Exists('..\packages\PostSharp.4.3.20\tools\PostSharp.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://www.postsharp.net/links/nuget-restore." />
65-
<Error Condition="Exists('..\packages\PostSharp.4.3.20\tools\PostSharp.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://www.postsharp.net/links/nuget-restore." />
66-
</Target>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\..\packages\PostSharp.5.0.19-preview\build\PostSharp.props" Condition="Exists('..\..\packages\PostSharp.5.0.19-preview\build\PostSharp.props')" />
4+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
5+
<PropertyGroup>
6+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
7+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
8+
<ProjectGuid>{2413A15B-6B4C-48BB-AF5E-3AAF0C1FDE7F}</ProjectGuid>
9+
<OutputType>Exe</OutputType>
10+
<AppDesignerFolder>Properties</AppDesignerFolder>
11+
<RootNamespace>PostSharp.Samples.AutoRetry</RootNamespace>
12+
<AssemblyName>PostSharp.Samples.AutoRetry</AssemblyName>
13+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
14+
<FileAlignment>512</FileAlignment>
15+
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
16+
<TargetFrameworkProfile />
17+
<NuGetPackageImportStamp>
18+
</NuGetPackageImportStamp>
19+
</PropertyGroup>
20+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
21+
<PlatformTarget>AnyCPU</PlatformTarget>
22+
<DebugSymbols>true</DebugSymbols>
23+
<DebugType>full</DebugType>
24+
<Optimize>false</Optimize>
25+
<OutputPath>bin\Debug\</OutputPath>
26+
<DefineConstants>DEBUG;TRACE</DefineConstants>
27+
<ErrorReport>prompt</ErrorReport>
28+
<WarningLevel>4</WarningLevel>
29+
</PropertyGroup>
30+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
31+
<PlatformTarget>AnyCPU</PlatformTarget>
32+
<DebugType>pdbonly</DebugType>
33+
<Optimize>true</Optimize>
34+
<OutputPath>bin\Release\</OutputPath>
35+
<DefineConstants>TRACE</DefineConstants>
36+
<ErrorReport>prompt</ErrorReport>
37+
<WarningLevel>4</WarningLevel>
38+
</PropertyGroup>
39+
<ItemGroup>
40+
<Reference Include="PostSharp, Version=5.0.19.0, Culture=neutral, PublicKeyToken=b13fd38b8f9c99d7, processorArchitecture=MSIL">
41+
<HintPath>..\..\packages\PostSharp.Redist.5.0.19-preview\lib\net35-client\PostSharp.dll</HintPath>
42+
</Reference>
43+
<Reference Include="System" />
44+
<Reference Include="System.Core" />
45+
<Reference Include="System.Xml.Linq" />
46+
<Reference Include="System.Data.DataSetExtensions" />
47+
<Reference Include="Microsoft.CSharp" />
48+
<Reference Include="System.Data" />
49+
<Reference Include="System.Net.Http" />
50+
<Reference Include="System.Xml" />
51+
</ItemGroup>
52+
<ItemGroup>
53+
<Compile Include="AutoRetryAttribute.cs" />
54+
<Compile Include="Program.cs" />
55+
<Compile Include="Properties\AssemblyInfo.cs" />
56+
</ItemGroup>
57+
<ItemGroup>
58+
<None Include="App.config" />
59+
<None Include="packages.config" />
60+
<None Include="README.md" />
61+
</ItemGroup>
62+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
63+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
64+
<PropertyGroup>
65+
<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>
66+
</PropertyGroup>
67+
<Error Condition="!Exists('..\..\packages\PostSharp.5.0.19-preview\build\PostSharp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.5.0.19-preview\build\PostSharp.props'))" />
68+
<Error Condition="!Exists('..\..\packages\PostSharp.5.0.19-preview\build\PostSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.5.0.19-preview\build\PostSharp.targets'))" />
69+
</Target>
70+
<Import Project="..\..\packages\PostSharp.5.0.19-preview\build\PostSharp.targets" Condition="Exists('..\..\packages\PostSharp.5.0.19-preview\build\PostSharp.targets')" />
6771
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
6872
Other similar extension points exist, see Microsoft.Common.targets.
6973
<Target Name="BeforeBuild">
7074
</Target>
7175
<Target Name="AfterBuild">
7276
</Target>
73-
-->
77+
-->
7478
</Project>

Diff for: ‎PostSharp.Samples.AutoRetry/Program.cs renamed to ‎Framework/PostSharp.Samples.AutoRetry/Program.cs

File renamed without changes.

Diff for: ‎PostSharp.Samples.AutoRetry/Properties/AssemblyInfo.cs renamed to ‎Framework/PostSharp.Samples.AutoRetry/Properties/AssemblyInfo.cs

File renamed without changes.

Diff for: ‎PostSharp.Samples.AutoRetry/README.md renamed to ‎Framework/PostSharp.Samples.AutoRetry/README.md

File renamed without changes.

Diff for: ‎Framework/PostSharp.Samples.AutoRetry/packages.config

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="PostSharp" version="5.0.19-preview" targetFramework="net40" />
4+
<package id="PostSharp.Redist" version="5.0.19-preview" targetFramework="net40" />
5+
</packages>

Diff for: ‎PostSharp.Samples.ExceptionHandling/App.config renamed to ‎Framework/PostSharp.Samples.CustomCaching/App.config

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
3-
<configuration>
4-
<startup>
5-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
6-
</startup>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
3+
<configuration>
4+
<startup>
5+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
6+
</startup>
77
</configuration>

Diff for: ‎PostSharp.Samples.CustomCaching/CacheAttribute.cs renamed to ‎Framework/PostSharp.Samples.CustomCaching/CacheAttribute.cs

File renamed without changes.

Diff for: ‎PostSharp.Samples.CustomCaching/Formatter.cs renamed to ‎Framework/PostSharp.Samples.CustomCaching/Formatter.cs

File renamed without changes.

0 commit comments

Comments
 (0)