Skip to content

Commit

Permalink
Updated
Browse files Browse the repository at this point in the history
  • Loading branch information
david-driscoll committed Jul 23, 2018
1 parent 5d5b2c9 commit cc37fad
Show file tree
Hide file tree
Showing 9 changed files with 84 additions and 70 deletions.
30 changes: 1 addition & 29 deletions Common.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,32 +5,4 @@
<Authors>David Driscoll</Authors>
<LangVersion>latest</LangVersion>
</PropertyGroup>
<PropertyGroup>
<RSG_Build_Version>2.1.0</RSG_Build_Version>
<RSG_Builders_Version>3.0.0</RSG_Builders_Version>
<RSG_Configuration_Version>0.8.0</RSG_Configuration_Version>
<RSG_DependencyInjection_Version>0.11.0</RSG_DependencyInjection_Version>
<RSG_Extensions_Version>0.8.2</RSG_Extensions_Version>
<Microsoft_NET_Sdk_Functions_Version>1.0.7</Microsoft_NET_Sdk_Functions_Version>
<Autofac_Extras_CommonServiceLocator_Version>5.0.0</Autofac_Extras_CommonServiceLocator_Version>
<Autofac_Version>4.6.2</Autofac_Version>
<NodaTime_Version>2.3.0</NodaTime_Version>
<NodaTime_Serialization_Version>2.0.0</NodaTime_Serialization_Version>
<Newtonsoft_Json_Version>11.0.2</Newtonsoft_Json_Version>
<WindowsAzure_Storage_Version>9.2.0</WindowsAzure_Storage_Version>
<Microsoft_Azure_WebJobs_Version>3.0.0-beta5</Microsoft_Azure_WebJobs_Version>
<Microsoft_Extensions_Logging_Version>2.1.0</Microsoft_Extensions_Logging_Version>
<Microsoft_Extensions_Hosting_Version>2.1.0</Microsoft_Extensions_Hosting_Version>
<Microsoft_Extensions_Options_Version>2.1.0</Microsoft_Extensions_Options_Version>
<SourceLink_Version>2.8.3</SourceLink_Version>
<RSG_Testing_Version>0.8.0</RSG_Testing_Version>
<Microsoft_NET_Test_Sdk_Version>15.7.2</Microsoft_NET_Test_Sdk_Version>
<xunit_Version>2.3.1</xunit_Version>
<FluentAssertions_Version>5.4.1</FluentAssertions_Version>
<FakeItEasy_Version>4.6.0</FakeItEasy_Version>
<Autofac_FakeItEasy_Version>5.0.1</Autofac_FakeItEasy_Version>
<Bogus_Version>22.1.3</Bogus_Version>
<XunitXml_TestLogger_Version>2.0.0</XunitXml_TestLogger_Version>
<coverlet_Version>2.0.1</coverlet_Version>
</PropertyGroup>
</Project>
</Project>
39 changes: 39 additions & 0 deletions Common.Build.targets
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<Project>
<ItemGroup>
<PackageReference Update="Microsoft.NET.Sdk.Functions" Version="1.0.14" />
<PackageReference Update="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Update="Microsoft.Azure.WebJobs" Version="3.0.0-beta5" />
<PackageReference Update="Microsoft.Azure.WebJobs.Extensions" Version="3.0.0-beta5" />
<PackageReference Update="Microsoft.Azure.WebJobs.Extensions.Http" Version="3.0.0-beta5" />
<PackageReference Update="Microsoft.Extensions.Hosting" Version="2.1.0" />
<PackageReference Update="Rocket.Surgery.Extensions" Version="0.8.3" />
<PackageReference Update="Rocket.Surgery.Extensions.DependencyInjection" Version="0.11.0" />
<PackageReference Update="Rocket.Surgery.Extensions.Configuration" Version="0.8.0" />
<PackageReference Update="Microsoft.Extensions.Logging" Version="2.1.0" />
<PackageReference Update="WindowsAzure.Storage" Version="9.3.0" />
<PackageReference Update="Rocket.Surgery.Linq.Extensions" Version="0.8.3" />
<PackageReference Update="Rocket.Surgery.Reactive.Extensions" Version="0.8.3" />
<PackageReference Update="Microsoft.Extensions.Options" Version="2.1.0" />
<PackageReference Update="Microsoft.Extensions.Logging.Abstractions" Version="2.1.0" />
<PackageReference Update="NodaTime" Version="2.3.0" />
<PackageReference Update="NodaTime.Serialization.JsonNet" Version="2.0.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Update="Rocket.Surgery.Build.Metadata" Version="2.1.0" PrivateAssets="All" />
<PackageReference Update="SourceLink.Copy.PdbFiles" Version="2.8.3" PrivateAssets="All" />
<PackageReference Update="SourceLink.Create.CommandLine" Version="2.8.3" PrivateAssets="All" />
</ItemGroup>
<ItemGroup>
<PackageReference Update="Autofac.Extras.FakeItEasy" Version="5.0.1" />
<PackageReference Update="Bogus" Version="22.3.2" />
<PackageReference Update="coverlet.msbuild" Version="2.1.1" />
<PackageReference Update="FakeItEasy" Version="4.7.1" />
<PackageReference Update="FakeItEasy.Analyzer.CSharp" Version="4.7.1" />
<PackageReference Update="FluentAssertions" Version="5.4.1" />
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="15.8.0" />
<PackageReference Update="Rocket.Surgery.Extensions.Testing" Version="0.8.2" />
<PackageReference Update="xunit" Version="2.4.0" />
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.0" />
<PackageReference Update="XunitXml.TestLogger" Version="2.0.0" />
</ItemGroup>
</Project>
15 changes: 7 additions & 8 deletions samples/FunctionApp1/FunctionApp1.csproj
Original file line number Diff line number Diff line change
@@ -1,21 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<AzureFunctionsVersion>v2</AzureFunctionsVersion>
<PreserveCompilationContext>true</PreserveCompilationContext>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="1.0.13" />
<PackageReference Include="Newtonsoft.Json" Version="$(Newtonsoft_Json_Version)" />
<PackageReference Include="Microsoft.Azure.WebJobs" Version="$(Microsoft_Azure_WebJobs_Version)" />
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions" Version="$(Microsoft_Azure_WebJobs_Version)" />
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Http" Version="$(Microsoft_Azure_WebJobs_Version)" />
<PackageReference Include="Microsoft.NET.Sdk.Functions" />
<PackageReference Include="Newtonsoft.Json" />
<PackageReference Include="Microsoft.Azure.WebJobs" />
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions" />
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Http" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\Azure.Functions\Rocket.Surgery.Azure.Functions.csproj" />
</ItemGroup>

