Skip to content

Commit 0ebfd44

Browse files
jaschrep-msftjaschrep-msft
authored
Storage csproj cleanup (Azure#38190)
* datamovement base gets unique constant | remove CSE * removed several datamovement.blobs includes * remove several includes base datamovement * remove progress from datamovement.blobs * more datamovement.blobs removes * re-add some shared source to test projects
1 parent 5c697b1 commit 0ebfd44

File tree

4 files changed

+10
-99
lines changed

4 files changed

+10
-99
lines changed

‎sdk/storage/Azure.Storage.DataMovement.Blobs/src/Azure.Storage.DataMovement.Blobs.csproj‎

Lines changed: 1 addition & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFrameworks>$(RequiredTargetFrameworks);net6.0</TargetFrameworks>
44
<IncludeGeneratorSharedCode>true</IncludeGeneratorSharedCode>
@@ -19,12 +19,6 @@
1919
<RootNamespace>Azure.Storage.DataMovement.Blobs</RootNamespace>
2020
<PackageId />
2121
</PropertyGroup>
22-
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
23-
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
24-
</PropertyGroup>
25-
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
26-
<Compile Include="$(AzureStorageSharedSources)AesGcm\**\*.cs" LinkBase="Shared\Storage" />
27-
</ItemGroup>
2822
<ItemGroup>
2923
<!--<PackageReference Include="Azure.Storage.Blobs" />-->
3024
<ProjectReference Include="$(MSBuildThisFileDirectory)..\..\Azure.Storage.Blobs\src\Azure.Storage.Blobs.csproj" />
@@ -34,72 +28,25 @@
3428
<ProjectReference Include="$(MSBuildThisFileDirectory)..\..\Azure.Storage.DataMovement\src\Azure.Storage.DataMovement.csproj" />
3529
</ItemGroup>
3630
<ItemGroup>
37-
<Compile Include="$(AzureCoreSharedSources)ArrayBufferWriter.cs" LinkBase="Shared\Core" />
38-
<Compile Include="$(AzureCoreSharedSources)AuthorizationChallengeParser.cs" LinkBase="Shared\Core" />
39-
<Compile Include="$(AzureCoreSharedSources)AzureSasCredentialSynchronousPolicy.cs" LinkBase="Shared\Core" />
4031
<Compile Include="$(AzureCoreSharedSources)CancellationHelper.cs" LinkBase="SharedCore" />
41-
<Compile Include="$(AzureCoreSharedSources)ForwardsClientCallsAttribute.cs" LinkBase="Shared\Core" />
42-
<Compile Include="$(AzureCoreSharedSources)NoBodyResponseOfT.cs" LinkBase="Shared\Core" />
4332
<Compile Include="$(AzureCoreSharedSources)SyncAsyncEventHandlerExtensions.cs" LinkBase="Shared\Core" />
4433
</ItemGroup>
4534
<ItemGroup>
4635
<PackageReference Include="Azure.Core" />
4736
</ItemGroup>
4837
<ItemGroup>
49-
<Compile Include="$(AzureStorageSharedSources)ClientsideEncryption\*.cs" LinkBase="Shared\Storage" />
50-
<Compile Include="$(AzureStorageSharedSources)ClientsideEncryption\Models\*.cs" LinkBase="Shared\Storage" />
51-
<Compile Include="$(AzureStorageSharedSources)AggregatingProgressIncrementer.cs" LinkBase="Shared\Storage" />
52-
<Compile Include="$(AzureStorageSharedSources)ChecksumCalculatingStream.cs" LinkBase="Shared" />
5338
<Compile Include="$(AzureStorageSharedSources)Constants.cs" LinkBase="Shared\Storage" />
54-
<Compile Include="$(AzureStorageSharedSources)ContentHasher.cs" LinkBase="Shared\Storage" />
5539
<Compile Include="$(AzureStorageSharedSources)Errors.cs" LinkBase="Shared\Storage" />
5640
<Compile Include="$(AzureStorageSharedSources)Errors.Clients.cs" LinkBase="Shared\Storage" />
57-
<Compile Include="$(AzureStorageSharedSources)GeoRedundantReadPolicy.cs" LinkBase="Shared\Storage" />
58-
<Compile Include="$(AzureStorageSharedSources)HashAlgorithmHasher.cs" LinkBase="Shared\Storage" />
59-
<Compile Include="$(AzureStorageSharedSources)IDownloadedContent.cs" LinkBase="Shared\Storage" />
60-
<Compile Include="$(AzureStorageSharedSources)IHasher.cs" LinkBase="Shared\Storage" />
61-
<Compile Include="$(AzureStorageSharedSources)LoggingExtensions.cs" LinkBase="Shared\Storage" />
62-
<Compile Include="$(AzureStorageSharedSources)NonCryptographicHashAlgorithmHasher.cs" LinkBase="Shared\Storage" />
63-
<Compile Include="$(AzureStorageSharedSources)NonDisposingStream.cs" LinkBase="Shared\Storage" />
64-
<Compile Include="$(AzureStorageSharedSources)PartitionedStream.cs" LinkBase="Shared\Storage" />
65-
<Compile Include="$(AzureStorageSharedSources)PooledMemoryStream.cs" LinkBase="Shared\Storage" />
66-
<Compile Include="$(AzureStorageSharedSources)ProgressIncrementingStream.cs" LinkBase="Shared\Storage" />
67-
<Compile Include="$(AzureStorageSharedSources)SasExtensions.cs" LinkBase="Shared\Storage" />
68-
<Compile Include="$(AzureStorageSharedSources)SasQueryParametersInternals.cs" LinkBase="Shared\Storage" />
69-
<Compile Include="$(AzureStorageSharedSources)SharedAccessSignatureCredentials.cs" LinkBase="Shared\Storage" />
70-
<Compile Include="$(AzureStorageSharedSources)StorageClientConfiguration.cs" LinkBase="Shared\Storage" />
71-
<Compile Include="$(AzureStorageSharedSources)StorageClientOptions.cs" LinkBase="Shared\Storage" />
72-
<Compile Include="$(AzureStorageSharedSources)StorageConnectionString.cs" LinkBase="Shared\Storage" />
73-
<Compile Include="$(AzureStorageSharedSources)StorageCollectionEnumerator.cs" LinkBase="Shared\Storage" />
7441
<Compile Include="$(AzureStorageSharedSources)StorageExtensions.cs" LinkBase="Shared\Storage" />
75-
<Compile Include="$(AzureStorageSharedSources)StorageExceptionExtensions.cs" LinkBase="Shared\Storage" />
76-
<Compile Include="$(AzureStorageSharedSources)StorageRequestFailedDetailsParser.cs" LinkBase="Shared" />
77-
<Compile Include="$(AzureStorageSharedSources)StorageRequestValidationPipelinePolicy.cs" LinkBase="Shared\Storage" />
78-
<Compile Include="$(AzureStorageSharedSources)StorageProgressExtensions.cs" LinkBase="Shared\Storage" />
79-
<Compile Include="$(AzureStorageSharedSources)StorageSharedKeyCredentialInternals.cs" LinkBase="Shared\Storage" />
80-
<Compile Include="$(AzureStorageSharedSources)StorageSharedKeyPipelinePolicy.cs" LinkBase="Shared\Storage" />
81-
<Compile Include="$(AzureStorageSharedSources)StorageResponseClassifier.cs" LinkBase="Shared\Storage" />
82-
<Compile Include="$(AzureStorageSharedSources)StorageServerTimeoutPolicy.cs" LinkBase="Shared\Storage" />
83-
<Compile Include="$(AzureStorageSharedSources)StorageVersionExtensions.cs" LinkBase="Shared\Storage" />
8442
<Compile Include="$(AzureStorageSharedSources)UriExtensions.cs" LinkBase="Shared\Storage" />
85-
<Compile Include="$(AzureStorageSharedSources)UriQueryParamsCollection.cs" LinkBase="Shared\Storage" />
86-
<Compile Include="$(AzureStorageSharedSources)UserDelegationKeyProperties.cs" LinkBase="Shared\Storage" />
87-
<Compile Include="$(AzureStorageSharedSources)LazyLoadingReadOnlyStream.cs" LinkBase="Shared\Storage" />
88-
<Compile Include="$(AzureStorageSharedSources)WindowStream.cs" LinkBase="Shared\Storage" />
89-
<Compile Include="$(AzureStorageSharedSources)StorageBearerTokenChallengeAuthorizationPolicy.cs" LinkBase="Shared\Storage" />
9043
<Compile Include="$(AzureStorageSharedSources)StreamExtensions.cs" LinkBase="Shared" />
91-
<Compile Include="$(AzureStorageSharedSources)TransferValidationOptionsExtensions.cs" LinkBase="Shared\Storage" />
92-
<Compile Include="$(AzureStorageSharedSources)ISupportsTenantIdChallenges.cs" LinkBase="Shared\Storage" />
9344
</ItemGroup>
9445
<ItemGroup>
9546
<Compile Include="$(AzureStorageDataMovementSharedSources)CheckpointerExtensions.cs" LinkBase="Shared\DataMovement" />
9647
<Compile Include="$(AzureStorageDataMovementSharedSources)Errors.DataMovement.cs" LinkBase="Shared\DataMovement" />
9748
<Compile Include="$(AzureStorageDataMovementSharedSources)DataMovementConstants.cs" LinkBase="Shared\DataMovement" />
9849
<Compile Include="$(AzureStorageDataMovementSharedSources)JobPlanExtensions.cs" LinkBase="Shared\DataMovement" />
99-
<Compile Include="$(AzureStorageDataMovementSharedSources)PartitionedProgressIncrementer.cs" LinkBase="Shared\DataMovement" />
100-
<Compile Include="$(AzureStorageDataMovementSharedSources)ProgressMultipleParititonedStream.cs" LinkBase="Shared\DataMovement" />
101-
<Compile Include="$(AzureStorageDataMovementSharedSources)PathScanner.cs" LinkBase="Shared\DataMovement" />
102-
<Compile Include="$(AzureStorageDataMovementSharedSources)PathScannerFactory.cs" LinkBase="Shared\DataMovement" />
10350
<Compile Include="$(AzureStorageDataMovementSharedSources)ResponseExtensions.cs" LinkBase="Shared\DataMovement" />
10451
<Compile Include="$(AzureStorageDataMovementSharedSources)LocalTransferCheckpointer.cs" LinkBase="Shared\DataMovement" />
10552
<Compile Include="$(AzureStorageDataMovementSharedSources)TransferCheckpointer.cs" LinkBase="Shared\DataMovement" />
@@ -110,6 +57,5 @@
11057
</ItemGroup>
11158
<ItemGroup>
11259
<Compile Include="$(AzureStorageBlobsSharedSources)BlobErrors.cs" LinkBase="Shared\Blobs" />
113-
<Compile Include="$(AzureStorageBlobsSharedSources)BlobClientConfiguration.cs" LinkBase="Shared\Blobs" />
11460
</ItemGroup>
11561
</Project>

‎sdk/storage/Azure.Storage.DataMovement.Blobs/tests/Azure.Storage.DataMovement.Blobs.Tests.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@
1717
<Compile Include="$(AzureStorageDataMovementTestSharedSources)TransferUtility.cs" LinkBase="Shared\DataMovement" />
1818
</ItemGroup>
1919
<ItemGroup>
20+
<Compile Include="$(AzureStorageSharedSources)SharedAccessSignatureCredentials.cs" LinkBase="Shared\Storage" />
21+
<Compile Include="$(AzureStorageSharedSources)StorageConnectionString.cs" LinkBase="Shared\Storage" />
22+
<Compile Include="$(AzureStorageSharedSources)StorageVersionExtensions.cs" LinkBase="Shared\Storage" />
23+
<Compile Include="$(AzureStorageSharedSources)UriQueryParamsCollection.cs" LinkBase="Shared\Storage" />
2024
<Compile Include="$(AzureStorageDataMovementSharedSources)..\JobPlan\*.cs" LinkBase="Shared\DataMovement\JobPlanModels" />
2125
</ItemGroup>
2226
<ItemGroup>

‎sdk/storage/Azure.Storage.DataMovement/src/Azure.Storage.DataMovement.csproj‎

Lines changed: 1 addition & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<PropertyGroup>
66
<AssemblyTitle>Microsoft Azure.Storage.DataMovement client library</AssemblyTitle>
77
<Version>12.0.0-beta.4</Version>
8-
<DefineConstants>BlobDataMovementSDK;$(DefineConstants)</DefineConstants>
8+
<DefineConstants>DataMovementSDK;$(DefineConstants)</DefineConstants>
99
<PackageTags>Microsoft Azure Storage Common DataMovement, Microsoft, Azure, StorageScalable, azureofficial</PackageTags>
1010
<Description>
1111
This client library enables working with the Microsoft Azure Storage services which include the blob and file services for storing binary and text data, and the queue service for storing messages that may be accessed by a client.
@@ -21,64 +21,21 @@
2121
<PackageReference Include="System.Threading.Channels" />
2222
<PackageReference Include="Azure.Core" />
2323
</ItemGroup>
24-
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
25-
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
26-
</PropertyGroup>
27-
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
28-
<Compile Include="$(AzureStorageSharedSources)AesGcm\**\*.cs" LinkBase="Shared\Storage" />
29-
</ItemGroup>
3024
<ItemGroup>
3125
<PackageReference Include="Azure.Storage.Common" />
3226
</ItemGroup>
3327
<ItemGroup>
3428
<Compile Include="$(AzureStorageSharedSources)Constants.cs" Link="Shared\%(RecursiveDir)\%(Filename)%(Extension)" />
3529
</ItemGroup>
3630
<ItemGroup>
37-
<Compile Include="$(AzureCoreSharedSources)AuthorizationChallengeParser.cs" LinkBase="Shared\Core" />
38-
<Compile Include="$(AzureCoreSharedSources)AzureResourceProviderNamespaceAttribute.cs" LinkBase="Shared\Core" />
39-
<Compile Include="$(AzureCoreSharedSources)AzureSasCredentialSynchronousPolicy.cs" LinkBase="Shared\Core" />
40-
<Compile Include="$(AzureCoreSharedSources)RetriableStream.cs" LinkBase="Shared\Core" />
41-
<Compile Include="$(AzureCoreSharedSources)ArrayBufferWriter.cs" LinkBase="Shared\Core" />
4231
<Compile Include="$(AzureCoreSharedSources)CancellationHelper.cs" LinkBase="Shared\Core" />
43-
<Compile Include="$(AzureCoreSharedSources)ForwardsClientCallsAttribute.cs" LinkBase="Shared\Core" />
44-
<Compile Include="$(AzureCoreSharedSources)HashCodeBuilder.cs" LinkBase="Shared\Core" />
45-
<Compile Include="$(AzureCoreSharedSources)NoBodyResponseOfT.cs" LinkBase="Shared\Core" />
4632
<Compile Include="$(AzureCoreSharedSources)SyncAsyncEventHandlerExtensions.cs" LinkBase="Shared\Core" />
4733
</ItemGroup>
4834
<ItemGroup>
49-
<Compile Include="$(AzureStorageSharedSources)ClientsideEncryption\*.cs" LinkBase="Shared\Storage" />
50-
<Compile Include="$(AzureStorageSharedSources)ClientsideEncryption\Models\*.cs" LinkBase="Shared\Storage" />
5135
<Compile Include="$(AzureStorageSharedSources)AggregatingProgressIncrementer.cs" LinkBase="Shared\Storage" />
5236
<Compile Include="$(AzureStorageSharedSources)Errors.cs" LinkBase="Shared\Storage" />
5337
<Compile Include="$(AzureStorageSharedSources)Errors.Clients.cs" LinkBase="Shared\Storage" />
54-
<Compile Include="$(AzureStorageSharedSources)GeoRedundantReadPolicy.cs" LinkBase="Shared\Storage" />
55-
<Compile Include="$(AzureStorageSharedSources)IDownloadedContent.cs" LinkBase="Shared\Storage" />
56-
<Compile Include="$(AzureStorageSharedSources)LoggingExtensions.cs" LinkBase="Shared\Storage" />
57-
<Compile Include="$(AzureStorageSharedSources)NonDisposingStream.cs" LinkBase="Shared\Storage" />
5838
<Compile Include="$(AzureStorageSharedSources)PartitionedStream.cs" LinkBase="Shared\Storage" />
59-
<Compile Include="$(AzureStorageSharedSources)PooledMemoryStream.cs" LinkBase="Shared\Storage" />
6039
<Compile Include="$(AzureStorageSharedSources)ProgressIncrementingStream.cs" LinkBase="Shared\Storage" />
61-
<Compile Include="$(AzureStorageSharedSources)SasExtensions.cs" LinkBase="Shared\Storage" />
62-
<Compile Include="$(AzureStorageSharedSources)SasQueryParametersInternals.cs" LinkBase="Shared\Storage" />
63-
<Compile Include="$(AzureStorageSharedSources)SharedAccessSignatureCredentials.cs" LinkBase="Shared\Storage" />
64-
<Compile Include="$(AzureStorageSharedSources)StorageClientConfiguration.cs" LinkBase="Shared\Storage" />
65-
<Compile Include="$(AzureStorageSharedSources)StorageClientOptions.cs" LinkBase="Shared\Storage" />
66-
<Compile Include="$(AzureStorageSharedSources)StorageConnectionString.cs" LinkBase="Shared\Storage" />
67-
<Compile Include="$(AzureStorageSharedSources)StorageCollectionEnumerator.cs" LinkBase="Shared\Storage" />
68-
<Compile Include="$(AzureStorageSharedSources)StorageExtensions.cs" LinkBase="Shared\Storage" />
69-
<Compile Include="$(AzureStorageSharedSources)StorageExceptionExtensions.cs" LinkBase="Shared\Storage" />
70-
<Compile Include="$(AzureStorageSharedSources)StorageRequestFailedDetailsParser.cs" LinkBase="Shared" />
71-
<Compile Include="$(AzureStorageSharedSources)StorageRequestValidationPipelinePolicy.cs" LinkBase="Shared\Storage" />
72-
<Compile Include="$(AzureStorageSharedSources)StorageProgressExtensions.cs" LinkBase="Shared\Storage" />
73-
<Compile Include="$(AzureStorageSharedSources)StorageSharedKeyCredentialInternals.cs" LinkBase="Shared\Storage" />
74-
<Compile Include="$(AzureStorageSharedSources)StorageSharedKeyPipelinePolicy.cs" LinkBase="Shared\Storage" />
75-
<Compile Include="$(AzureStorageSharedSources)StorageResponseClassifier.cs" LinkBase="Shared\Storage" />
76-
<Compile Include="$(AzureStorageSharedSources)StorageServerTimeoutPolicy.cs" LinkBase="Shared\Storage" />
77-
<Compile Include="$(AzureStorageSharedSources)UriExtensions.cs" LinkBase="Shared\Storage" />
78-
<Compile Include="$(AzureStorageSharedSources)UriQueryParamsCollection.cs" LinkBase="Shared\Storage" />
79-
<Compile Include="$(AzureStorageSharedSources)UserDelegationKeyProperties.cs" LinkBase="Shared\Storage" />
80-
<Compile Include="$(AzureStorageSharedSources)WindowStream.cs" LinkBase="Shared\Storage" />
81-
<Compile Include="$(AzureStorageSharedSources)\StorageBearerTokenChallengeAuthorizationPolicy.cs" LinkBase="Shared\Storage" />
82-
<Compile Include="$(AzureStorageSharedSources)ISupportsTenantIdChallenges.cs" LinkBase="Shared\Storage" />
8340
</ItemGroup>
8441
</Project>

‎sdk/storage/Azure.Storage.DataMovement/tests/Azure.Storage.DataMovement.Tests.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,12 @@
1919
</ItemGroup>
2020
<ItemGroup>
2121
<Compile Include="$(AzureStorageSharedSources)SasExtensions.cs" LinkBase="Shared" />
22+
<Compile Include="$(AzureStorageSharedSources)SharedAccessSignatureCredentials.cs" LinkBase="Shared\Storage" />
23+
<Compile Include="$(AzureStorageSharedSources)StorageConnectionString.cs" LinkBase="Shared\Storage" />
2224
<Compile Include="$(AzureStorageSharedSources)StorageVersionExtensions.cs" LinkBase="Shared\Storage" />
2325
<Compile Include="$(AzureStorageSharedSources)UriExtensions.cs" LinkBase="Shared" />
26+
<Compile Include="$(AzureStorageSharedSources)UriQueryParamsCollection.cs" LinkBase="Shared\Storage" />
27+
<Compile Include="$(AzureStorageSharedSources)WindowStream.cs" LinkBase="Shared\Storage" />
2428
</ItemGroup>
2529
<ItemGroup>
2630
<Compile Include="$(AzureStorageSharedTestSources)\**\*.cs" LinkBase="Shared\Storage" />

0 commit comments

Comments
 (0)