Skip to content

Commit 1552397

Browse files
gfraiteurgfraiteur
committed
Updated .NET Framework and PostSharp. Upgraded from packages.config to PackageReference.
1 parent df4b37a commit 1552397

File tree

74 files changed

+515
-1203
lines changed

Some content is hidden

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

74 files changed

+515
-1203
lines changed

Diff for: ‎Diagnostics/PostSharp.Samples.Audit.Extended/PostSharp.Samples.Audit.Extended.csproj

+12-23
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\..\packages\PostSharp.6.2.7\build\PostSharp.props" Condition="Exists('..\..\packages\PostSharp.6.2.7\build\PostSharp.props')" />
43
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
54
<PropertyGroup>
65
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -9,7 +8,7 @@
98
<OutputType>Exe</OutputType>
109
<RootNamespace>PostSharp.Samples.Audit.Extended</RootNamespace>
1110
<AssemblyName>PostSharp.Samples.Audit.Extended</AssemblyName>
12-
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
11+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
1312
<FileAlignment>512</FileAlignment>
1413
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
1514
<NuGetPackageImportStamp>
@@ -35,20 +34,8 @@
3534
<WarningLevel>4</WarningLevel>
3635
</PropertyGroup>
3736
<ItemGroup>
38-
<Reference Include="PostSharp, Version=6.2.7.0, Culture=neutral, PublicKeyToken=b13fd38b8f9c99d7, processorArchitecture=MSIL">
39-
<HintPath>..\..\packages\PostSharp.Redist.6.2.7\lib\net45\PostSharp.dll</HintPath>
40-
</Reference>
41-
<Reference Include="PostSharp.Patterns.Common, Version=6.2.7.0, Culture=neutral, PublicKeyToken=e7f631e6ce13f078, processorArchitecture=MSIL">
42-
<HintPath>..\..\packages\PostSharp.Patterns.Common.Redist.6.2.7\lib\net46\PostSharp.Patterns.Common.dll</HintPath>
43-
</Reference>
44-
<Reference Include="PostSharp.Patterns.Diagnostics, Version=6.2.7.0, Culture=neutral, PublicKeyToken=e7f631e6ce13f078, processorArchitecture=MSIL">
45-
<HintPath>..\..\packages\PostSharp.Patterns.Diagnostics.Redist.6.2.7\lib\net46\PostSharp.Patterns.Diagnostics.dll</HintPath>
46-
</Reference>
4737
<Reference Include="System" />
4838
<Reference Include="System.Core" />
49-
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
50-
<HintPath>..\..\packages\System.ValueTuple.4.5.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
51-
</Reference>
5239
<Reference Include="System.Xml.Linq" />
5340
<Reference Include="System.Data.DataSetExtensions" />
5441
<Reference Include="Microsoft.CSharp" />
@@ -69,16 +56,18 @@
6956
</ItemGroup>
7057
<ItemGroup>
7158
<None Include="App.config" />
72-
<None Include="packages.config" />
7359
<None Include="README.md" />
7460
</ItemGroup>
61+
<ItemGroup>
62+
<PackageReference Include="PostSharp">
63+
<Version>6.2.9</Version>
64+
</PackageReference>
65+
<PackageReference Include="PostSharp.Patterns.Diagnostics">
66+
<Version>6.2.9</Version>
67+
</PackageReference>
68+
<PackageReference Include="System.ValueTuple">
69+
<Version>4.5.0</Version>
70+
</PackageReference>
71+
</ItemGroup>
7572
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
76-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
77-
<PropertyGroup>
78-
<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>
79-
</PropertyGroup>
80-
<Error Condition="!Exists('..\..\packages\PostSharp.6.2.7\build\PostSharp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.6.2.7\build\PostSharp.props'))" />
81-
<Error Condition="!Exists('..\..\packages\PostSharp.6.2.7\build\PostSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.6.2.7\build\PostSharp.targets'))" />
82-
</Target>
83-
<Import Project="..\..\packages\PostSharp.6.2.7\build\PostSharp.targets" Condition="Exists('..\..\packages\PostSharp.6.2.7\build\PostSharp.targets')" />
8473
</Project>

Diff for: ‎Diagnostics/PostSharp.Samples.Audit.Extended/packages.config

-10
This file was deleted.

Diff for: ‎Diagnostics/PostSharp.Samples.Audit/PostSharp.Samples.Audit.csproj

