Skip to content
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

Jump to bottom

[Client encryption]: Fixes missing files errors at time of nuget publishing. #4896

Merged
merged 7 commits into from
Nov 19, 2024
Merged

[Client encryption]: Fixes missing files errors at time of nuget publishing. #4896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
45b2b91
Fix build issues at time of nuget pack.
aavasthy Nov 18, 2024
2bfbc25
Merge branch 'master' into users/aavasthy/fix_encryptionproject_build
aavasthy Nov 18, 2024
a365f22
Updated the license for encryption and encryption.custom projects.
aavasthy Nov 18, 2024
761808d
Merge branch 'master' into users/aavasthy/fix_encryptionproject_build
aavasthy Nov 18, 2024
8714ae5
Keep Icon.png in common folder.
aavasthy Nov 18, 2024
b2ddd4a
Merge branch 'master' into users/aavasthy/fix_encryptionproject_build
aavasthy Nov 19, 2024
ca6a627
Merge branch 'master' into users/aavasthy/fix_encryptionproject_build
aavasthy Nov 19, 2024
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
0 Microsoft.Azure.Cosmos/src/Icon.png → Icon.png
View file
Open in desktop
File renamed without changes
11 changes: 9 additions & 2 deletions Microsoft.Azure.Cosmos.Encryption.Custom/src/Microsoft.Azure.Cosmos.Encryption.Custom.csproj
View file
Open in desktop
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
13 changes: 10 additions & 3 deletions Microsoft.Azure.Cosmos.Encryption/src/Microsoft.Azure.Cosmos.Encryption.csproj
View file
Open in desktop
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
View file
Open in desktop
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
Loading