Skip to content

Commit 55f18b4

Browse files
ismcagdasismcagdas
authored
Merge pull request #186 from aspnetboilerplate/pr/5942
Upgrade to ABP 6.1.1
2 parents 108addb + eb00576 commit 55f18b4

37 files changed

+729
-199
lines changed

‎src/AbpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\packages\ConfigureAwait.Fody.3.3.1\build\ConfigureAwait.Fody.props" Condition="Exists('..\packages\ConfigureAwait.Fody.3.3.1\build\ConfigureAwait.Fody.props')" />
34
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
45
<PropertyGroup>
56
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -35,17 +36,17 @@
3536
<WarningLevel>4</WarningLevel>
3637
</PropertyGroup>
3738
<ItemGroup>
38-
<Reference Include="Abp, Version=6.0.0.0, Culture=neutral, processorArchitecture=MSIL">
39-
<HintPath>..\packages\Abp.6.0.0\lib\netstandard2.0\Abp.dll</HintPath>
39+
<Reference Include="Abp, Version=6.1.1.0, Culture=neutral, processorArchitecture=MSIL">
40+
<HintPath>..\packages\Abp.6.1.1\lib\netstandard2.0\Abp.dll</HintPath>
4041
</Reference>
41-
<Reference Include="Abp.AutoMapper, Version=6.0.0.0, Culture=neutral, processorArchitecture=MSIL">
42-
<HintPath>..\packages\Abp.AutoMapper.6.0.0\lib\netstandard2.0\Abp.AutoMapper.dll</HintPath>
42+
<Reference Include="Abp.AutoMapper, Version=6.1.1.0, Culture=neutral, processorArchitecture=MSIL">
43+
<HintPath>..\packages\Abp.AutoMapper.6.1.1\lib\netstandard2.0\Abp.AutoMapper.dll</HintPath>
4344
</Reference>
44-
<Reference Include="Abp.Zero, Version=6.0.0.0, Culture=neutral, processorArchitecture=MSIL">
45-
<HintPath>..\packages\Abp.Zero.6.0.0\lib\net461\Abp.Zero.dll</HintPath>
45+
<Reference Include="Abp.Zero, Version=6.1.1.0, Culture=neutral, processorArchitecture=MSIL">
46+
<HintPath>..\packages\Abp.Zero.6.1.1\lib\net461\Abp.Zero.dll</HintPath>
4647
</Reference>
47-
<Reference Include="Abp.Zero.Common, Version=6.0.0.0, Culture=neutral, processorArchitecture=MSIL">
48-
<HintPath>..\packages\Abp.Zero.Common.6.0.0\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
48+
<Reference Include="Abp.Zero.Common, Version=6.1.1.0, Culture=neutral, processorArchitecture=MSIL">
49+
<HintPath>..\packages\Abp.Zero.Common.6.1.1\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
4950
</Reference>
5051
<Reference Include="AutoMapper, Version=10.0.0.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
5152
<HintPath>..\packages\AutoMapper.10.1.1\lib\net461\AutoMapper.dll</HintPath>
@@ -65,6 +66,9 @@
6566
<Reference Include="Castle.Windsor, Version=5.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
6667
<HintPath>..\packages\Castle.Windsor.5.1.0-beta001\lib\net45\Castle.Windsor.dll</HintPath>
6768
</Reference>
69+
<Reference Include="ConfigureAwait, Version=3.3.1.0, Culture=neutral, PublicKeyToken=233850a516558a98, processorArchitecture=MSIL">
70+
<HintPath>..\packages\ConfigureAwait.Fody.3.3.1\lib\net452\ConfigureAwait.dll</HintPath>
71+
</Reference>
6872
<Reference Include="JetBrains.Annotations, Version=2020.2.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
6973
<HintPath>..\packages\JetBrains.Annotations.2020.2.0-eap\lib\net20\JetBrains.Annotations.dll</HintPath>
7074
</Reference>
@@ -274,8 +278,11 @@
274278
</PropertyGroup>
275279
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
276280
<Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
281+
<Error Condition="!Exists('..\packages\Fody.6.0.2\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.6.0.2\build\Fody.targets'))" />
282+
<Error Condition="!Exists('..\packages\ConfigureAwait.Fody.3.3.1\build\ConfigureAwait.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ConfigureAwait.Fody.3.3.1\build\ConfigureAwait.Fody.props'))" />
277283
</Target>
278284
<Import Project="..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
285+
<Import Project="..\packages\Fody.6.0.2\build\Fody.targets" Condition="Exists('..\packages\Fody.6.0.2\build\Fody.targets')" />
279286
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
280287
Other similar extension points exist, see Microsoft.Common.targets.
281288
<Target Name="BeforeBuild">

