Skip to content

Commit cc763cf

Browse files
Chris Martinezcommonsensesoftware
Chris Martinez
authored and
commonsensesoftware
committed
Update packages and build
1 parent d5a0843 commit cc763cf

File tree

9 files changed

+61
-56
lines changed

9 files changed

+61
-56
lines changed

‎src/Microsoft.AspNet.OData.Versioning.ApiExplorer/Microsoft.AspNet.OData.Versioning.ApiExplorer.csproj

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,17 @@
44
<VersionPrefix>1.0.0</VersionPrefix>
55
<AssemblyVersion>1.0.0.0</AssemblyVersion>
66
<TargetFramework>net45</TargetFramework>
7-
<AssemblyName>Microsoft.AspNet.OData.Versioning.ApiExplorer</AssemblyName>
87
<AssemblyTitle>Microsoft ASP.NET Web API Versioned API Explorer for OData v4.0</AssemblyTitle>
98
<Description>The API Explorer for Microsoft ASP.NET Web API Versioning and OData v4.0.</Description>
109
<RootNamespace>Microsoft.Web.Http</RootNamespace>
1110
<DefineConstants>$(DefineConstants);WEBAPI</DefineConstants>
1211
<PackageTags>Microsoft;AspNet;AspNetWebAPI;Versioning;ApiExplorer;OData</PackageTags>
13-
<PackageReleaseNotes></PackageReleaseNotes>
1412
</PropertyGroup>
1513

14+
<ItemGroup>
15+
<!--<ReleaseNotes Include="" />-->
16+
</ItemGroup>
17+
1618
<ItemGroup>
1719
<ProjectReference Include="..\Microsoft.AspNet.OData.Versioning\Microsoft.AspNet.OData.Versioning.csproj" />
1820
<ProjectReference Include="..\Microsoft.AspNet.WebApi.Versioning.ApiExplorer\Microsoft.AspNet.WebApi.Versioning.ApiExplorer.csproj" />
@@ -39,6 +41,6 @@
3941
</ItemGroup>
4042

4143
<Import Project="..\Shared\Shared.projitems" Label="Shared" />
42-
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.targets))\build.targets" />
44+
<Import Project="$([MSBuild]::GetPathOfFileAbove(build.targets))" />
4345

4446
</Project>

‎src/Microsoft.AspNet.OData.Versioning/Microsoft.AspNet.OData.Versioning.csproj

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,16 @@
44
<VersionPrefix>2.1.0</VersionPrefix>
55
<AssemblyVersion>2.1.0.0</AssemblyVersion>
66
<TargetFramework>net45</TargetFramework>
7-
<AssemblyName>Microsoft.AspNet.OData.Versioning</AssemblyName>
87
<AssemblyTitle>Microsoft ASP.NET Web API Versioning for OData v4.0</AssemblyTitle>
98
<Description>A service API versioning library for Microsoft ASP.NET Web API and OData v4.0.</Description>
109
<RootNamespace>Microsoft</RootNamespace>
1110
<PackageTags>Microsoft;AspNet;AspNetWebAPI;OData;Versioning</PackageTags>
12-
<PackageReleaseNotes>https://github.com/Microsoft/aspnet-api-versioning/releases/tag/v1.1.0</PackageReleaseNotes>
1311
</PropertyGroup>
1412

13+
<ItemGroup>
14+
<ReleaseNotes Include="https://github.com/Microsoft/aspnet-api-versioning/releases/tag/v1.1.0" />
15+
</ItemGroup>
16+
1517
<ItemGroup>
1618
<ProjectReference Include="..\Microsoft.AspNet.WebApi.Versioning\Microsoft.AspNet.WebApi.Versioning.csproj" />
1719
</ItemGroup>
@@ -41,6 +43,6 @@
4143
</ItemGroup>
4244

4345
<Import Project="..\Shared\Shared.projitems" Label="Shared" />
44-
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.targets))\build.targets" />
46+
<Import Project="$([MSBuild]::GetPathOfFileAbove(build.targets))" />
4547

4648
</Project>

