Skip to content

Include AzureFunctions.Handlers sources as package content #696

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Oct 24, 2022
Merged

Include AzureFunctions.Handlers sources as package content #696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9ecfa6f
Include GeneXus.Deploy.AzureFunctions.Handlers.csproj sources and pro…
claudiamurialdo Oct 7, 2022
3f1bd5b
Remove duplicate content items.
claudiamurialdo Oct 7, 2022
b3d829f
Remove local project dependencies for package .csproj.
claudiamurialdo Oct 7, 2022
941d0ba
Improve variable names.
claudiamurialdo Oct 7, 2022
a5bf874
Ignore at ProjectHeathTest the package references with variable versi…
claudiamurialdo Oct 7, 2022
480ecf1
Exclude obj and bin form src in package.
claudiamurialdo Oct 8, 2022
75fa4ba
Fix name GenStdVersion.
claudiamurialdo Oct 8, 2022
c6fa9a8
Added NoWarn for 1701;1702;NU1701.
claudiamurialdo Oct 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,3 +367,5 @@ build
/dotnet/Veracode.sln
/dotnet/VeracodeSolution.sln

/dotnet/src/extensions/Azure/Handlers/GeneXus.Deploy.AzureFunctions.Handlers.Ext.csproj
/dotnet/src/extensions/Azure/Handlers/GeneXus.Deploy.AzureFunctions.Handlers.Sources.csproj
90 changes: 51 additions & 39 deletions dotnet/src/extensions/Azure/Handlers/GeneXus.Deploy.AzureFunctions.Handlers.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,41 +1,53 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<OutputType>Exe</OutputType>
<AzureFunctionsVersion>v4</AzureFunctionsVersion>
<IsPublishable>false</IsPublishable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="log4net" Version="2.0.11" />
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.0.13" />
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.ServiceBus" Version="4.2.1" />
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Storage" Version="5.0.0" />
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Timer" Version="4.0.1" />
<PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.3.0" OutputItemType="Analyzer" />
<PackageReference Include="Microsoft.Azure.Functions.Worker" Version="1.5.2" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="1.0.19269.1" />
<PackageReference Include="StackExchange.Redis" Version="2.0.593" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\dotnetcore\GxClasses.Web\GxClasses.Web.csproj" />
<ProjectReference Include="..\..\..\dotnetcore\GxClasses\GxClasses.csproj" />
<ProjectReference Include="..\..\..\dotnetcore\GxExcel\GxExcel.csproj" />
<ProjectReference Include="..\..\..\dotnetcore\GxMail\GxMail.csproj" />
<ProjectReference Include="..\..\..\dotnetcore\Providers\Cache\GxRedis\GxRedis.csproj" />
</ItemGroup>
<ItemGroup>
<None Update="host.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="local.settings.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<CopyToPublishDirectory>Never</CopyToPublishDirectory>
</None>
</ItemGroup>
<ItemGroup>
<Content Include="$(OutputPath)net6.0\$(MSBuildProjectName).deps.json;$(MSBuildProjectName).runtimeconfig.json">
<Pack>true</Pack>
<PackagePath>./lib/net6.0/</PackagePath>
</Content>
</ItemGroup>
<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<OutputType>Exe</OutputType>
<AzureFunctionsVersion>v4</AzureFunctionsVersion>
<IsPublishable>false</IsPublishable>
<AssemblyName>GeneXus.Deploy.AzureFunctions.Handlers</AssemblyName>
<NoWarn>1701;1702;NU1701</NoWarn>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="log4net" Version="2.0.11" />
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.0.13" />
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.ServiceBus" Version="4.2.1" />
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Storage" Version="5.0.0" />
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Timer" Version="4.0.1" />
<PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.3.0" OutputItemType="Analyzer" />
<PackageReference Include="Microsoft.Azure.Functions.Worker" Version="1.5.2" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="1.0.19269.1" />
<PackageReference Include="StackExchange.Redis" Version="2.0.593" />
</ItemGroup>
<ItemGroup Condition="$(GenStdVersion)==''">
<ProjectReference Include="..\..\..\dotnetcore\GxClasses.Web\GxClasses.Web.csproj" />
<ProjectReference Include="..\..\..\dotnetcore\GxClasses\GxClasses.csproj" />
<ProjectReference Include="..\..\..\dotnetcore\GxExcel\GxExcel.csproj" />
<ProjectReference Include="..\..\..\dotnetcore\GxMail\GxMail.csproj" />
<ProjectReference Include="..\..\..\dotnetcore\Providers\Cache\GxRedis\GxRedis.csproj" />
</ItemGroup>
<ItemGroup Condition="$(GenStdVersion)!=''">
<PackageReference Include="GeneXus.Classes.Web.Core" Version="$(GenStdVersion)" />
<PackageReference Include="GeneXus.Mail.Core" Version="$(GenStdVersion)" />
<PackageReference Include="GeneXus.Excel.Core" Version="$(GenStdVersion)" />
<PackageReference Include="GeneXus.Redis.Core" Version="$(GenStdVersion)" />
</ItemGroup>
<ItemGroup>
<None Update="host.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="local.settings.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<CopyToPublishDirectory>Never</CopyToPublishDirectory>
</None>
</ItemGroup>
<ItemGroup>
<Content Include="$(OutputPath)net6.0\$(MSBuildProjectName).deps.json;$(MSBuildProjectName).runtimeconfig.json">
<Pack>true</Pack>
<PackagePath>./lib/net6.0/</PackagePath>
</Content>
<Content Include="$(MSBuildProjectName).csproj;.\**\*.cs;host.json;local.settings.json;" Exclude=".\obj\**\*.cs;.\bin\**\*">
<Pack>true</Pack>
<PackagePath>./src/</PackagePath>
</Content>
</ItemGroup>
</Project>
23 changes: 14 additions & 9 deletions dotnet/src/extensions/Azure/Handlers/host.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
{
"version": "2.0",
"logging": {
"applicationInsights": {
"samplingSettings": {
"isEnabled": true,
"excludedTypes": "Request"
}
}
}
"version": "2.0",
"logging": {
"applicationInsights": {
"samplingSettings": {
"isEnabled": true,
"excludedTypes": "Request"
}
}
},
"extensions": {
"http": {
"routePrefix": ""
}
}
}
27 changes: 15 additions & 12 deletions dotnet/test/ProjectHealthTest/PackageVersionsConsistency.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,21 +110,24 @@ private void TestPackageVersionConsistencyAcrossProjects(string targetFramework,
string packageId = packageIdAtt.Value;
XmlAttribute packageVersionAtt = packageNode.Attributes[PACKAGE_VERSION_ATTRIBUTE_NAME];
Assert.True(packageVersionAtt != null, $"{fileInfo.FullName} contains an invalid Package Version for a packageReference");
string packageVersion = packageVersionAtt.Value;

if (!packageVersionsById.TryGetValue(packageId, out ICollection<PackageVersionItem> packageVersions))
if (packageVersionAtt != null && !packageVersionAtt.Value.StartsWith('$'))
{
packageVersions = new List<PackageVersionItem>();
packageVersionsById.Add(packageId, packageVersions);
}
string packageVersion = packageVersionAtt.Value;

if (!packageVersions.Any(o => o.Version.Equals(packageVersion, StringComparison.OrdinalIgnoreCase)))
{
packageVersions.Add(new PackageVersionItem()
if (!packageVersionsById.TryGetValue(packageId, out ICollection<PackageVersionItem> packageVersions))
{
packageVersions = new List<PackageVersionItem>();
packageVersionsById.Add(packageId, packageVersions);
}

if (!packageVersions.Any(o => o.Version.Equals(packageVersion, StringComparison.OrdinalIgnoreCase)))
{
SourceFile = fileInfo.FullName,
Version = packageVersion
});
packageVersions.Add(new PackageVersionItem()
{
SourceFile = fileInfo.FullName,
Version = packageVersion
});
}
}
}
}
Expand Down