Merge in master

.vscode/tasks.json

@@ -1,22 +1,29 @@
 {
     // See https://go.microsoft.com/fwlink/?LinkId=733558
     // for the documentation about the tasks.json format
-    "version": "0.1.0",
+    "version": "2.0.0",
     "command": "dotnet",
     "options": {
         "env": {
             "FrameworkPathOverride": "/usr/lib/mono/4.5/"
         }
     },
-    "isShellCommand": true,
     "args": [],
     "tasks": [
         {
-            "taskName": "build",
-            "args": [ "/p:NUNITLITE=1", "src/ServiceStack.Azure.sln"],
-            "isBuildCommand": true,
-            "showOutput": "silent",
-            "problemMatcher": "$msCompile"
+            "label": "build",
+            "type": "shell",
+            "command": "dotnet",
+            "args": [
+                "build",
+                "/p:NUNITLITE=1",
+                "src/ServiceStack.Azure.sln"
+            ],
+            "problemMatcher": "$msCompile",
+            "group": {
+                "_id": "build",
+                "isDefault": false
+            }
         }
     ]
 }

NuGet.Config

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <add key="ServiceStack CI feed" value="http://build.servicestack.net/guestAuth/app/nuget/v1/FeedService.svc" />
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
+  </packageSources>
+</configuration>

README.md