‎src/Microsoft.AspNet.WebApi.Versioning.ApiExplorer/Microsoft.AspNet.WebApi.Versioning.ApiExplorer.csproj

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,17 @@
44
<VersionPrefix>1.0.2</VersionPrefix>
55
<AssemblyVersion>1.0.0.0</AssemblyVersion>
66
<TargetFramework>net45</TargetFramework>
7-
<AssemblyName>Microsoft.AspNet.WebApi.Versioning.ApiExplorer</AssemblyName>
87
<AssemblyTitle>Microsoft ASP.NET Web API Versioned API Explorer</AssemblyTitle>
98
<Description>The API Explorer for Microsoft ASP.NET Web API Versioning.</Description>
109
<RootNamespace>Microsoft.Web.Http</RootNamespace>
1110
<DefineConstants>$(DefineConstants);WEBAPI</DefineConstants>
1211
<PackageTags>Microsoft;AspNet;AspNetWebAPI;Versioning;ApiExplorer</PackageTags>
13-
<PackageReleaseNotes>• Fix cloning MediaTypeFormatter.SupportedMediaTypes (Issue #164)</PackageReleaseNotes>
1412
</PropertyGroup>
1513

14+
<ItemGroup>
15+
<ReleaseNotes Include="Fix cloning MediaTypeFormatter.SupportedMediaTypes (Issue #164)" />
16+
</ItemGroup>
17+
1618
<ItemGroup>
1719
<Compile Include="..\Shared\SharedAssemblyInfo.cs" Link="SharedAssemblyInfo.cs" />
1820
</ItemGroup>
@@ -42,6 +44,6 @@
4244
</ItemGroup>
4345

4446
<Import Project="..\Common.ApiExplorer\Common.ApiExplorer.projitems" Label="Shared" />
45-
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.targets))\build.targets" />
47+
<Import Project="$([MSBuild]::GetPathOfFileAbove(build.targets))" />
4648

4749
</Project>

‎src/Microsoft.AspNet.WebApi.Versioning/Microsoft.AspNet.WebApi.Versioning.csproj

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,17 @@
44
<VersionPrefix>2.1.0</VersionPrefix>
55
<AssemblyVersion>2.1.0.0</AssemblyVersion>
66
<TargetFramework>net45</TargetFramework>
7-
<AssemblyName>Microsoft.AspNet.WebApi.Versioning</AssemblyName>
87
<AssemblyTitle>Microsoft ASP.NET Web API Versioning</AssemblyTitle>
98
<Description>A service API versioning library for Microsoft ASP.NET Web API.</Description>
109
<RootNamespace>Microsoft.Web.Http</RootNamespace>
1110
<DefineConstants>$(DefineConstants);WEBAPI</DefineConstants>
1211
<PackageTags>Microsoft;AspNet;AspNetWebAPI;Versioning</PackageTags>
13-
<PackageReleaseNotes>https://github.com/Microsoft/aspnet-api-versioning/releases/tag/v1.1.0</PackageReleaseNotes>
1412
</PropertyGroup>
1513

14+
<ItemGroup>
15+
<ReleaseNotes Include="https://github.com/Microsoft/aspnet-api-versioning/releases/tag/v1.1.0" />
16+
</ItemGroup>
17+
1618
<ItemGroup>
1719
<PackageReference Include="Microsoft.AspNet.WebApi.Core" Version="5.2.3" />
1820
</ItemGroup>
@@ -39,6 +41,6 @@
3941

4042
<Import Project="..\Common\Common.projitems" Label="Shared" />
4143
<Import Project="..\Shared\Shared.projitems" Label="Shared" />
42-
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.targets))\build.targets" />
44+
<Import Project="$([MSBuild]::GetPathOfFileAbove(build.targets))" />
4345

4446
</Project>

‎test/Microsoft.AspNet.OData.Versioning.ApiExplorer.Tests/Microsoft.AspNet.OData.Versioning.ApiExplorer.Tests.csproj

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,26 @@
22

33
<PropertyGroup>
44
<TargetFramework>net452</TargetFramework>
5-
<AssemblyName>Microsoft.AspNet.OData.Versioning.ApiExplorer.Tests</AssemblyName>
65
<RootNamespace>Microsoft.Web.Http</RootNamespace>
76
</PropertyGroup>
87

98
<ItemGroup>
109
<ProjectReference Include="..\..\src\Microsoft.AspNet.OData.Versioning.ApiExplorer\Microsoft.AspNet.OData.Versioning.ApiExplorer.csproj" />
1110
</ItemGroup>
1211