<ItemGroup>
<None Update="host.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
Expand All @@ -25,6 +24,6 @@
<CopyToPublishDirectory>Never</CopyToPublishDirectory>
</None>
</ItemGroup>

<Import Project="..\..\src\Azure.Functions\build\Rocket.Surgery.Azure.Functions.targets" />
<Import Project="$([MSBuild]::GetPathOfFileAbove('Common.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
</Project>
18 changes: 9 additions & 9 deletions src/Azure.Functions/Rocket.Surgery.Azure.Functions.csproj
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Azure.WebJobs" Version="$(Microsoft_Azure_WebJobs_Version)" />
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions" Version="$(Microsoft_Azure_WebJobs_Version)" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="$(Microsoft_Extensions_Hosting_Version)" />
<PackageReference Include="Rocket.Surgery.Extensions" Version="$(RSG_Extensions_Version)" />
<PackageReference Include="Rocket.Surgery.Extensions.DependencyInjection" Version="$(RSG_DependencyInjection_Version)" />
<PackageReference Include="Rocket.Surgery.Extensions.Configuration" Version="$(RSG_Configuration_Version)" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="$(Microsoft_Extensions_Logging_Version)" />
<PackageReference Include="Microsoft.Azure.WebJobs" />
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions" />
<PackageReference Include="Microsoft.Extensions.Hosting" />
<PackageReference Include="Rocket.Surgery.Extensions" />
<PackageReference Include="Rocket.Surgery.Extensions.DependencyInjection" />
<PackageReference Include="Rocket.Surgery.Extensions.Configuration" />
<PackageReference Include="Microsoft.Extensions.Logging" />
</ItemGroup>
<ItemGroup>
<None Include="build/*.*" Pack="true" PackagePath="build" />
<None Include="buildMultiTargeting/*.*" Pack="true" PackagePath="buildMultiTargeting" />
</ItemGroup>
</Project>
</Project>
20 changes: 10 additions & 10 deletions src/Azure.Storage/Rocket.Surgery.Azure.Storage.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="WindowsAzure.Storage" Version="$(WindowsAzure_Storage_Version)" />
<PackageReference Include="Rocket.Surgery.Extensions" Version="$(RSG_Extensions_Version)" />
<PackageReference Include="Rocket.Surgery.Linq.Extensions" Version="$(RSG_Extensions_Version)" />
<PackageReference Include="Rocket.Surgery.Reactive.Extensions" Version="$(RSG_Extensions_Version)" />
<PackageReference Include="Microsoft.Extensions.Options" Version="$(Microsoft_Extensions_Options_Version)" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(Microsoft_Extensions_Logging_Version)" />
<PackageReference Include="NodaTime" Version="$(NodaTime_Version)" />
<PackageReference Include="NodaTime.Serialization.JsonNet" Version="$(NodaTime_Serialization_Version)" />
<PackageReference Include="Newtonsoft.Json" Version="$(Newtonsoft_Json_Version)" />
<PackageReference Include="WindowsAzure.Storage" />
<PackageReference Include="Rocket.Surgery.Extensions" />
<PackageReference Include="Rocket.Surgery.Linq.Extensions" />
<PackageReference Include="Rocket.Surgery.Reactive.Extensions" />
<PackageReference Include="Microsoft.Extensions.Options" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
<PackageReference Include="NodaTime" />
<PackageReference Include="NodaTime.Serialization.JsonNet" />
<PackageReference Include="Newtonsoft.Json" />
</ItemGroup>
</Project>
</Project>
3 changes: 3 additions & 0 deletions src/Directory.Build.targets
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<Project>
<Import Project="$([MSBuild]::GetPathOfFileAbove('Common.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
</Project>
4 changes: 2 additions & 2 deletions test/Azure.Tests/Rocket.Surgery.Azure.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
<ItemGroup>
<ProjectReference Include="..\..\src\Azure.Functions\Rocket.Surgery.Azure.Functions.csproj" />
<ProjectReference Include="..\..\src\Azure.Storage\Rocket.Surgery.Azure.Storage.csproj" />
<PackageReference Include="Newtonsoft.Json" Version="$(Newtonsoft_Json_Version)" />
<PackageReference Include="Newtonsoft.Json" />
</ItemGroup>
</Project>
</Project>
2 changes: 1 addition & 1 deletion test/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<CollectCoverage>true</CollectCoverage>
<CoverletOutputFormat>json,lcov,cobertura</CoverletOutputFormat>
<CoverletOutputDirectory>$([System.IO.Path]::GetDirectoryName($([MSBuild]::GetPathOfFileAbove('Common.Build.props', '$(MSBuildThisFileDirectory)../'))))/coverage/</CoverletOutputDirectory>
<CoverletOutput>$([System.IO.Path]::GetDirectoryName($([MSBuild]::GetPathOfFileAbove('Common.Build.props', '$(MSBuildThisFileDirectory)../'))))/coverage/</CoverletOutput>
<CoverletOutputName>$(MSBuildProjectName)-$(TargetFramework)</CoverletOutputName>
</PropertyGroup>
</Project>
23 changes: 12 additions & 11 deletions test/Directory.Build.targets
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
<Project>
<ItemGroup>
<PackageReference Include="Rocket.Surgery.Extensions.Testing" Version="$(RSG_Testing_Version)" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(Microsoft_NET_Test_Sdk_Version)" />
<PackageReference Include="xunit.runner.visualstudio" Version="$(xunit_Version)" />
<PackageReference Include="xunit" Version="$(xunit_Version)" />
<PackageReference Include="FluentAssertions" Version="$(FluentAssertions_Version)" />
<PackageReference Include="FakeItEasy" Version="$(FakeItEasy_Version)" />
<PackageReference Include="FakeItEasy.Analyzer.CSharp" Version="$(FakeItEasy_Version)" />
<PackageReference Include="Autofac.Extras.FakeItEasy" Version="$(Autofac_FakeItEasy_Version)" />
<PackageReference Include="Bogus" Version="$(Bogus_Version)" />
<PackageReference Include="XunitXml.TestLogger" Version="$(XunitXml_TestLogger_Version)" />
<PackageReference Include="coverlet.msbuild" Version="$(coverlet_Version)" />
<PackageReference Include="Rocket.Surgery.Extensions.Testing" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="xunit.runner.visualstudio" />
<PackageReference Include="xunit" />
<PackageReference Include="FluentAssertions" />
<PackageReference Include="FakeItEasy" />
<PackageReference Include="FakeItEasy.Analyzer.CSharp" />
<PackageReference Include="Autofac.Extras.FakeItEasy" />
<PackageReference Include="Bogus" />
<PackageReference Include="XunitXml.TestLogger" />
<PackageReference Include="coverlet.msbuild" />
</ItemGroup>
<ItemGroup>
<Content Include="xunit.runner.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<Import Project="$([MSBuild]::GetPathOfFileAbove('Common.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
</Project>

0 comments on commit cc37fad

Please sign in to comment.