@@ -1,87 +1,5 @@
-## ServiceStack.Azure
+Follow [@ServiceStack](https://twitter.com/servicestack), [view the docs](https://docs.servicestack.net), use [StackOverflow](https://stackoverflow.com/questions/ask?tags=servicestack,servicestack.azure) or [Customer Forums](https://forums.servicestack.net/) for support.
 
-ServiceStack.Azure package provides support to Azure ServiceBus and Azure Blob Storage. All features are incapsulated in single ServiceStack.Azure package. To install package run from NuGet
+# Read ServiceStack.Azure Docs at [docs.servicestack.net/azure](https://docs.servicestack.net/azure)
 
-    PM> Install-Package ServiceStack.Azure
-
-ServiceStack.Azure includes implementation of the following ServiceStack providers:
-
-- [ServiceBusMqServer](#ServiceBusMqServer) - [MQ Server](http://docs.servicestack.net/messaging) for invoking ServiceStack Services via Azure ServiceBus
-- [AzureBlobVirtualFiles](#virtual-filesystem-backed-by-azure-blob-storage) - Virtual file system based on Azure Blob Storage
-- [AzureAppendBlobVirtualFiles](#virtual-filesystem-backed-by-azure-blob-storage) - Virtual file system based on Azure Blob Storage for appending scenarios
-- [AzureTableCacheClient](#caching-support-with-azure-table-storage) - Cache client over Azure Table Storage
-
-
-### ServiceBusMqServer
-
-The code to configure and start an ServiceBus MQ Server is similar to other MQ Servers:
-
-```csharp
-container.Register<IMessageService>(c => new ServiceBusMqServer(ConnectionString));
-
-var mqServer = container.Resolve<IMessageService>();
-mqServer.RegisterHandler<ServiceDto>(ExecuteMessage);
-mqServer.Start();
-```
-
-Where ConnectionString is connection string to Service Bus, how to obtain it from Azure Portal you can find in [Get Started with Service Bus queues](https://docs.microsoft.com/en-us/azure/service-bus-messaging/service-bus-dotnet-get-started-with-queues) article
-
-When an MQ Server is registered, ServiceStack automatically publishes Requests accepted on the "One Way" pre-defined route to the registered MQ broker. The message is later picked up and executed by a Message Handler on a background Thread.
-
-## Virtual FileSystem backed by Azure Blob Storage
-
-You can use an Azure Blob Storage Container to serve website content with the **AzureBlobVirtualFiles**.
-
-```csharp
-public class AppHost : AppHostBase
-{
-    public override void Configure(Container container)
-    {
-        //All Razor Views, Markdown Content, imgs, js, css, etc are served from an Azure Blob Storage container
-
-        //Use connection string to Azure Storage Emulator. For real application you should use connection string
-        //to your Azure Storage account
-        var azureBlobConnectionString = "UseDevelopmentStorage=true";
-        //Azure container which hold your files. If it does not exist it will be automatically created.
-        var containerName = "myazurecontainer";
-
-        VirtualFiles = new AzureBlobVirtualFiles(connectionString, containerName);
-        AddVirtualFileSources.Add(VirtualFiles);
-    }
-}
-```
-
-In addition you can use **AzureAppendBlobVirtualFiles** in scenarios that require appending such as logging. 
-
-```csharp
-public class AppHost : AppHostBase
-{
-    public override void Configure(Container container)
-    {
-      Plugins.Add(new RequestLogsFeature
-      {
-        RequestLogger = new CsvRequestLogger(
-        files: new AzureAppendBlobVirtualFiles(AppSettings.Get<string>("storageConnection"), "logfiles"),
-        requestLogsPattern: "requestlogs/{year}-{month}/{year}-{month}-{day}.csv",
-        errorLogsPattern: "requestlogs/{year}-{month}/{year}-{month}-{day}-errors.csv",
-        appendEvery: TimeSpan.FromSeconds(30))
-
-       });
-    }
-}
-```
-
-## Caching support with Azure Table Storage
-
-The AzureTableCacheClient implements [ICacheClientExteded](https://github.com/ServiceStack/ServiceStack/blob/master/src/ServiceStack.Interfaces/Caching/ICacheClientExtended.cs) and [IRemoveByPattern](https://github.com/ServiceStack/ServiceStack/blob/master/src/ServiceStack.Interfaces/Caching/IRemoveByPattern.cs) using Azure Table Storage.
-
-```csharp
-public class AppHost : AppHostBase
-{
-    public override void Configure(Container container)
-    {
-        string cacheConnStr = "UseDevelopmentStorage=true;";
-        container.Register<ICacheClient>(new AzureTableCacheClient(cacheConnStr));
-    }
-}
-```
+### This repository [has moved](https://docs.servicestack.net/mono-repo) to [github.com/ServiceStack/ServiceStack/ServiceStack.Azure](https://github.com/ServiceStack/ServiceStack/tree/main/ServiceStack.Azure)

build/build-core.proj

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Default"
+         xmlns='http://schemas.microsoft.com/developer/msbuild/2003' ToolsVersion="4.0">
+  <Import Project="$(MSBuildProjectDirectory)/build.tasks" />
+
+  <PropertyGroup>
+    <MajorVersion Condition="$(MajorVersion) == ''">6</MajorVersion>
+    <MinorVersion Condition="$(MinorVersion) == ''">0</MinorVersion>
+    <PatchVersion Condition="$(PatchVersion) == ''">$(BUILD_NUMBER)</PatchVersion>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <BuildSolutionDir>$(MSBuildProjectDirectory)/..</BuildSolutionDir>
+    <SrcDir>$(BuildSolutionDir)/src</SrcDir>
+    <TestsDir>$(BuildSolutionDir)/tests</TestsDir>
+    <Configuration Condition="$(Configuration) == ''">Release</Configuration>
+    <NuGetPackageDir>$(BuildSolutionDir)/NuGet/</NuGetPackageDir>
+    <PackageVersion>$(MajorVersion).$(MinorVersion).$(PatchVersion)</PackageVersion>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <DoBuildSolutionsDependsOn>
+      BeforeBuildSolutions;
+      BuildSolutions
+    </DoBuildSolutionsDependsOn>
+  </PropertyGroup>
+
+  <Target Name="BeforeBuildSolutions">
+    <Message Text="*****Before building solution*****" Importance="high"/>
+    <CallTarget Targets="UpdateVersion" />
+  </Target>
+
+  <Target Name="BuildSolutions">
+    <ItemGroup>
+      <NugetPackageFilesToDelete Include="$(NuGetPackageDir)/*.nupkg"/>
+    </ItemGroup>
+    <Delete Files="@(NugetPackageFilesToDelete)" />
+    <CallTarget Targets="ClearNuGetRestoreCaches" />
+  </Target>
+
+  <!-- need to remove old caches from nuget restore from .Core csproj's -->
+  <Target Name="ClearNuGetRestoreCaches">
+    <RemoveDir Directories="$(SrcDir)/ServiceStack.Azure/obj" />
+    <RemoveDir Directories="$(TestsDir)/ServiceStack.Azure.Tests/obj" />
+  </Target>
+
+  <Target Name="UpdateVersion">
+    <!-- Update Version -->
+    <ItemGroup>
+      <RegexTransform Include="$(BuildSolutionDir)/src/Directory.Build.props;$(BuildSolutionDir)/tests/Directory.Build.props">
+        <Find>&lt;Version&gt;[^&lt;]*</Find>
+        <ReplaceWith>&lt;Version&gt;$(PackageVersion)</ReplaceWith>
+      </RegexTransform>
+    </ItemGroup>
+
+    <RegexTransform Items="@(RegexTransform)" />
+  </Target>
+
+  <Target Name="Default" DependsOnTargets="$(DoBuildSolutionsDependsOn)">
+
+    <!-- ServiceStack.Azure.Core -->
+    <MSBuild Projects="$(BuildSolutionDir)/src/ServiceStack.Azure/ServiceStack.Azure.Core.csproj" Targets="Restore" />
+    <MSBuild Projects="$(BuildSolutionDir)/src/ServiceStack.Azure/ServiceStack.Azure.Core.csproj"
+             Targets="Build;Pack"
+             Properties="Configuration=$(Configuration)" />
+
+
+    <!-- Copy all *.nupkg to /NuGet -->
+    <ItemGroup>
+      <NugetPackagesToMove Include="$(BuildSolutionDir)/src/**/bin/$(Configuration)/*.nupkg"/>
+    </ItemGroup>
+    <Move SourceFiles="@(NugetPackagesToMove)" DestinationFolder="$(NuGetPackageDir)" />
+
+    <!-- leave .sln in optimal state then NuGet restore .sln to build -->
+    <CallTarget Targets="ClearNuGetRestoreCaches" />
+
+  </Target>
+</Project>

build/build.bat

@@ -1,3 +1,3 @@
 SET MSBUILD="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\MSBuild.exe"
 
-%MSBUILD% build.proj /target:Default;NuGetPack /property:Configuration=Release;MinorVersion=1;PatchVersion=0
+%MSBUILD% build.proj /property:Configuration=Release;MinorVersion=4;PatchVersion=1