Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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: 1 addition & 1 deletion src/Foundatio.Aliyun/AliyunConnectionStringBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public abstract class AliyunConnectionStringBuilder

protected AliyunConnectionStringBuilder() { }

protected AliyunConnectionStringBuilder(string? connectionString)
protected AliyunConnectionStringBuilder(string connectionString)
{
if (String.IsNullOrEmpty(connectionString))
throw new ArgumentNullException(nameof(connectionString));
Expand Down
2 changes: 1 addition & 1 deletion src/Foundatio.Aliyun/Foundatio.Aliyun.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<ItemGroup>
<PackageReference Include="Aliyun.OSS.Sdk.NetCore" Version="2.14.1" />

<PackageReference Include="Foundatio" Version="13.0.0-beta3.33" Condition="'$(ReferenceFoundatioSource)' == '' OR '$(ReferenceFoundatioSource)' == 'false'" />
<PackageReference Include="Foundatio" Version="13.0.0-beta3.35" Condition="'$(ReferenceFoundatioSource)' == '' OR '$(ReferenceFoundatioSource)' == 'false'" />
<ProjectReference Include="..\..\..\Foundatio\src\Foundatio\Foundatio.csproj" Condition="'$(ReferenceFoundatioSource)' == 'true'" />
</ItemGroup>
</Project>
5 changes: 4 additions & 1 deletion src/Foundatio.Aliyun/Storage/AliyunFileStorage.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ public AliyunFileStorage(AliyunFileStorageOptions options)
_serializer = options.Serializer ?? DefaultSerializer.Instance;
_logger = options.LoggerFactory?.CreateLogger(GetType()) ?? NullLogger.Instance;

if (String.IsNullOrEmpty(options.ConnectionString))
throw new ArgumentException("ConnectionString is required.", nameof(options));

var connectionString = new AliyunFileStorageConnectionStringBuilder(options.ConnectionString);
_client = new OssClient(connectionString.Endpoint, connectionString.AccessKey, connectionString.SecretKey);

Expand Down Expand Up @@ -376,7 +379,7 @@ private async Task<List<FileSpec>> GetFileListAsync(string? searchPattern = null

private class SearchCriteria
{
public string Prefix { get; set; } = String.Empty;
public string Prefix { get; set; } = null!;
public Regex? Pattern { get; set; }
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public AliyunFileStorageConnectionStringBuilder()
{
}

public AliyunFileStorageConnectionStringBuilder(string? connectionString) : base(connectionString)
public AliyunFileStorageConnectionStringBuilder(string connectionString) : base(connectionString)
{
}

Expand All @@ -27,7 +27,6 @@ protected override bool ParseItem(string key, string value)
Bucket = value;
return true;
}

return base.ParseItem(key, value);
}

Expand All @@ -36,7 +35,6 @@ public override string ToString()
string connectionString = base.ToString();
if (!String.IsNullOrEmpty(_bucket))
connectionString += "Bucket=" + Bucket + ";";

return connectionString;
}
}
2 changes: 1 addition & 1 deletion tests/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5" />
<PackageReference Include="GitHubActionsTestLogger" Version="3.0.3" PrivateAssets="All" />

<PackageReference Include="Foundatio.TestHarness" Version="13.0.0-beta3.33" Condition="'$(ReferenceFoundatioSource)' == '' OR '$(ReferenceFoundatioSource)' == 'false'" />
<PackageReference Include="Foundatio.TestHarness" Version="13.0.0-beta3.35" Condition="'$(ReferenceFoundatioSource)' == '' OR '$(ReferenceFoundatioSource)' == 'false'" />
<ProjectReference Include="..\..\..\Foundatio\src\Foundatio.TestHarness\Foundatio.TestHarness.csproj" Condition="'$(ReferenceFoundatioSource)' == 'true'" />
</ItemGroup>
</Project>
Loading