Merge pull request #13 from RadicalFx/release-1.0.0

Release 1.0.0
RadicalFx · Jan 22, 2017 · 6ef33c4 · 6ef33c4
2 parents c7aef40 + f5cbe37
commit 6ef33c4
Show file tree

Hide file tree

Showing 10 changed files with 108 additions and 83 deletions.
diff --git a/GitVersionConfig.yaml b/GitVersionConfig.yaml
@@ -0,0 +1,4 @@
+branches:
+  develop:
+    tag: alpha
+    prevent-increment-of-merged-branch-version: true
diff --git a/README.md b/README.md
@@ -1,15 +1,13 @@
-[![Stories in Ready](https://badge.waffle.io/Radicalfx/Radical.png?label=ready&title=Ready)](http://waffle.io/Radicalfx/Radical)
-[![Stories in Progress](https://badge.waffle.io/Radicalfx/Radical.png?label=in progress&title=In Progress)](http://waffle.io/Radicalfx/Radical)
+[![Stories in Ready](https://badge.waffle.io/Radicalfx/Radical.Windows.Presentation.Autofac.png?label=ready&title=Ready)](http://waffle.io/radicalfx/housekeeping)
+[![Stories in Progress](https://badge.waffle.io/Radicalfx/Radical.Windows.Presentation.Autofac.png?label=in progress&title=In Progress)](http://waffle.io/radicalfx/housekeeping)
 
 [![Build status](https://ci.appveyor.com/api/projects/status/7avws6h5njta0w8j?svg=true)](https://ci.appveyor.com/project/radical-bot/radical-windows-presentation-autofac)
 
 --
 
 ![Radical logo](Radical.png)
 
-# Radical
-
-Radical is an infrastructure framework whose primary role is to help in the development of composite WPF applications based on the Model View ViewModel pattern.
+*Radical* is an infrastructure framework whose primary role is to help in the development of composite WPF applications based on the Model View ViewModel pattern.
 
 In the [documentation](https://github.com/RadicalFx/radical/wiki)  there are a lot of articles that details the Radical concepts and give some guidences on how to use it.
 
@@ -19,22 +17,10 @@ The Radical framework is not tied to WPF but some part of it can be freely used,
 
 The latest release can be found on NuGet: http://www.nuget.org/profiles/radical
 
-Development feed is available at: https://www.myget.org/F/radical-development/api/v2
+Development feed is available at: 
+* NuGet V3 feed URL: https://www.myget.org/F/radical-unstable/api/v3/index.json
+* NuGet V2 feed URL: https://www.myget.org/F/radical-unstable/api/v2
 
 ### Q&A
 
 Do you have any questions about Radical? [We hope to have enough answers](https://groups.google.com/forum/#!forum/radical-mvvm-framework)! :smile:
-
-### Notes
-
-In order to fully build the solution from source code the Expression Blend SDK is required:
-
-* WPF: http://www.microsoft.com/en-us/download/details.aspx?id=10801
-
-For projects targeting .Net framework 3.5 the Blend 3 SDK is required:
-
-* http://www.microsoft.com/en-us/download/details.aspx?id=22829
-
-In order to build the "Radical NuGet Packages" solution the NuBuild extension is required:
-
-* http://visualstudiogallery.msdn.microsoft.com/3efbfdea-7d51-4d45-a954-74a2df51c5d0
diff --git a/appveyor.yml b/appveyor.yml
@@ -2,74 +2,92 @@
 #     DEVELOPMENT BRANCH
 #
 # build in Debug mode and deploy to MyGet.org as pre-release
-- version: 0.1.0-alpha1+{build}
-  branches:
+
+- branches:
     only:
     - develop
+
+  skip_tags: true
   configuration: Debug
   platform: Any CPU
-  environment:
-    use_build_number_in_packages: true
+
+  artifacts:
+    - path: src\build\Debug
+    - path: src\build\nuget\*.nupkg
+
   cache:
-  - src\packages -> src\**\packages.config
-  install:
-  - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/RadicalFx/Radical.Build/master/appveyor-buildversion.ps1'))
-  assembly_info:
-    patch: true
-    file: '**\AssemblyInfo.*'
-    assembly_version: '$(assembly_version)'
-    assembly_file_version: '$(assembly_file_version)'
-    assembly_informational_version: '$(assembly_informational_version)'
+    - src\packages -> src\**\packages.config
+
   before_build:
-  - nuget restore "src\Radical.Windows.Presentation.Autofac.sln"
+    - nuget restore "src\Radical.Windows.Presentation.Autofac.sln"
+
   build:
     project: src\Radical.Windows.Presentation.Autofac.sln
     verbosity: minimal
+
   after_build:
-  - md "src\build\nuget"
-  - nuget pack "src\nuget\Radical.Windows.Presentation.Autofac.nuspec" -Version "%package_version%" -Properties "configuration=%CONFIGURATION%" -OutputDirectory "src\build\nuget"
-  artifacts:
-  - path: src\build\Debug
-  - path: src\build\nuget\*.nupkg
+    - md "src\build\nuget"
+    - nuget pack "src\nuget\Radical.Windows.Presentation.Autofac.nuspec" -Version "%GitVersion_NuGetVersion%" -Properties "configuration=%CONFIGURATION%" -OutputDirectory "src\build\nuget"
+
+  test:
+    categories:
+      except:
+      - ObjectDumper
+      - AsyncWorker
+
   deploy:
   - provider: Environment
     name: MyGet feed
     on:
       branch: develop
 
 #
-#     MASTER BRANCH
+#   MASTER BRANCH
 #
 # build in Release mode and deploy to NuGet.org
-- version: 0.1.0-RC2+{build}
-  branches:
+- branches:
     only:
     - master
+
+  skip_tags: true
   configuration: Release
   platform: Any CPU
+
+  artifacts:
+    - path: src\build\Release
+    - path: src\build\nuget\*.nupkg
+
   cache:
-  - src\packages -> src\**\packages.config
-  install:
-  - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/RadicalFx/Radical.Build/master/appveyor-buildversion.ps1'))
-  assembly_info:
-    patch: true
-    file: '**\AssemblyInfo.*'
-    assembly_version: '$(assembly_version)'
-    assembly_file_version: '$(assembly_file_version)'
-    assembly_informational_version: '$(assembly_informational_version)'
+    - src\packages -> src\**\packages.config
+
   before_build:
-  - nuget restore "src\Radical.Windows.Presentation.Autofac.sln"
+    - nuget restore "src\Radical.Windows.Presentation.Autofac.sln"
+
   build:
     project: src\Radical.Windows.Presentation.Autofac.sln
     verbosity: minimal
+
   after_build:
-  - md "src\build\nuget"
-  - nuget pack "src\nuget\Radical.Windows.Presentation.Autofac.nuspec" -Version "%package_version%" -Properties "configuration=%CONFIGURATION%" -OutputDirectory "src\build\nuget"
-  artifacts:
-  - path: src\build\Release
-  - path: src\build\nuget\*.nupkg
+    - md "src\build\nuget"
+    - nuget pack "src\nuget\Radical.Windows.Presentation.Autofac.nuspec" -Version "%GitVersion_NuGetVersion%" -Properties "configuration=%CONFIGURATION%" -OutputDirectory "src\build\nuget"
+
+  test:
+    categories:
+      except:
+      - ObjectDumper
+      - AsyncWorker
+
   deploy:
   - provider: Environment
-    name: MyGet feed
+    name: NuGet public feed
+    on:
+      branch: master
+
+  - provider: GitHub    
+    release: $(GitVersion_NuGetVersion)
+    description: 'Release v$(GitVersion_NuGetVersion)'
+    auth_token:
+      secure: 2ijF4OfPYfIUTunubL/Z04ogADL9sx/gKW1jMRNJnAa1OpHZpSvCKmP0gvNs8C7h
+    artifact: /.*\.nupkg/, src\build\Release.zip
     on:
       branch: master
diff --git a/src/Radical.Windows.Presentation.Autofac.sln b/src/Radical.Windows.Presentation.Autofac.sln
@@ -1,10 +1,11 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.40629.0
+# Visual Studio 14
+VisualStudioVersion = 14.0.24720.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{CDD1DA5D-B3A3-4274-9F83-4ACDE54C34EF}"
 	ProjectSection(SolutionItems) = preProject
+		..\appveyor.yml = ..\appveyor.yml
 		Command Line Arguments.txt = Command Line Arguments.txt
 		How to build.txt = How to build.txt
 		WebEssentials-Settings.json = WebEssentials-Settings.json

diff --git a/src/net40/Radical.Windows.Presentation.Autofac/Properties/AssemblyInfo.cs b/src/net40/Radical.Windows.Presentation.Autofac/Properties/AssemblyInfo.cs
@@ -10,8 +10,4 @@
 [assembly: AssemblyConfiguration( "" )]
 [assembly: AssemblyCulture( "" )]
 
-[assembly: ComVisible( false )]
-
-[assembly: AssemblyVersion( "1.0.0.0" )]
-[assembly: AssemblyFileVersion( "1.0.0.0" )]
-[assembly: AssemblyInformationalVersion("1.0.0.0")]
+[assembly: ComVisible( false )]
diff --git a/src/net40/Radical.Windows.Presentation.Autofac/Radical.Windows.Presentation.Autofac.csproj b/src/net40/Radical.Windows.Presentation.Autofac/Radical.Windows.Presentation.Autofac.csproj
@@ -19,6 +19,8 @@
     <TargetFrameworkProfile />
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -51,12 +53,12 @@
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
-    <Reference Include="Radical, Version=1.5.2.1, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Radical.1.5.2.1\lib\net40\Radical.dll</HintPath>
+    <Reference Include="Radical, Version=1.5.3.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Radical.1.5.3\lib\net40\Radical.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Radical.Windows, Version=1.3.16.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Radical.Windows.1.3.16.0\lib\net40\Radical.Windows.dll</HintPath>
+    <Reference Include="Radical.Windows, Version=1.4.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Radical.Windows.1.4.0\lib\net40\Radical.Windows.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Radical.Windows.Presentation, Version=1.10.3.1, Culture=neutral, processorArchitecture=MSIL">
@@ -68,7 +70,7 @@
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.configuration" />
     <Reference Include="System.Windows.Interactivity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Radical.Windows.1.3.16.0\lib\net40\System.Windows.Interactivity.dll</HintPath>
+      <HintPath>..\..\packages\Radical.Windows.1.4.0\lib\net40\System.Windows.Interactivity.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Xaml" />
@@ -117,6 +119,13 @@ copy "$(TargetDir)$(TargetName).*" "$(SolutionDir)build\$(ConfigurationName)\$(P
 
 del "$(SolutionDir)build\$(ConfigurationName)\$(ProjectName)\lib\net40\$(TargetFileName).config"</PostBuildEvent>
   </PropertyGroup>
+  <Import Project="..\..\packages\GitVersionTask.3.4.1\build\portable-net+sl+win+wpa+wp\GitVersionTask.targets" Condition="Exists('..\..\packages\GitVersionTask.3.4.1\build\portable-net+sl+win+wpa+wp\GitVersionTask.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\packages\GitVersionTask.3.4.1\build\portable-net+sl+win+wpa+wp\GitVersionTask.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\GitVersionTask.3.4.1\build\portable-net+sl+win+wpa+wp\GitVersionTask.targets'))" />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

diff --git a/src/net40/Radical.Windows.Presentation.Autofac/packages.config b/src/net40/Radical.Windows.Presentation.Autofac/packages.config
@@ -2,7 +2,8 @@
 <packages>
   <package id="Autofac" version="3.0.1" targetFramework="net40" />
   <package id="Expression.Blend.Sdk" version="1.0.2" targetFramework="net40" />
-  <package id="Radical" version="1.5.2.1" targetFramework="net40" />
-  <package id="Radical.Windows" version="1.3.16.0" targetFramework="net40" />
+  <package id="GitVersionTask" version="3.4.1" targetFramework="net40" developmentDependency="true" />
+  <package id="Radical" version="1.5.3" targetFramework="net40" />
+  <package id="Radical.Windows" version="1.4.0" targetFramework="net40" />
   <package id="Radical.Windows.Presentation" version="1.10.3.1" targetFramework="net40" />
 </packages>
diff --git a/src/net45/Radical.Windows.Presentation.Autofac/Radical.Windows.Presentation.Autofac.csproj b/src/net45/Radical.Windows.Presentation.Autofac/Radical.Windows.Presentation.Autofac.csproj
@@ -7,7 +7,7 @@
     <ProjectGuid>{85FB7974-67DA-4A24-A76E-7DFF6F7FAF4C}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Topics.Radical.Windows.Presentation.Autofac</RootNamespace>
+    <RootNamespace>Topics.Radical.Windows.Presentation</RootNamespace>
     <AssemblyName>Radical.Windows.Presentation.Autofac</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
@@ -17,6 +17,8 @@
     <SccProvider>SAK</SccProvider>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -44,12 +46,12 @@
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
-    <Reference Include="Radical, Version=1.5.2.1, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Radical.1.5.2.1\lib\net45\Radical.dll</HintPath>
+    <Reference Include="Radical, Version=1.5.3.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Radical.1.5.3\lib\net45\Radical.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Radical.Windows, Version=1.3.16.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Radical.Windows.1.3.16.0\lib\net45\Radical.Windows.dll</HintPath>
+    <Reference Include="Radical.Windows, Version=1.4.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Radical.Windows.1.4.0\lib\net45\Radical.Windows.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Radical.Windows.Presentation, Version=1.10.3.1, Culture=neutral, processorArchitecture=MSIL">
@@ -62,7 +64,7 @@
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Radical.Windows.1.3.16.0\lib\net45\System.Windows.Interactivity.dll</HintPath>
+      <HintPath>..\..\packages\Radical.Windows.1.4.0\lib\net45\System.Windows.Interactivity.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Xaml" />
@@ -136,6 +138,13 @@ copy "$(TargetDir)$(TargetName).*" "$(SolutionDir)build\$(ConfigurationName)\$(P
 del "$(SolutionDir)build\$(ConfigurationName)\$(ProjectName)\lib\net45\$(TargetFileName).config"</PostBuildEvent>
   </PropertyGroup>
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+  <Import Project="..\..\packages\GitVersionTask.3.4.1\build\dotnet\GitVersionTask.targets" Condition="Exists('..\..\packages\GitVersionTask.3.4.1\build\dotnet\GitVersionTask.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\packages\GitVersionTask.3.4.1\build\dotnet\GitVersionTask.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\GitVersionTask.3.4.1\build\dotnet\GitVersionTask.targets'))" />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

diff --git a/src/net45/Radical.Windows.Presentation.Autofac/packages.config b/src/net45/Radical.Windows.Presentation.Autofac/packages.config
@@ -2,7 +2,8 @@
 <packages>
   <package id="Autofac" version="3.0.1" targetFramework="net40" />
   <package id="Expression.Blend.Sdk" version="1.0.2" targetFramework="net45" />
-  <package id="Radical" version="1.5.2.1" targetFramework="net45" />
-  <package id="Radical.Windows" version="1.3.16.0" targetFramework="net45" />
+  <package id="GitVersionTask" version="3.4.1" targetFramework="net45" developmentDependency="true" />
+  <package id="Radical" version="1.5.3" targetFramework="net45" />
+  <package id="Radical.Windows" version="1.4.0" targetFramework="net45" />
   <package id="Radical.Windows.Presentation" version="1.10.3.1" targetFramework="net45" />
 </packages>
diff --git a/src/nuget/Radical.Windows.Presentation.Autofac.nuspec b/src/nuget/Radical.Windows.Presentation.Autofac.nuspec
@@ -15,11 +15,11 @@
         <language>en-US</language>
         <tags>Radical Radical.Windows Autofac</tags>
         <dependencies>
-            <dependency id="Radical.Windows.Presentation" version="1.0.6.0-RC3" />
-            <dependency id="Autofac" version="3.0.2" />
+            <dependency id="Radical.Windows.Presentation" version="[1.1,2.0)" />
+            <dependency id="Autofac" version="[3.2,4.0)" />
         </dependencies>
     </metadata>
     <files>
         <file src="..\build\$configuration$\Radical.Windows.Presentation.Autofac\lib\" target="lib\" />
     </files>
-</package>
+</package>