12+
<ItemGroup>
13+
<Reference Include="Microsoft.CSharp" />
14+
<Reference Include="System" />
15+
<Reference Include="System.ComponentModel.DataAnnotations" />
16+
</ItemGroup>
17+
1318
<ItemGroup>
1419
<PackageReference Include="FluentAssertions" Version="4.19.2" />
1520
<PackageReference Include="Moq" Version="4.7.0" />
16-
<PackageReference Include="more.xunit" Version="2.2.2" />
17-
<PackageReference Include="more.xunit.runner.visualstudio" Version="2.2.1" />
21+
<PackageReference Include="more.xunit" Version="2.2.3" />
22+
<PackageReference Include="more.xunit.runner.visualstudio" Version="2.2.3" />
1823
<PackageReference Include="System.Runtime" Version="4.1.0" />
1924
<PackageReference Include="System.Threading.Tasks" Version="4.0.11" />
2025
</ItemGroup>
2126

22-
<ItemGroup>
23-
<Reference Include="System" />
24-
<Reference Include="System.ComponentModel.DataAnnotations" />
25-
<Reference Include="Microsoft.CSharp" />
26-
</ItemGroup>
27-
2827
</Project>

‎test/Microsoft.AspNet.OData.Versioning.Tests/Microsoft.AspNet.OData.Versioning.Tests.csproj

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
<PropertyGroup>
44
<TargetFramework>net452</TargetFramework>
5-
<AssemblyName>Microsoft.AspNet.OData.Versioning.Tests</AssemblyName>
65
<RootNamespace>Microsoft</RootNamespace>
76
</PropertyGroup>
87

@@ -11,17 +10,17 @@
1110
</ItemGroup>
1211

1312
<ItemGroup>
14-
<PackageReference Include="more.xunit" Version="2.2.2" />
15-
<PackageReference Include="more.xunit.runner.visualstudio" Version="2.2.1" />
13+
<Reference Include="Microsoft.CSharp" />
14+
<Reference Include="System" />
15+
</ItemGroup>
16+
17+
<ItemGroup>
1618
<PackageReference Include="FluentAssertions" Version="4.19.2" />
1719
<PackageReference Include="Moq" Version="4.7.0" />
18-
</ItemGroup>
19-
20-
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
20+
<PackageReference Include="more.xunit" Version="2.2.3" />
21+
<PackageReference Include="more.xunit.runner.visualstudio" Version="2.2.3" />
2122
<PackageReference Include="System.Runtime" Version="4.1.0" />
2223
<PackageReference Include="System.Threading.Tasks" Version="4.0.11" />
23-
<Reference Include="System" />
24-
<Reference Include="Microsoft.CSharp" />
2524
</ItemGroup>
26-
25+
2726
</Project>

‎test/Microsoft.AspNet.WebApi.Acceptance.Tests/Microsoft.AspNet.WebApi.Acceptance.Tests.csproj

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
<PropertyGroup>
44
<TargetFramework>net452</TargetFramework>
5+
<RootNamespace>Microsoft.Web</RootNamespace>
56
<DefineConstants>$(DefineConstants);WEBAPI</DefineConstants>
6-
<AssemblyName>Microsoft.AspNet.WebApi.Acceptance.Tests</AssemblyName>
77
</PropertyGroup>
88

99
<ItemGroup>
@@ -12,19 +12,19 @@
1212
</ItemGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="more.xunit" Version="2.2.2" />
16-
<PackageReference Include="more.xunit.runner.visualstudio" Version="2.2.1" />
17-
<PackageReference Include="Microsoft.AspNet.WebApi.Core" Version="5.2.3" />
18-
<PackageReference Include="FluentAssertions" Version="4.19.2" />
19-
<PackageReference Include="Moq" Version="4.7.0" />
15+
<Reference Include="Microsoft.CSharp" />
16+
<Reference Include="System" />
17+
<Reference Include="System.ComponentModel.DataAnnotations" />
2018
</ItemGroup>
2119

