Packaging

JamesRandall · Nov 26, 2018 · 55d473e · 55d473e
1 parent 7762edf
commit 55d473e
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 27 deletions.
diff --git a/FunctionMonkey.sln b/FunctionMonkey.sln
@@ -39,7 +39,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IndirectExternalTypes", "Sa
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FunctionMonkey.Commanding.Cosmos.Abstractions", "Source\FunctionMonkey.Commanding.Cosmos.Abstractions\FunctionMonkey.Commanding.Cosmos.Abstractions.csproj", "{33204395-FEAB-4E41-B6D7-B358397A82B8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetCore21Example", "Samples\NetCore21Example\NetCore21Example.csproj", "{26B0ED78-AF78-48CD-B20D-D020A134469A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetCore21Example", "Samples\NetCore21Example\NetCore21Example.csproj", "{26B0ED78-AF78-48CD-B20D-D020A134469A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -64,7 +64,6 @@ Global
 		{ABD675D4-16F1-4F52-ADDD-08423B0661EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{ABD675D4-16F1-4F52-ADDD-08423B0661EC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BF9EB696-D652-4E75-8D30-A77D6238BEF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BF9EB696-D652-4E75-8D30-A77D6238BEF2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BF9EB696-D652-4E75-8D30-A77D6238BEF2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BF9EB696-D652-4E75-8D30-A77D6238BEF2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4ECCEA2B-AC04-42F9-882E-E615641D3418}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -75,11 +74,9 @@ Global
 		{C24578CA-39E0-4D82-9C31-AB58D0EC6941}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C24578CA-39E0-4D82-9C31-AB58D0EC6941}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DCFF70AD-24C9-451D-9A9E-CBD70B87B4B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DCFF70AD-24C9-451D-9A9E-CBD70B87B4B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DCFF70AD-24C9-451D-9A9E-CBD70B87B4B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DCFF70AD-24C9-451D-9A9E-CBD70B87B4B2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{33FFFEC6-9C74-4849-B3F0-1E3F7E804475}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{33FFFEC6-9C74-4849-B3F0-1E3F7E804475}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{33FFFEC6-9C74-4849-B3F0-1E3F7E804475}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{33FFFEC6-9C74-4849-B3F0-1E3F7E804475}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A9F41F67-7491-4F56-A20F-A07C65CEE94F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -89,11 +86,9 @@ Global
 		{488F92CA-6DEC-4E33-A517-167CF6BD02E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{488F92CA-6DEC-4E33-A517-167CF6BD02E1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AB465B8B-B8DB-47A8-8403-B269FD984B6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AB465B8B-B8DB-47A8-8403-B269FD984B6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AB465B8B-B8DB-47A8-8403-B269FD984B6E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AB465B8B-B8DB-47A8-8403-B269FD984B6E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9AA9A741-775E-4E68-B838-3FE2F4BC8EA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9AA9A741-775E-4E68-B838-3FE2F4BC8EA6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9AA9A741-775E-4E68-B838-3FE2F4BC8EA6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9AA9A741-775E-4E68-B838-3FE2F4BC8EA6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{33204395-FEAB-4E41-B6D7-B358397A82B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

diff --git a/Samples/DocumentationSamples/GettingStartedSample/GettingStartedSample.csproj b/Samples/DocumentationSamples/GettingStartedSample/GettingStartedSample.csproj
@@ -4,9 +4,9 @@
     <AzureFunctionsVersion>v2</AzureFunctionsVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="FunctionMonkey" Version="0.16.1-beta000" />
-    <PackageReference Include="FunctionMonkey.Compiler" Version="0.16.1-beta000" />
-    <PackageReference Include="FunctionMonkey.FluentValidation" Version="0.16.1-beta000" />
+    <PackageReference Include="FunctionMonkey" Version="0.17.0-beta000" />
+    <PackageReference Include="FunctionMonkey.Compiler" Version="0.17.1-beta000" />
+    <PackageReference Include="FunctionMonkey.FluentValidation" Version="0.17.0-beta000" />
     <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="1.0.23" />
   </ItemGroup>
   <ItemGroup>

diff --git a/Source/FunctionMonkey.Abstractions/FunctionMonkey.Abstractions.csproj b/Source/FunctionMonkey.Abstractions/FunctionMonkey.Abstractions.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>0.16.1-beta000</Version>
+    <Version>0.17.0-beta000</Version>
     <Authors>James Randall</Authors>
     <PackageLicenseUrl>https://raw.githubusercontent.com/JamesRandall/AzureFromTheTrenches.Commanding/master/LICENSE</PackageLicenseUrl>
     <PackageProjectUrl>https://commanding.azurefromthetrenches.com/</PackageProjectUrl>

diff --git a/Source/FunctionMonkey.Commanding.Abstractions/FunctionMonkey.Commanding.Abstractions.csproj b/Source/FunctionMonkey.Commanding.Abstractions/FunctionMonkey.Commanding.Abstractions.csproj
@@ -2,14 +2,14 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>0.16.1-beta000</Version>
+    <Version>0.17.0-beta000</Version>
     <Company>James Randall</Company>
     <Authors>James Randall</Authors>
     <PackageLicenseUrl>https://raw.githubusercontent.com/JamesRandall/AzureFromTheTrenches.Commanding/master/LICENSE</PackageLicenseUrl>
     <PackageProjectUrl>https://commanding.azurefromthetrenches.com/</PackageProjectUrl>
     <RepositoryUrl>https://github.com/JamesRandall/FunctionMonkey.git</RepositoryUrl>
-    <AssemblyVersion>0.16.1.0</AssemblyVersion>
-    <FileVersion>0.16.1.0</FileVersion>
+    <AssemblyVersion>0.17.0.0</AssemblyVersion>
+    <FileVersion>0.17.0.0</FileVersion>
   </PropertyGroup>
 
 </Project>
diff --git a/...onkey.Commanding.Cosmos.Abstractions/FunctionMonkey.Commanding.Cosmos.Abstractions.csproj b/...onkey.Commanding.Cosmos.Abstractions/FunctionMonkey.Commanding.Cosmos.Abstractions.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>0.16.1-beta000</Version>
+    <Version>0.17.0-beta000</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Source/FunctionMonkey.Compiler/FunctionMonkey.Compiler.csproj b/Source/FunctionMonkey.Compiler/FunctionMonkey.Compiler.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>    
-    <Version>0.16.1-beta000</Version>
+    <Version>0.17.1-beta000</Version>
     <AssemblyName>FunctionMonkey.Compiler</AssemblyName>
     <PackageId>FunctionMonkey.Compiler</PackageId>
   </PropertyGroup>
@@ -358,8 +358,8 @@
     <IntermediatePackDir>$(MSBuildProjectDirectory)/bin/$(Configuration)/publish/</IntermediatePackDir>
     <PublishDir>$(IntermediatePackDir)$(TargetFramework)/</PublishDir>
     <NuspecProperties>publishDir=$([MSBuild]::NormalizeDirectory($(IntermediatePackDir)))</NuspecProperties>
-    <AssemblyVersion>0.16.1.0</AssemblyVersion>
-    <FileVersion>0.16.1.0</FileVersion>
+    <AssemblyVersion>0.17.1.0</AssemblyVersion>
+    <FileVersion>0.17.1.0</FileVersion>
     <PackageReleaseNotes></PackageReleaseNotes>
   </PropertyGroup>
 

diff --git a/Source/FunctionMonkey.Compiler/FunctionMonkey.Compiler.nuspec b/Source/FunctionMonkey.Compiler/FunctionMonkey.Compiler.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
     <id>FunctionMonkey.Compiler</id>
-    <version>0.16.1-beta000</version>
+    <version>0.17.1-beta000</version>
     <authors>James Randall</authors>
     <description>Generates Azure Functions from command registrations</description>
     <licenseUrl>https://raw.githubusercontent.com/JamesRandall/AzureFromTheTrenches.Commanding/master/LICENSE</licenseUrl>
@@ -14,6 +14,6 @@
     <file src="FunctionMonkey.Compiler.targets" target="build/netstandard1.0/FunctionMonkey.Compiler.targets" />
     <file src="_._" target="lib/netstandard1.0/" />
     <file src="FunctionMonkey.Compiler.targets" target="tools/" />
-    <file src="$publishdir$\netcoreapp2.0\**\*" target="tools/netcoreapp2.0/" />
+    <file src="$publishdir$\netcoreapp2.1\**\*" target="tools/netcoreapp2.1/" />
   </files>
 </package>
diff --git a/Source/FunctionMonkey.Compiler/FunctionMonkey.Compiler.targets b/Source/FunctionMonkey.Compiler/FunctionMonkey.Compiler.targets
@@ -1,8 +1,8 @@
 <Project ToolsVersion="14.0"
          xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <FunctionCompilerExe Condition="('$(TargetFrameworkIdentifier)' == '.NETCoreApp' OR '$(TargetFrameworkIdentifier)' == '.NETStandard') AND '$(OS)' == 'Windows_NT'">dotnet "$(MSBuildThisFileDirectory)..\..\tools\netcoreapp2.0/FunctionMonkey.Compiler.dll"</FunctionCompilerExe>
-    <FunctionCompilerExe Condition="('$(TargetFrameworkIdentifier)' == '.NETCoreApp' OR '$(TargetFrameworkIdentifier)' == '.NETStandard') AND '$(OS)' == 'Unix'">dotnet "$(MSBuildThisFileDirectory)../../tools/netcoreapp2.0/FunctionMonkey.Compiler.dll"</FunctionCompilerExe>
+    <FunctionCompilerExe Condition="('$(TargetFrameworkIdentifier)' == '.NETCoreApp' OR '$(TargetFrameworkIdentifier)' == '.NETStandard') AND '$(OS)' == 'Windows_NT'">dotnet "$(MSBuildThisFileDirectory)..\..\tools\netcoreapp2.1/FunctionMonkey.Compiler.dll"</FunctionCompilerExe>
+    <FunctionCompilerExe Condition="('$(TargetFrameworkIdentifier)' == '.NETCoreApp' OR '$(TargetFrameworkIdentifier)' == '.NETStandard') AND '$(OS)' == 'Unix'">dotnet "$(MSBuildThisFileDirectory)../../tools/netcoreapp2.1/FunctionMonkey.Compiler.dll"</FunctionCompilerExe>
     <FunctionCompilerParams Condition="('$(TargetFrameworkIdentifier)' == '.NETCoreApp')">&quot;$(TargetDir)bin\$(TargetName).dll&quot; --netcore21</FunctionCompilerParams>
     <FunctionCompilerParams Condition="('$(TargetFrameworkIdentifier)' != '.NETCoreApp')">&quot;$(TargetDir)bin\$(TargetName).dll&quot;</FunctionCompilerParams>
   </PropertyGroup>

diff --git a/Source/FunctionMonkey.FluentValidation/FunctionMonkey.FluentValidation.csproj b/Source/FunctionMonkey.FluentValidation/FunctionMonkey.FluentValidation.csproj
@@ -2,14 +2,14 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>0.16.1-beta000</Version>
+    <Version>0.17.0-beta000</Version>
     <Authors>James Randall</Authors>
     <Company>James Randall</Company>
     <PackageLicenseUrl>https://raw.githubusercontent.com/JamesRandall/AzureFromTheTrenches.Commanding/master/LICENSE</PackageLicenseUrl>
     <PackageProjectUrl>https://commanding.azurefromthetrenches.com/</PackageProjectUrl>
     <RepositoryUrl>https://github.com/JamesRandall/FunctionMonkey.git</RepositoryUrl>
-    <AssemblyVersion>0.16.1.0</AssemblyVersion>
-    <FileVersion>0.16.1.0</FileVersion>
+    <AssemblyVersion>0.17.0.0</AssemblyVersion>
+    <FileVersion>0.17.0.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Source/FunctionMonkey/FunctionMonkey.csproj b/Source/FunctionMonkey/FunctionMonkey.csproj
@@ -2,16 +2,16 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>0.16.1-beta000</Version>
+    <Version>0.17.0-beta000</Version>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <Company />
     <Authors>James Randall</Authors>
     <PackageLicenseUrl>https://raw.githubusercontent.com/JamesRandall/AzureFromTheTrenches.Commanding/master/LICENSE</PackageLicenseUrl>
     <PackageProjectUrl>https://commanding.azurefromthetrenches.com/</PackageProjectUrl>
     <RepositoryUrl>https://github.com/JamesRandall/FunctionMonkey.git</RepositoryUrl>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <AssemblyVersion>0.16.1.0</AssemblyVersion>
-    <FileVersion>0.16.1.0</FileVersion>
+    <AssemblyVersion>0.17.0.0</AssemblyVersion>
+    <FileVersion>0.17.0.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>