‎src/AbpCompanyName.AbpProjectName.Application/FodyWeavers.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
2+
<ConfigureAwait />
3+
</Weavers>

‎src/AbpCompanyName.AbpProjectName.Application/FodyWeavers.xsd‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
3+
<!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
4+
<xs:element name="Weavers">
5+
<xs:complexType>
6+
<xs:all>
7+
<xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
8+
<xs:complexType>
9+
<xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
10+
</xs:complexType>
11+
</xs:element>
12+
</xs:all>
13+
<xs:attribute name="VerifyAssembly" type="xs:boolean">
14+
<xs:annotation>
15+
<xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
16+
</xs:annotation>
17+
</xs:attribute>
18+
<xs:attribute name="VerifyIgnoreCodes" type="xs:string">
19+
<xs:annotation>
20+
<xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
21+
</xs:annotation>
22+
</xs:attribute>
23+
<xs:attribute name="GenerateXsd" type="xs:boolean">
24+
<xs:annotation>
25+
<xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
26+
</xs:annotation>
27+
</xs:attribute>
28+
</xs:complexType>
29+
</xs:element>
30+
</xs:schema>

‎src/AbpCompanyName.AbpProjectName.Application/packages.config‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="6.0.0" targetFramework="net461" />
4-
<package id="Abp.AutoMapper" version="6.0.0" targetFramework="net461" />
5-
<package id="Abp.Zero" version="6.0.0" targetFramework="net461" />
6-
<package id="Abp.Zero.Common" version="6.0.0" targetFramework="net461" />
3+
<package id="Abp" version="6.1.1" targetFramework="net461" />
4+
<package id="Abp.AutoMapper" version="6.1.1" targetFramework="net461" />
5+
<package id="Abp.Zero" version="6.1.1" targetFramework="net461" />
6+
<package id="Abp.Zero.Common" version="6.1.1" targetFramework="net461" />
77
<package id="AutoMapper" version="10.1.1" targetFramework="net461" />
88
<package id="AutoMapper.Collection" version="7.0.0" targetFramework="net461" />
99
<package id="Castle.Core" version="4.4.1" targetFramework="net461" />
1010
<package id="Castle.Core.AsyncInterceptor" version="2.0.21-alpha" targetFramework="net461" />
1111
<package id="Castle.LoggingFacility" version="5.1.0-beta001" targetFramework="net461" />
1212
<package id="Castle.Windsor" version="5.1.0-beta001" targetFramework="net461" />
13+
<package id="ConfigureAwait.Fody" version="3.3.1" targetFramework="net461" />
14+
<package id="Fody" version="6.0.2" targetFramework="net461" developmentDependency="true" />
1315
<package id="JetBrains.Annotations" version="2020.2.0-eap" targetFramework="net461" />
1416
<package id="Microsoft.AspNet.Identity.Core" version="2.2.3" targetFramework="net461" />
1517
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net461" />