22-
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
20+
<ItemGroup>
21+
<PackageReference Include="FluentAssertions" Version="4.19.2" />
22+
<PackageReference Include="Microsoft.AspNet.WebApi.Core" Version="5.2.3" />
23+
<PackageReference Include="Moq" Version="4.7.0" />
24+
<PackageReference Include="more.xunit" Version="2.2.3" />
25+
<PackageReference Include="more.xunit.runner.visualstudio" Version="2.2.3" />
2326
<PackageReference Include="System.Runtime" Version="4.1.0" />
2427
<PackageReference Include="System.Threading.Tasks" Version="4.0.11" />
25-
<Reference Include="System.ComponentModel.DataAnnotations" />
26-
<Reference Include="System" />
27-
<Reference Include="Microsoft.CSharp" />
2828
</ItemGroup>
2929

3030
<Import Project="..\Acceptance.Test.Shared\Acceptance.Test.Shared.projitems" Label="Shared" />

‎test/Microsoft.AspNet.WebApi.Versioning.ApiExplorer.Tests/Microsoft.AspNet.WebApi.Versioning.ApiExplorer.Tests.csproj

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,25 @@
22

33
<PropertyGroup>
44
<TargetFramework>net452</TargetFramework>
5-
<AssemblyName>Microsoft.AspNet.WebApi.Versioning.ApiExplorer.Tests</AssemblyName>
65
<RootNamespace>Microsoft.Web.Http</RootNamespace>
76
</PropertyGroup>
87

98
<ItemGroup>
109
<ProjectReference Include="..\..\src\Microsoft.AspNet.WebApi.Versioning.ApiExplorer\Microsoft.AspNet.WebApi.Versioning.ApiExplorer.csproj" />
1110
</ItemGroup>
1211

12+
<ItemGroup>
13+
<Reference Include="Microsoft.CSharp" />
14+
<Reference Include="System" />
15+
</ItemGroup>
16+
1317
<ItemGroup>
1418
<PackageReference Include="FluentAssertions" Version="4.19.2" />
1519
<PackageReference Include="Moq" Version="4.7.0" />
16-
<PackageReference Include="more.xunit" Version="2.2.2" />
17-
<PackageReference Include="more.xunit.runner.visualstudio" Version="2.2.1" />
20+
<PackageReference Include="more.xunit" Version="2.2.3" />
21+
<PackageReference Include="more.xunit.runner.visualstudio" Version="2.2.3" />
1822
<PackageReference Include="System.Runtime" Version="4.1.0" />
1923
<PackageReference Include="System.Threading.Tasks" Version="4.0.11" />
2024
</ItemGroup>
2125

22-
<ItemGroup>
23-
<Reference Include="System" />
24-
<Reference Include="Microsoft.CSharp" />
25-
</ItemGroup>
26-
2726
</Project>

‎test/Microsoft.AspNet.WebApi.Versioning.Tests/Microsoft.AspNet.WebApi.Versioning.Tests.csproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,26 @@
22

33
<PropertyGroup>
44
<TargetFramework>net452</TargetFramework>
5+
<RootNamespace>Microsoft.Web.Http</RootNamespace>
56
<DefineConstants>$(DefineConstants);WEBAPI</DefineConstants>
6-
<AssemblyName>Microsoft.AspNet.WebApi.Versioning.Tests</AssemblyName>
77
</PropertyGroup>
88

99
<ItemGroup>
1010
<ProjectReference Include="..\..\src\Microsoft.AspNet.WebApi.Versioning\Microsoft.AspNet.WebApi.Versioning.csproj" />
1111
</ItemGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="more.xunit" Version="2.2.2" />
15-
<PackageReference Include="more.xunit.runner.visualstudio" Version="2.2.1" />
14+
<Reference Include="Microsoft.CSharp" />
15+
<Reference Include="System" />
16+
</ItemGroup>
17+
18+
<ItemGroup>
1619
<PackageReference Include="FluentAssertions" Version="4.19.2" />
1720
<PackageReference Include="Moq" Version="4.7.0" />
18-
</ItemGroup>
19-
20-
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
21+
<PackageReference Include="more.xunit" Version="2.2.3" />
22+
<PackageReference Include="more.xunit.runner.visualstudio" Version="2.2.3" />
2123
<PackageReference Include="System.Runtime" Version="4.1.0" />
2224
<PackageReference Include="System.Threading.Tasks" Version="4.0.11" />
23-
<Reference Include="System" />
24-
<Reference Include="Microsoft.CSharp" />
2525
</ItemGroup>
2626

2727
<Import Project="..\Test.Common\Test.Common.projitems" Label="Shared" />

0 commit comments

Comments
 (0)