Skip to content

Commit

Permalink
bumping http, newtonsoft dependencies (#581)
Browse files Browse the repository at this point in the history
  • Loading branch information
brettsam committed Aug 16, 2022
1 parent 81748f5 commit 22c14d2
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 24 deletions.
18 changes: 9 additions & 9 deletions common.props
Expand Up @@ -4,37 +4,37 @@

<MajorProductVersion>4</MajorProductVersion>
<MinorProductVersion>1</MinorProductVersion>
<PatchProductVersion>1</PatchProductVersion>
<PatchProductVersion>2</PatchProductVersion>

<!-- Clear this value for non-preview releases -->
<PreviewProductVersion></PreviewProductVersion>

<VersionPrefix>$(MajorProductVersion).$(MinorProductVersion).$(PatchProductVersion)</VersionPrefix>

<BuildNumber Condition="$(BuildNumber) == ''">0</BuildNumber>
<UseSuffix Condition="$(UseSuffix) == ''">true</UseSuffix>

<PreviewString Condition="'$(PreviewProductVersion)' != ''">-preview$(PreviewProductVersion)</PreviewString>

<VersionSuffix Condition="$(PreviewString) != '' AND $(UseSuffix) == 'true'">-preview$(PreviewProductVersion).$(BuildNumber)</VersionSuffix>
<VersionSuffix Condition="$(PreviewString) != '' AND $(UseSuffix) != 'true'">-preview$(PreviewProductVersion)</VersionSuffix>
<VersionSuffix Condition="$(PreviewString) == '' AND $(UseSuffix) == 'true'">-$(BuildNumber)</VersionSuffix>

<Version>$(VersionPrefix)$(VersionSuffix)</Version>
<Version>$(VersionPrefix)$(VersionSuffix)</Version>

<AssemblyVersion>$(VersionPrefix).0</AssemblyVersion>
<FileVersion>$(VersionPrefix).$(BuildNumber)</FileVersion>
<LangVersion>latest</LangVersion>
<DebugType>embedded</DebugType>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'Release'">
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>PublicKey.snk</AssemblyOriginatorKeyFile>
<DelaySign>true</DelaySign>
<DefineConstants>$(DefineConstants);RELEASE_BUILD</DefineConstants>
</PropertyGroup>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
Expand Down
@@ -1,19 +1,19 @@
<Project Sdk="Microsoft.NET.Sdk">

<Import Project="..\..\common.props"/>

<PropertyGroup>
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="[11.0.2]" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="System.Runtime.Handles" Version="4.3.0" />
<PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
<PackageReference Include="Mono.Cecil" Version="0.11.3" />
</ItemGroup>

</Project>
22 changes: 11 additions & 11 deletions src/Microsoft.NET.Sdk.Functions/Microsoft.NET.Sdk.Functions.csproj
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\src\Microsoft.NET.Sdk.Functions.MSBuild\Targets\ExtensionsMetadataGeneratorVersion.props" />
<Import Project="..\..\common.props"/>

<PropertyGroup>
<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<PackageName>Microsoft.NET.Sdk.Functions</PackageName>
<Authors>Microsoft</Authors>
Expand All @@ -27,26 +27,26 @@
<Content Include="..\..\src\Microsoft.NET.Sdk.Functions.MSBuild\Targets\**\*">
<Pack>true</Pack>
<PackagePath>build\</PackagePath>
<Visible>false</Visible>
<Visible>false</Visible>
</Content>

<!-- MSBuild task assemblies -->
<!-- MSBuild task assemblies -->
<None Include="$(FunctionsBuildTaskOutputPath)\netstandard2.0\Microsoft.NET.Sdk.Functions.MSBuild.dll">
<Pack>true</Pack>
<PackagePath>tools\net6.0\</PackagePath>
<Visible>false</Visible>
<Visible>false</Visible>
</None>

<!-- Generator and dependent assemblies-->
<None Include="$(FunctionsGeneratorOutputPath)\net6.0\Newtonsoft.Json.dll">
<Pack>true</Pack>
<PackagePath>tools\net6.0\</PackagePath>
<Visible>false</Visible>
<Visible>false</Visible>
</None>
<None Include="$(FunctionsGeneratorOutputPath)\net6.0\Mono.Cecil.dll">
<Pack>true</Pack>
<PackagePath>tools\net6.0\</PackagePath>
<Visible>false</Visible>
<Visible>false</Visible>
</None>
<None Include="$(FunctionsGeneratorOutputPath)\net6.0\Microsoft.NET.Sdk.Functions.Generator.dll">
<Pack>true</Pack>
Expand All @@ -57,15 +57,15 @@
<Pack>true</Pack>
<PackagePath>tools\net6.0\</PackagePath>
<Visible>false</Visible>
</None>
</None>
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Azure.Functions.Analyzers" Version="[1.0.0,2.0.0)" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="Microsoft.Azure.WebJobs" Version="[3.0.23,3.1.0)" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Microsoft.Azure.WebJobs" Version="[3.0.32,3.1.0)" />
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions" Version="3.0.6" />
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Http" Version="[3.0.2,3.1.0)" />
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Http" Version="[3.2.0,3.3.0)" />
<PackageReference Include="Microsoft.Azure.WebJobs.Script.ExtensionsMetadataGenerator" Version="$(ExtensionsMetadataGeneratorVersion)" />
</ItemGroup>

Expand All @@ -76,6 +76,6 @@
<ProjectReference Include="..\Microsoft.NET.Sdk.Functions.Generator\Microsoft.NET.Sdk.Functions.Generator.csproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
</ItemGroup>

</Project>

0 comments on commit 22c14d2

Please sign in to comment.