+12-23
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\..\packages\PostSharp.6.2.7\build\PostSharp.props" Condition="Exists('..\..\packages\PostSharp.6.2.7\build\PostSharp.props')" />
43
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
54
<PropertyGroup>
65
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -9,7 +8,7 @@
98
<OutputType>Exe</OutputType>
109
<RootNamespace>PostSharp.Samples.Audit</RootNamespace>
1110
<AssemblyName>PostSharp.Samples.Audit</AssemblyName>
12-
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
11+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
1312
<FileAlignment>512</FileAlignment>
1413
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
1514
<NuGetPackageImportStamp>
@@ -35,20 +34,8 @@
3534
<WarningLevel>4</WarningLevel>
3635
</PropertyGroup>
3736
<ItemGroup>
38-
<Reference Include="PostSharp, Version=6.2.7.0, Culture=neutral, PublicKeyToken=b13fd38b8f9c99d7, processorArchitecture=MSIL">
39-
<HintPath>..\..\packages\PostSharp.Redist.6.2.7\lib\net45\PostSharp.dll</HintPath>
40-
</Reference>
41-
<Reference Include="PostSharp.Patterns.Common, Version=6.2.7.0, Culture=neutral, PublicKeyToken=e7f631e6ce13f078, processorArchitecture=MSIL">
42-
<HintPath>..\..\packages\PostSharp.Patterns.Common.Redist.6.2.7\lib\net46\PostSharp.Patterns.Common.dll</HintPath>
43-
</Reference>
44-
<Reference Include="PostSharp.Patterns.Diagnostics, Version=6.2.7.0, Culture=neutral, PublicKeyToken=e7f631e6ce13f078, processorArchitecture=MSIL">
45-
<HintPath>..\..\packages\PostSharp.Patterns.Diagnostics.Redist.6.2.7\lib\net46\PostSharp.Patterns.Diagnostics.dll</HintPath>
46-
</Reference>
4737
<Reference Include="System" />
4838
<Reference Include="System.Core" />
49-
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
50-
<HintPath>..\..\packages\System.ValueTuple.4.5.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
51-
</Reference>
5239
<Reference Include="System.Xml.Linq" />
5340
<Reference Include="System.Data.DataSetExtensions" />
5441
<Reference Include="Microsoft.CSharp" />
@@ -65,16 +52,18 @@
6552
</ItemGroup>
6653
<ItemGroup>
6754
<None Include="App.config" />
68-
<None Include="packages.config" />
6955
<None Include="README.md" />
7056
</ItemGroup>
57+
<ItemGroup>
58+
<PackageReference Include="PostSharp">
59+
<Version>6.2.9</Version>
60+
</PackageReference>
61+
<PackageReference Include="PostSharp.Patterns.Diagnostics">
62+
<Version>6.2.9</Version>
63+
</PackageReference>
64+
<PackageReference Include="System.ValueTuple">
65+
<Version>4.5.0</Version>
66+
</PackageReference>
67+
</ItemGroup>
7168
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
72-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
73-
<PropertyGroup>
74-
<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>
75-
</PropertyGroup>
76-
<Error Condition="!Exists('..\..\packages\PostSharp.6.2.7\build\PostSharp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.6.2.7\build\PostSharp.props'))" />
77-
<Error Condition="!Exists('..\..\packages\PostSharp.6.2.7\build\PostSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.6.2.7\build\PostSharp.targets'))" />
78-
</Target>
79-
<Import Project="..\..\packages\PostSharp.6.2.7\build\PostSharp.targets" Condition="Exists('..\..\packages\PostSharp.6.2.7\build\PostSharp.targets')" />
8069
</Project>

Diff for: ‎Diagnostics/PostSharp.Samples.Audit/packages.config

-10
This file was deleted.

Diff for: ‎Diagnostics/PostSharp.Samples.Logging.CommonLogging/PostSharp.Samples.Logging.CommonLogging.csproj

