Skip to content

Commit

Permalink
Add direct nuget packages references
Browse files Browse the repository at this point in the history
  • Loading branch information
standeren committed Dec 8, 2023
1 parent d09506e commit 73cba7b
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 33 deletions.
1 change: 1 addition & 0 deletions backend/packagegroups/NuGet.props
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<PackageReference Update="Microsoft.VisualStudio.Web.BrowserLink" Version="2.2.0" />
<PackageReference Update="HtmlAgilityPack" Version="1.11.54" />
<PackageReference Update="Microsoft.DiaSymReader.Native" Version="1.7.0" />
<PackageReference Update="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.16" />
<PackageReference Update="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.22" />
<PackageReference Update="Scrutor" Version="4.2.2" />
<PackageReference Update="Yuniql.AspNetCore" Version="1.2.25" />
Expand Down
3 changes: 3 additions & 0 deletions backend/src/Designer/Designer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,13 @@
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" />
<PackageReference Include="Microsoft.Azure.KeyVault" />
<PackageReference Include="Microsoft.Azure.Services.AppAuthentication" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" />
<PackageReference Include="Microsoft.CodeAnalysis.Common" />
<PackageReference Include="Microsoft.Extensions.Configuration.AzureKeyVault" />
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" />
<PackageReference Include="HtmlAgilityPack" />
<PackageReference Include="Microsoft.DiaSymReader.Native" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" />
<PackageReference Include="Polly" />
<PackageReference Include="Scrutor" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,40 +16,42 @@ export const SchemaGenerationErrorsPanel = ({
const { t } = useTranslation();

return (
<Alert severity='danger' className={classes.errorPanel}>
<div>
<Paragraph>{t('api_errors.DM_01')}</Paragraph>
<ul>
{schemaGenerationErrorMessages?.map((errorMessage, index) => {
return (
<li key={index}>
<ErrorMessage>
{errorMessage.includes(
'member names cannot be the same as their enclosing type',
) ? (
<Trans
i18nKey={'api_errors.DM_CsharpCompiler_NameCollision'}
values={{ nodeName: errorMessage.match(/'([^']+)':/)?.[1] }}
components={{ bold: <strong /> }}
/>
) : (
<>{errorMessage}</>
)}
</ErrorMessage>
</li>
);
})}
</ul>
<Alert severity='danger'>
<div className={classes.errorPanel}>
<div>
<Paragraph>{t('api_errors.DM_01')}</Paragraph>
<ul>
{schemaGenerationErrorMessages?.map((errorMessage, index) => {
return (
<li key={index}>
<ErrorMessage>
{errorMessage.includes(
'member names cannot be the same as their enclosing type',
) ? (
<Trans
i18nKey={'api_errors.DM_CsharpCompiler_NameCollision'}
values={{ nodeName: errorMessage.match(/'([^']+)':/)?.[1] }}
components={{ bold: <strong /> }}
/>
) : (
<>{errorMessage}</>
)}
</ErrorMessage>
</li>
);
})}
</ul>
</div>
<Button
color='danger'
open={schemaGenerationErrorMessages.length > 0}
onClick={onCloseErrorsPanel}
variant='tertiary'
icon={<XMarkIcon />}
>
{t('general.close')}
</Button>
</div>
<Button
color='danger'
open={schemaGenerationErrorMessages.length > 0}
onClick={onCloseErrorsPanel}
variant='tertiary'
icon={<XMarkIcon />}
>
{t('general.close')}
</Button>
</Alert>
);
};

0 comments on commit 73cba7b

Please sign in to comment.