Skip to content

Commit

Permalink
[Client encryption]: Fixes missing files errors at time of nuget publ…
Browse files Browse the repository at this point in the history
…ishing. (#4896)

# Pull Request Template

## Description

Updated the Microsoft.Azure.Cosmos.Encryption package and
Microsoft.Azure.Cosmos.Encryption.Custom package so as to fix missing
icon.png and license.txt errors when publishing these packages locally.

## Type of change
Below the are the errors the project throws while publishing the nuget
package.
<img width="899" alt="image"
src="https://github.com/user-attachments/assets/301ac421-93b8-4cd6-90aa-3a49f1a18d55">
<img width="932" alt="image"
src="https://github.com/user-attachments/assets/b2a0ad13-ad13-4bd2-a659-2f21863b297b">

After the fix is implemented the nuget package publishes successfully.
<img width="937" alt="image"
src="https://github.com/user-attachments/assets/afc3d1c2-3d73-43f1-94c3-09c2061ba169">
<img width="954" alt="image"
src="https://github.com/user-attachments/assets/a21cf018-070d-432f-b91f-ba13ad5d3cb8">

- [X] Bug fix (non-breaking change which fixes an issue)
## Closing issues

To automatically close an issue: closes #IssueNumber
  • Loading branch information
aavasthy authored Nov 19, 2024
1 parent 37d6894 commit 1c18566
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 6 deletions.
File renamed without changes
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,8 @@
<Title>Microsoft Azure Cosmos DB client-side encryption library for multi-tenant</Title>
<PackageId>Microsoft.Azure.Cosmos.Encryption.Custom</PackageId>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<PackageLicenseUrl>https://aka.ms/netcoregaeula</PackageLicenseUrl>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<PackageProjectUrl>https://github.com/Azure/azure-cosmos-dotnet-v3</PackageProjectUrl>
<PackageIconUrl>http://go.microsoft.com/fwlink/?LinkID=288890</PackageIconUrl>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<PackageTags>microsoft;azure;cosmos;cosmosdb;documentdb;docdb;nosql;azureofficial;dotnetcore;netcore;netstandard;client;encryption;byok</PackageTags>
Expand All @@ -33,6 +32,14 @@
<PackageReference Include="Microsoft.Azure.Cosmos" Version="3.41.0-preview.0" />
</ItemGroup>

<ItemGroup>
<None Include="..\..\LICENSE" Pack="true" PackagePath="" Visible="false" />
</ItemGroup>

<ItemGroup>
<None Include="..\..\Icon.png" Pack="true" PackagePath=""/>
</ItemGroup>

<ItemGroup Condition=" '$(SdkProjectRef)' == 'True' ">
<ProjectReference Include="..\..\Microsoft.Azure.Cosmos\src\Microsoft.Azure.Cosmos.csproj" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,8 @@
<Title>Microsoft Azure Cosmos DB client-side encryption library</Title>
<PackageId>Microsoft.Azure.Cosmos.Encryption</PackageId>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<PackageLicenseUrl>https://aka.ms/netcoregaeula</PackageLicenseUrl>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<PackageProjectUrl>https://github.com/Azure/azure-cosmos-dotnet-v3</PackageProjectUrl>
<PackageIconUrl>http://go.microsoft.com/fwlink/?LinkID=288890</PackageIconUrl>
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
Expand All @@ -28,11 +27,19 @@
<ItemGroup>
<AdditionalFiles Include="..\..\Microsoft.Azure.Cosmos\src\stylecop.json" Link="stylecop.json" />
</ItemGroup>

<ItemGroup Condition=" '$(SdkProjectRef)' != 'True' AND '$(IsPreview)' != 'True' ">
<PackageReference Include="Microsoft.Azure.Cosmos" Version="[3.35.4,3.37.0]" />
</ItemGroup>

<ItemGroup>
<None Include="..\..\Icon.png" Pack="true" PackagePath=""/>
</ItemGroup>

<ItemGroup>
<None Include="..\..\LICENSE" Pack="true" PackagePath="" Visible="false" />
</ItemGroup>

<ItemGroup Condition=" '$(SdkProjectRef)' != 'True' AND '$(IsPreview)' == 'True' ">
<PackageReference Include="Microsoft.Azure.Cosmos" Version="3.37.0-preview" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@

<ItemGroup>
<AdditionalFiles Include="stylecop.json" />
<None Include="Icon.png" Pack="true" PackagePath="\" />
<None Include="..\..\Icon.png" Pack="true" PackagePath=""/>
</ItemGroup>

<ItemGroup>
Expand Down

0 comments on commit 1c18566

Please sign in to comment.