+21-34
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\..\packages\PostSharp.6.2.7\build\PostSharp.props" Condition="Exists('..\..\packages\PostSharp.6.2.7\build\PostSharp.props')" />
43
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
54
<PropertyGroup>
65
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -9,7 +8,7 @@
98
<OutputType>Exe</OutputType>
109
<RootNamespace>PostSharp.Samples.Logging.CommonLogging</RootNamespace>
1110
<AssemblyName>PostSharp.Samples.Logging.CommonLogging</AssemblyName>
12-
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
11+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
1312
<FileAlignment>512</FileAlignment>
1413
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
1514
<NuGetPackageImportStamp>
@@ -35,31 +34,8 @@
3534
<WarningLevel>4</WarningLevel>
3635
</PropertyGroup>
3736
<ItemGroup>
38-
<Reference Include="Common.Logging, Version=3.4.1.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
39-
<HintPath>..\..\packages\Common.Logging.3.4.1\lib\net40\Common.Logging.dll</HintPath>
40-
<Private>True</Private>
41-
</Reference>
42-
<Reference Include="Common.Logging.Core, Version=3.4.1.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
43-
<HintPath>..\..\packages\Common.Logging.Core.3.4.1\lib\net40\Common.Logging.Core.dll</HintPath>
44-
<Private>True</Private>
45-
</Reference>
46-
<Reference Include="PostSharp, Version=6.2.7.0, Culture=neutral, PublicKeyToken=b13fd38b8f9c99d7, processorArchitecture=MSIL">
47-
<HintPath>..\..\packages\PostSharp.Redist.6.2.7\lib\net45\PostSharp.dll</HintPath>
48-
</Reference>
49-
<Reference Include="PostSharp.Patterns.Common, Version=6.2.7.0, Culture=neutral, PublicKeyToken=e7f631e6ce13f078, processorArchitecture=MSIL">
50-
<HintPath>..\..\packages\PostSharp.Patterns.Common.Redist.6.2.7\lib\net46\PostSharp.Patterns.Common.dll</HintPath>
51-
</Reference>
52-
<Reference Include="PostSharp.Patterns.Diagnostics, Version=6.2.7.0, Culture=neutral, PublicKeyToken=e7f631e6ce13f078, processorArchitecture=MSIL">
53-
<HintPath>..\..\packages\PostSharp.Patterns.Diagnostics.Redist.6.2.7\lib\net46\PostSharp.Patterns.Diagnostics.dll</HintPath>
54-
</Reference>
55-
<Reference Include="PostSharp.Patterns.Diagnostics.Backends.CommonLogging, Version=6.2.7.0, Culture=neutral, PublicKeyToken=e7f631e6ce13f078, processorArchitecture=MSIL">
56-
<HintPath>..\..\packages\PostSharp.Patterns.Diagnostics.CommonLogging.6.2.7\lib\net40\PostSharp.Patterns.Diagnostics.Backends.CommonLogging.dll</HintPath>
57-
</Reference>
5837
<Reference Include="System" />
5938
<Reference Include="System.Core" />
60-
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
61-
<HintPath>..\..\packages\System.ValueTuple.4.5.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
62-
</Reference>
6339
<Reference Include="System.Xml.Linq" />
6440
<Reference Include="System.Data.DataSetExtensions" />
6541
<Reference Include="Microsoft.CSharp" />
@@ -73,17 +49,28 @@
7349
</ItemGroup>
7450
<ItemGroup>
7551
<None Include="App.config" />
76-
<None Include="packages.config" />
7752
<None Include="README.md" />
7853
</ItemGroup>
54+
<ItemGroup>
55+
<PackageReference Include="Common.Logging">
56+
<Version>3.4.1</Version>
57+
</PackageReference>
58+
<PackageReference Include="Microsoft.CSharp">
59+
<Version>4.5.0</Version>
60+
</PackageReference>
61+
<PackageReference Include="PostSharp">
62+
<Version>6.2.9</Version>
63+
</PackageReference>
64+
<PackageReference Include="PostSharp.Patterns.Diagnostics">
65+
<Version>6.2.9</Version>
66+
</PackageReference>
67+
<PackageReference Include="PostSharp.Patterns.Diagnostics.CommonLogging">
68+
<Version>6.2.9</Version>
69+
</PackageReference>
70+
<PackageReference Include="System.ValueTuple">
71+
<Version>4.5.0</Version>
72+
</PackageReference>
73+
</ItemGroup>
7974
<Import Project="..\PostSharp.Samples.Logging.BusinessLogic\PostSharp.Samples.Logging.BusinessLogic.projitems" Label="Shared" />
8075
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
81-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
82-
<PropertyGroup>
83-
<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>
84-
</PropertyGroup>
85-
<Error Condition="!Exists('..\..\packages\PostSharp.6.2.7\build\PostSharp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.6.2.7\build\PostSharp.props'))" />
86-
<Error Condition="!Exists('..\..\packages\PostSharp.6.2.7\build\PostSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.6.2.7\build\PostSharp.targets'))" />
87-
</Target>
88-
<Import Project="..\..\packages\PostSharp.6.2.7\build\PostSharp.targets" Condition="Exists('..\..\packages\PostSharp.6.2.7\build\PostSharp.targets')" />
8976
</Project>

Diff for: ‎Diagnostics/PostSharp.Samples.Logging.CommonLogging/packages.config

-14
This file was deleted.

0 commit comments

Comments
 (0)