diff --git a/AzurePipelines/Publish.UPM.yml b/AzurePipelines/Publish.UPM.yml index 4f757ea..847f329 100644 --- a/AzurePipelines/Publish.UPM.yml +++ b/AzurePipelines/Publish.UPM.yml @@ -16,7 +16,7 @@ pool: steps: - task: Npm@1 # Only update the version on master branch - condition: eq(variables['Build.SourceBranch'], 'refs/heads/master') + condition: not(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/')) inputs: command: 'custom' customCommand: --no-git-tag-version version prerelease --preid=$(Build.BuildNumber) diff --git a/README.md b/README.md index c0e6c79..79f396e 100644 --- a/README.md +++ b/README.md @@ -68,7 +68,7 @@ This scenario leverages the MSBuildForUnity [Project Builder](#msbuild-project-b ``` - Add the following to the `dependencies` section of the file: ```json - "com.microsoft.msbuildforunity": "0.1.1-20190816.2.0" + "com.microsoft.msbuildforunity": "0.8.1" ``` 1. Create a "SDK style" MSBuild project (e.g. csproj) somewhere under your `Assets` directory of your Unity project that references the `MSBuildForUnity` NuGet package. Here is an example: ```xml @@ -77,7 +77,7 @@ This scenario leverages the MSBuildForUnity [Project Builder](#msbuild-project-b netstandard2.0 - + all runtime; build; native; contentfiles; analyzers diff --git a/Samples/SimpleNuGetDependency.Unity/Assets/NewtonsoftDependency/NewtonsoftDependency.csproj b/Samples/SimpleNuGetDependency.Unity/Assets/NewtonsoftDependency/NewtonsoftDependency.csproj index 3c3cb81..4f7cc1d 100644 --- a/Samples/SimpleNuGetDependency.Unity/Assets/NewtonsoftDependency/NewtonsoftDependency.csproj +++ b/Samples/SimpleNuGetDependency.Unity/Assets/NewtonsoftDependency/NewtonsoftDependency.csproj @@ -17,7 +17,7 @@ - + all runtime; build; native; contentfiles; analyzers diff --git a/Source/MSBuildTools.Unity.NuGet/MSBuildForUnity.csproj b/Source/MSBuildTools.Unity.NuGet/MSBuildForUnity.csproj index 34918bf..d907f95 100644 --- a/Source/MSBuildTools.Unity.NuGet/MSBuildForUnity.csproj +++ b/Source/MSBuildTools.Unity.NuGet/MSBuildForUnity.csproj @@ -31,16 +31,16 @@ 8 - 0 + 1 $(MajorVersion).$(MinorVersion).$(RevisionVersion) - $(Version)-$(BUILD_BUILDID) + $(Version)-$(BUILD_BUILDID) $(Version) $(MajorVersion).$(MinorVersion) $(AssemblyVersion).$(RevisionVersion).0 - $(AssemblyVersion).$(RevisionVersion).$(BUILD_BUILDID) + $(AssemblyVersion).$(RevisionVersion).$(BUILD_BUILDID) diff --git a/Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/MSBuildTemplates/DependenciesProjectTemplate.g.props.template b/Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/MSBuildTemplates/DependenciesProjectTemplate.g.props.template index 57b9b24..0828ca0 100644 --- a/Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/MSBuildTemplates/DependenciesProjectTemplate.g.props.template +++ b/Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/MSBuildTemplates/DependenciesProjectTemplate.g.props.template @@ -20,7 +20,7 @@ - + all runtime; build; native; contentfiles; analyzers diff --git a/Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/MSBuildTemplates/MSBuildForUnity.Common.props.template b/Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/MSBuildTemplates/MSBuildForUnity.Common.props.template index 5be133b..1061c0d 100644 --- a/Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/MSBuildTemplates/MSBuildForUnity.Common.props.template +++ b/Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/MSBuildTemplates/MSBuildForUnity.Common.props.template @@ -1,6 +1,6 @@ - 0.8.0 + 0.8.1 diff --git a/Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/package.json b/Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/package.json index 1e964d1..bff61f3 100644 --- a/Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/package.json +++ b/Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/package.json @@ -1,6 +1,6 @@ { "name": "com.microsoft.msbuildforunity", - "version": "0.8.0", + "version": "0.8.1", "displayName": "MSBuild for Unity", "description": "MSBuildForUnity solves the problem of establishing clear dependency relationships between Unity project and other .NET components such as external (to Unity) C# projects, or NuGet packages. It creates a familiar to .NET developers project structure and ensures that the dependencies are resolved and brought into the Unity project as appropriate.", "unity": "2018.1",