‎src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\packages\ConfigureAwait.Fody.3.3.1\build\ConfigureAwait.Fody.props" Condition="Exists('..\packages\ConfigureAwait.Fody.3.3.1\build\ConfigureAwait.Fody.props')" />
34
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
45
<PropertyGroup>
56
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -35,14 +36,14 @@
3536
<WarningLevel>4</WarningLevel>
3637
</PropertyGroup>
3738
<ItemGroup>
38-
<Reference Include="Abp, Version=6.0.0.0, Culture=neutral, processorArchitecture=MSIL">
39-
<HintPath>..\packages\Abp.6.0.0\lib\netstandard2.0\Abp.dll</HintPath>
39+
<Reference Include="Abp, Version=6.1.1.0, Culture=neutral, processorArchitecture=MSIL">
40+
<HintPath>..\packages\Abp.6.1.1\lib\netstandard2.0\Abp.dll</HintPath>
4041
</Reference>
41-
<Reference Include="Abp.Zero, Version=6.0.0.0, Culture=neutral, processorArchitecture=MSIL">
42-
<HintPath>..\packages\Abp.Zero.6.0.0\lib\net461\Abp.Zero.dll</HintPath>
42+
<Reference Include="Abp.Zero, Version=6.1.1.0, Culture=neutral, processorArchitecture=MSIL">
43+
<HintPath>..\packages\Abp.Zero.6.1.1\lib\net461\Abp.Zero.dll</HintPath>
4344
</Reference>
44-
<Reference Include="Abp.Zero.Common, Version=6.0.0.0, Culture=neutral, processorArchitecture=MSIL">
45-
<HintPath>..\packages\Abp.Zero.Common.6.0.0\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
45+
<Reference Include="Abp.Zero.Common, Version=6.1.1.0, Culture=neutral, processorArchitecture=MSIL">
46+
<HintPath>..\packages\Abp.Zero.Common.6.1.1\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
4647
</Reference>
4748
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
4849
<HintPath>..\packages\Castle.Core.4.4.1\lib\net45\Castle.Core.dll</HintPath>
@@ -56,6 +57,9 @@
5657
<Reference Include="Castle.Windsor, Version=5.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
5758
<HintPath>..\packages\Castle.Windsor.5.1.0-beta001\lib\net45\Castle.Windsor.dll</HintPath>
5859
</Reference>
60+
<Reference Include="ConfigureAwait, Version=3.3.1.0, Culture=neutral, PublicKeyToken=233850a516558a98, processorArchitecture=MSIL">
61+
<HintPath>..\packages\ConfigureAwait.Fody.3.3.1\lib\net452\ConfigureAwait.dll</HintPath>
62+
</Reference>
5963
<Reference Include="JetBrains.Annotations, Version=2020.2.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
6064
<HintPath>..\packages\JetBrains.Annotations.2020.2.0-eap\lib\net20\JetBrains.Annotations.dll</HintPath>
6165
</Reference>
@@ -273,8 +277,11 @@
273277
</PropertyGroup>
274278
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
275279
<Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
280+
<Error Condition="!Exists('..\packages\Fody.6.0.2\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.6.0.2\build\Fody.targets'))" />
281+
<Error Condition="!Exists('..\packages\ConfigureAwait.Fody.3.3.1\build\ConfigureAwait.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ConfigureAwait.Fody.3.3.1\build\ConfigureAwait.Fody.props'))" />
276282
</Target>
277283
<Import Project="..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
284+
<Import Project="..\packages\Fody.6.0.2\build\Fody.targets" Condition="Exists('..\packages\Fody.6.0.2\build\Fody.targets')" />
278285
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
279286
Other similar extension points exist, see Microsoft.Common.targets.
280287
<Target Name="BeforeBuild">

‎src/AbpCompanyName.AbpProjectName.Core/FodyWeavers.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
2+
<ConfigureAwait />
3+
</Weavers>

‎src/AbpCompanyName.AbpProjectName.Core/FodyWeavers.xsd‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
3+
<!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
4+
<xs:element name="Weavers">
5+
<xs:complexType>
6+
<xs:all>
7+
<xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
8+
<xs:complexType>
9+
<xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
10+
</xs:complexType>
11+
</xs:element>
12+
</xs:all>
13+
<xs:attribute name="VerifyAssembly" type="xs:boolean">
14+
<xs:annotation>
15+
<xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
16+
</xs:annotation>
17+
</xs:attribute>
18+
<xs:attribute name="VerifyIgnoreCodes" type="xs:string">
19+
<xs:annotation>
20+
<xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
21+
</xs:annotation>
22+
</xs:attribute>
23+
<xs:attribute name="GenerateXsd" type="xs:boolean">
24+
<xs:annotation>
25+
<xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
26+
</xs:annotation>
27+
</xs:attribute>
28+
</xs:complexType>
29+
</xs:element>
30+
</xs:schema>

‎src/AbpCompanyName.AbpProjectName.Core/packages.config‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="6.0.0" targetFramework="net461" />
4-
<package id="Abp.Zero" version="6.0.0" targetFramework="net461" />
5-
<package id="Abp.Zero.Common" version="6.0.0" targetFramework="net461" />
3+
<package id="Abp" version="6.1.1" targetFramework="net461" />
4+
<package id="Abp.Zero" version="6.1.1" targetFramework="net461" />
5+
<package id="Abp.Zero.Common" version="6.1.1" targetFramework="net461" />
66
<package id="Castle.Core" version="4.4.1" targetFramework="net461" />
77
<package id="Castle.Core.AsyncInterceptor" version="2.0.21-alpha" targetFramework="net461" />
88
<package id="Castle.LoggingFacility" version="5.1.0-beta001" targetFramework="net461" />
99
<package id="Castle.Windsor" version="5.1.0-beta001" targetFramework="net461" />
10+
<package id="ConfigureAwait.Fody" version="3.3.1" targetFramework="net461" />
11+
<package id="Fody" version="6.0.2" targetFramework="net461" developmentDependency="true" />
1012
<package id="JetBrains.Annotations" version="2020.2.0-eap" targetFramework="net461" />
1113
<package id="Microsoft.AspNet.Identity.Core" version="2.2.3" targetFramework="net461" />
1214
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net461" />

0 commit comments

Comments
 (0)